diff --git a/src/main/java/binnie/Constants.java b/src/main/java/binnie/Constants.java index 4dcf9901..ade11294 100644 --- a/src/main/java/binnie/Constants.java +++ b/src/main/java/binnie/Constants.java @@ -12,5 +12,5 @@ public final class Constants { public static final String LIQUID_SEED_OIL = "seedoil"; public static final String LIQUID_CREOSOTE = "Creosote Oil"; public static final String LIQUID_BIO_ETHANOL = "bioethanol"; - public static final String LIQUID_FOR_HONEY= "for.honey"; + public static final String LIQUID_FOR_HONEY = "for.honey"; } diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index d6f9ffb5..390ad9c5 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -3,8 +3,8 @@ package binnie.botany; import binnie.Constants; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IFlower; import binnie.botany.api.IBlockSoil; +import binnie.botany.api.IFlower; import binnie.botany.ceramic.BlockCeramic; import binnie.botany.ceramic.BlockCeramicPatterned; import binnie.botany.ceramic.BlockStainedGlass; diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index ee9f235d..1379b093 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -2,7 +2,6 @@ package binnie.botany; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index 9c07dc19..373edb02 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -8,8 +8,6 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; - public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty { IFlowerType getType(); diff --git a/src/main/java/binnie/botany/api/IBlockSoil.java b/src/main/java/binnie/botany/api/IBlockSoil.java index 2f0f6f3e..5257975e 100644 --- a/src/main/java/binnie/botany/api/IBlockSoil.java +++ b/src/main/java/binnie/botany/api/IBlockSoil.java @@ -1,8 +1,5 @@ package binnie.botany.api; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/binnie/botany/api/IFlowerFactory.java b/src/main/java/binnie/botany/api/IFlowerFactory.java index 6c1a4a3e..df1283cf 100644 --- a/src/main/java/binnie/botany/api/IFlowerFactory.java +++ b/src/main/java/binnie/botany/api/IFlowerFactory.java @@ -3,8 +3,6 @@ package binnie.botany.api; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; -import javax.annotation.Nonnull; - public interface IFlowerFactory { IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType); diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index fbcad545..a678f145 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -6,8 +6,6 @@ import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; - public interface IFlowerType> extends Comparable { @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index 199b978b..79df16a3 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -66,7 +66,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi } return hasBeenBroken; } - + @Override public TileEntity createTileEntity(World world, IBlockState state) { return new TileCeramic(); @@ -76,11 +76,11 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi public boolean hasTileEntity(IBlockState state) { return true; } - + @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { TileCeramic ceramic = TileUtil.getTile(worldIn, pos, TileCeramic.class); - if(ceramic != null){ + if (ceramic != null) { ceramic.setColor(EnumFlowerColor.VALUES[stack.getItemDamage()]); } } @@ -96,7 +96,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class); - if(ceramic != null){ + if (ceramic != null) { return ceramic.getStack(); } return super.getPickBlock(state, target, world, pos, player); @@ -106,7 +106,7 @@ public class BlockCeramic extends Block implements IColoredBlock, IItemModelRegi @Override public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { TileCeramic ceramic = TileUtil.getTile(world, pos, TileCeramic.class); - if(ceramic != null){ + if (ceramic != null) { return ceramic.getColor().getColor(false); } return EnumFlowerColor.get(0).getColor(false); diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 86cf0e88..db3f14e1 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -56,7 +56,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored public BlockRenderLayer getBlockLayer() { return BlockRenderLayer.TRANSLUCENT; } - + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { @@ -65,21 +65,21 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } } - @Override + @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); - Block block = iblockstate.getBlock(); - if (blockState != iblockstate) { - return true; - } + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); + Block block = iblockstate.getBlock(); + if (blockState != iblockstate) { + return true; + } - if (block == this){ - return false; - } + if (block == this) { + return false; + } - return super.shouldSideBeRendered(blockState, blockAccess, pos, side); - } + return super.shouldSideBeRendered(blockState, blockAccess, pos, side); + } @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { @@ -128,7 +128,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); } - + @Override public int getDroppedMeta(IBlockState state, int tileMetadata) { return tileMetadata; @@ -174,7 +174,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored @Override public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) { - if(worldIn == null || pos == null){ + if (worldIn == null || pos == null) { return 0; } return EnumFlowerColor.get(TileEntityMetadata.getTileMetadata(worldIn, pos)).getColor(false); diff --git a/src/main/java/binnie/botany/ceramic/ItemCeramic.java b/src/main/java/binnie/botany/ceramic/ItemCeramic.java index 5828fc63..8e43a2b3 100644 --- a/src/main/java/binnie/botany/ceramic/ItemCeramic.java +++ b/src/main/java/binnie/botany/ceramic/ItemCeramic.java @@ -12,7 +12,7 @@ public class ItemCeramic extends ItemBlock implements IColoredItem { public ItemCeramic(BlockCeramic block) { super(block); } - + @Override public int getMetadata(final int metadata) { return metadata; @@ -23,7 +23,7 @@ public class ItemCeramic extends ItemBlock implements IColoredItem { public int getColorFromItemstack(ItemStack stack, int tintIndex) { return EnumFlowerColor.get(stack.getMetadata()).getColor(false); } - + @Override @SideOnly(Side.CLIENT) public String getItemStackDisplayName(ItemStack itemStack) { diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index cdaf43a5..90d0b7a0 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -10,9 +10,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class PigmentRecipe implements IRecipe { @Override public boolean matches(final InventoryCrafting crafting, final World world) { diff --git a/src/main/java/binnie/botany/ceramic/TileCeramic.java b/src/main/java/binnie/botany/ceramic/TileCeramic.java index 233be5e6..32c301aa 100644 --- a/src/main/java/binnie/botany/ceramic/TileCeramic.java +++ b/src/main/java/binnie/botany/ceramic/TileCeramic.java @@ -8,38 +8,38 @@ import net.minecraft.tileentity.TileEntity; public class TileCeramic extends TileEntity { protected EnumFlowerColor color = EnumFlowerColor.Black; - + public void setColor(EnumFlowerColor color) { this.color = color; } - + public EnumFlowerColor getColor() { return color; } - + @Override public NBTTagCompound writeToNBT(NBTTagCompound compound) { compound.setInteger("Color", color.getID()); return super.writeToNBT(compound); } - + @Override public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); color = EnumFlowerColor.VALUES[compound.getInteger("Color")]; } - - public ItemStack getStack(){ + + public ItemStack getStack() { return getStack(1); } - - public ItemStack getStack(int amount){ + + public ItemStack getStack(int amount) { int ID = 0; - if(color != null){ + if (color != null) { ID = color.getID(); } return new ItemStack(Botany.ceramic, amount, ID); - + } - + } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index 46edd998..b760d0e6 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -118,7 +118,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock> 8 & 0xFF)); } @@ -178,7 +178,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock stacks) { if (stacks.size() != 4) { @@ -50,19 +50,19 @@ public enum CeramicBrickType implements IStringSerializable { return new CeramicBrickPair(c, c, CeramicBrickType.Tile).getStack(3); } }, - Brick("brick", "Ceramic Bricks"){ + Brick("brick", "Ceramic Bricks") { @Override public ItemStack getRecipe(List stacks) { return getBrickRecipe(this, stacks); } }, - StripeBrick("brickstripe", "Striped Ceramic Bricks"){ + StripeBrick("brickstripe", "Striped Ceramic Bricks") { @Override public ItemStack getRecipe(List stacks) { return getBrickRecipe(this, stacks); } }, - LargeBrick("bricklarge", "Large Ceramic Bricks"){ + LargeBrick("bricklarge", "Large Ceramic Bricks") { @Override public ItemStack getRecipe(List stacks) { if (stacks.size() == 1) { @@ -111,7 +111,7 @@ public enum CeramicBrickType implements IStringSerializable { } } }, - Split("split", "Split Ceramic Tile"){ + Split("split", "Split Ceramic Tile") { @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { @@ -139,7 +139,7 @@ public enum CeramicBrickType implements IStringSerializable { return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Split).getStack(4); } }, - Chequered("cheque", "Chequered Ceramic Tile"){ + Chequered("cheque", "Chequered Ceramic Tile") { @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { @@ -168,7 +168,7 @@ public enum CeramicBrickType implements IStringSerializable { return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Chequered).getStack(4); } }, - Mixed("mixed", "Mixed Ceramic Tile"){ + Mixed("mixed", "Mixed Ceramic Tile") { @Override public ItemStack getRecipe(List stacks) { if (stacks.size() != 4) { @@ -207,19 +207,19 @@ public enum CeramicBrickType implements IStringSerializable { return new CeramicBrickPair(EnumFlowerColor.get(colors[0]), EnumFlowerColor.get(colors[1]), CeramicBrickType.Mixed).getStack(4); } }, - VerticalBrick("verticalbrick", "Vertical Ceramic Bricks"){ + VerticalBrick("verticalbrick", "Vertical Ceramic Bricks") { @Override public ItemStack getRecipe(List stacks) { return getVerticalBrickRecipe(stacks); } }, - VerticalStripeBrick("verticalbrickstripe", "Vertical Striped Ceramic Bricks"){ + VerticalStripeBrick("verticalbrickstripe", "Vertical Striped Ceramic Bricks") { @Override public ItemStack getRecipe(List stacks) { return getVerticalBrickRecipe(stacks); } }, - VerticalLargeBrick("verticalbricklarge", "Large Vertical Ceramic Bricks"){ + VerticalLargeBrick("verticalbricklarge", "Large Vertical Ceramic Bricks") { @Override public ItemStack getRecipe(List stacks) { return getVerticalBrickRecipe(stacks); @@ -227,7 +227,7 @@ public enum CeramicBrickType implements IStringSerializable { }; public static final CeramicBrickType[] VALUES = values(); - + String id; String name; @@ -250,7 +250,7 @@ public enum CeramicBrickType implements IStringSerializable { public abstract ItemStack getRecipe(List stacks); - protected ItemStack getVerticalBrickRecipe(List stacks){ + protected ItemStack getVerticalBrickRecipe(List stacks) { if (stacks.size() != 1) { return ItemStack.EMPTY; } @@ -271,7 +271,7 @@ public enum CeramicBrickType implements IStringSerializable { return ItemStack.EMPTY; } - protected ItemStack getBrickRecipe(CeramicBrickType ceramicType, List stacks){ + protected ItemStack getBrickRecipe(CeramicBrickType ceramicType, List stacks) { if (stacks.size() == 1) { final ItemStack stack5 = stacks.get(0); final CeramicBrickPair type = new CeramicBrickPair(stack5); @@ -317,7 +317,7 @@ public enum CeramicBrickType implements IStringSerializable { protected boolean isMortar(final ItemStack stack) { return stack.getItem() == Botany.misc && stack.getItemDamage() == BotanyItems.Mortar.ordinal(); } - + @Override public String getName() { return name().toLowerCase(Locale.ENGLISH); diff --git a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java index 551cd98b..2d39a80f 100644 --- a/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/ItemCeramicBrick.java @@ -10,7 +10,7 @@ public class ItemCeramicBrick extends ItemBlock implements IColoredItem { public ItemCeramicBrick(BlockCeramicBrick block) { super(block); } - + @Override public int getMetadata(final int metadata) { return metadata; @@ -27,7 +27,7 @@ public class ItemCeramicBrick extends ItemBlock implements IColoredItem { } return 16777215; } - + @Override @SideOnly(Side.CLIENT) public String getItemStackDisplayName(ItemStack itemStack) { diff --git a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java index 2a0550f5..c5d39769 100644 --- a/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/TileCeramicBrick.java @@ -7,12 +7,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import javax.annotation.Nullable; - -public class TileCeramicBrick extends TileEntity{ +public class TileCeramicBrick extends TileEntity { private EnumFlowerColor colorFirst = EnumFlowerColor.Black; private EnumFlowerColor colorSecond = EnumFlowerColor.White; - + public void setColors(EnumFlowerColor colorFirst, EnumFlowerColor colorSecond) { this.colorFirst = colorFirst; this.colorSecond = colorSecond; @@ -40,40 +38,40 @@ public class TileCeramicBrick extends TileEntity{ public int ordinal() { return this.colorFirst.ordinal() + this.colorSecond.ordinal() * 256 + getBlockMetadata() * 256 * 256; } - - public CeramicBrickPair pair(){ + + public CeramicBrickPair pair() { return new CeramicBrickPair(colorFirst, colorSecond, CeramicBrickType.VALUES[getBlockMetadata()]); } - + public EnumFlowerColor getColorFirst() { return colorFirst; } - + public EnumFlowerColor getColorSecond() { return colorSecond; } - + @Override public NBTTagCompound writeToNBT(NBTTagCompound compound) { compound.setInteger("First", colorFirst.ordinal()); compound.setInteger("Second", colorSecond.ordinal()); return super.writeToNBT(compound); } - + @Override public NBTTagCompound getUpdateTag() { return writeToNBT(new NBTTagCompound()); } - + @Override public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); - if(compound.hasKey("First")){ + if (compound.hasKey("First")) { colorFirst = EnumFlowerColor.VALUES[compound.getInteger("First")]; } - if(compound.hasKey("Second")){ + if (compound.hasKey("Second")) { colorSecond = EnumFlowerColor.VALUES[compound.getInteger("Second")]; } } - + } diff --git a/src/main/java/binnie/botany/farm/FarmLogic.java b/src/main/java/binnie/botany/farm/FarmLogic.java index b8898d6f..b3f81d66 100644 --- a/src/main/java/binnie/botany/farm/FarmLogic.java +++ b/src/main/java/binnie/botany/farm/FarmLogic.java @@ -24,7 +24,7 @@ public abstract class FarmLogic implements IFarmLogic { protected final IBlockState getBlockState(World world, BlockPos pos) { return world.getBlockState(pos); } - + protected final Block getBlock(World world, BlockPos pos) { return getBlockState(world, pos).getBlock(); } diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 13ae664e..e5940a30 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -36,9 +36,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; import java.util.Random; diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 13e1a013..68f1efda 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -11,7 +11,6 @@ import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import binnie.botany.genetics.Flower; -import binnie.core.BinnieCore; import com.google.common.base.Preconditions; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index f48e8420..fb456c19 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -31,7 +31,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.List; import java.util.Random; public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { @@ -54,38 +53,38 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { this.setHardness(0.5f); this.setSoundType(SoundType.GROUND); this.type = type; - } + } - @Override + @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - switch (side){ - case UP: - return true; - case NORTH: - case SOUTH: - case WEST: - case EAST: - IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); - Block block = iblockstate.getBlock(); - return !iblockstate.isOpaqueCube() && block != Blocks.FARMLAND && block != Blocks.GRASS_PATH && block != this; - default: - return super.shouldSideBeRendered(blockState, blockAccess, pos, side); - } - } + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + switch (side) { + case UP: + return true; + case NORTH: + case SOUTH: + case WEST: + case EAST: + IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); + Block block = iblockstate.getBlock(); + return !iblockstate.isOpaqueCube() && block != Blocks.FARMLAND && block != Blocks.GRASS_PATH && block != this; + default: + return super.shouldSideBeRendered(blockState, blockAccess, pos, side); + } + } - /** - * Used to determine ambient occlusion and culling when rebuilding chunks for render - */ - @Override - public boolean isOpaqueCube(IBlockState state){ - return false; - } + /** + * Used to determine ambient occlusion and culling when rebuilding chunks for render + */ + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } - @Override - public boolean isFullCube(IBlockState state){ - return false; - } + @Override + public boolean isFullCube(IBlockState state) { + return false; + } @Override public String getUnlocalizedName() { diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index e7042a5d..e28c360b 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -4,8 +4,8 @@ import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IFlower; import binnie.botany.api.IBlockSoil; +import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 685dfd61..70ac56de 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -38,7 +38,6 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -165,10 +164,10 @@ public class ModuleGardening implements IInitializable { ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.AshPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(BotanyItems.PulpPowder.get(1), 1); ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack("ash"), 2); - ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack( "wood_pulp"), 2); + ModuleGardening.queuedAlkalineFertilisers.put(Mods.Forestry.stack("wood_pulp"), 2); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1); - ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack( "fertilizer_bio"), 2); + ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack("fertilizer_bio"), 2); ModuleGardening.queuedNutrientFertilisers.put(Mods.Forestry.stack("fertilizer_compound"), 2); for (final Map.Entry entry : ModuleGardening.queuedAcidFertilisers.entrySet()) { this.addAcidFertiliser(entry.getKey(), entry.getValue()); diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index 91624e91..cefe698a 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -1,9 +1,7 @@ package binnie.botany.genetics; import binnie.Binnie; -import binnie.botany.Botany; import binnie.botany.api.IBotanistTracker; -import binnie.botany.core.BotanyCore; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index 3c229db5..eb2cf753 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -90,7 +90,7 @@ public enum EnumFlowerColor implements IFlowerColour, IAlleleInteger, IStringSer YellowGreen("yellowGreen", 10145074); public static final EnumFlowerColor[] VALUES = values(); - + int color; int colorDis; String uid; diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index 1a6c5fbe..e2bceae3 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -16,9 +16,7 @@ import forestry.core.genetics.Individual; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; import java.util.Random; diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index a48afd5a..e06a622d 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -12,8 +12,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class ItemClay extends Item implements IColoredItem, IItemModelRegister { public ItemClay() { this.setUnlocalizedName("clay"); diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 6492edd0..cb43ae22 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -12,8 +12,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class ItemPigment extends Item implements IItemModelRegister, IColoredItem { public ItemPigment() { this.setUnlocalizedName("pigment"); diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 0a2d6fb0..7c9c4278 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -19,9 +19,7 @@ import binnie.core.models.ModelManager; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; -import binnie.core.proxy.BinnieModProxy; import binnie.core.proxy.BinnieProxy; -import binnie.core.proxy.IBinnieModProxy; import binnie.core.proxy.IBinnieProxy; import binnie.core.triggers.ModuleTrigger; import binnie.craftgui.minecraft.ModuleCraftGUI; @@ -58,7 +56,7 @@ public final class BinnieCore extends AbstractMod { public BinnieCore() { FluidRegistry.enableUniversalBucket(); } - + @SuppressWarnings("NullableProblems") @Mod.Instance(Constants.CORE_MOD_ID) private static BinnieCore instance; @@ -193,7 +191,7 @@ public final class BinnieCore extends AbstractMod { @SubscribeEvent @SideOnly(Side.CLIENT) public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) { - if(event.username == null){ + if (event.username == null) { return; } final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId()); @@ -214,7 +212,7 @@ public final class BinnieCore extends AbstractMod { // } Binnie.RESOURCE.registerSprites(); } - + @SubscribeEvent @SideOnly(Side.CLIENT) public void handleModelBake(ModelBakeEvent event) { diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index bc8f1339..8f4cb657 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -45,13 +45,13 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { public boolean hasTileEntity(IBlockState state) { return true; } - + @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return getPickBlock(world, pos); } - - /* IBLOCKMETADATA */ + + /* IBLOCKMETADATA */ @Override public String getDisplayName(final ItemStack par1ItemStack) { return this.getLocalizedName(); @@ -61,7 +61,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { public int getPlacedMeta(final ItemStack item, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(item); } - + @Override public int getDroppedMeta(IBlockState state, int tileMetadata) { return getMetaFromState(state); diff --git a/src/main/java/binnie/core/block/IMultipassBlock.java b/src/main/java/binnie/core/block/IMultipassBlock.java index 0942190f..edf7e792 100644 --- a/src/main/java/binnie/core/block/IMultipassBlock.java +++ b/src/main/java/binnie/core/block/IMultipassBlock.java @@ -1,7 +1,5 @@ package binnie.core.block; -import javax.annotation.Nullable; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -11,12 +9,14 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; + public interface IMultipassBlock { - - default AxisAlignedBB getItemBoundingBox(){ + + default AxisAlignedBB getItemBoundingBox() { return Block.FULL_BLOCK_AABB; } - + @SideOnly(Side.CLIENT) int getRenderPasses(); diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index 1f5cd577..d202a969 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -31,7 +31,7 @@ public class TileEntityMetadata extends TileEntity { } return true; } - + @Override public NBTTagCompound getUpdateTag() { return writeToNBT(new NBTTagCompound()); @@ -63,16 +63,16 @@ public class TileEntityMetadata extends TileEntity { } } } - + @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); - - if(pkt instanceof PacketMetadata){ + + if (pkt instanceof PacketMetadata) { setTileMetadata(((PacketMetadata) pkt).getMetadata(), true); } } - + @Override public SPacketUpdateTileEntity getUpdatePacket() { return new PacketMetadata(pos, meta, getUpdateTag()); diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index 14b36273..18c633c6 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -6,8 +6,6 @@ import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; -import javax.annotation.Nonnull; - public class BinnieCircuitLayout implements ICircuitLayout { private final String uid; private final AbstractMod mod; diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index 67f39649..205e72f0 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -27,7 +27,6 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index c0f701f3..89942399 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,7 +1,6 @@ package binnie.core.genetics; import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.DefaultBeeListener; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/binnie/core/item/ItemFieldKit.java b/src/main/java/binnie/core/item/ItemFieldKit.java index c122aefe..ffc0e1b2 100644 --- a/src/main/java/binnie/core/item/ItemFieldKit.java +++ b/src/main/java/binnie/core/item/ItemFieldKit.java @@ -13,7 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index be421279..b182629e 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemGenesis extends ItemCore { diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 00466054..7c830ba6 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -9,7 +9,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; import java.util.List; public class ItemMisc extends ItemCore { diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index bbea347a..a3c33509 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -1,10 +1,10 @@ package binnie.core.liquid; -import java.awt.Color; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import java.awt.Color; + class BinnieFluid extends Fluid { private final String name; private final IFluidType fluidType; diff --git a/src/main/java/binnie/core/liquid/FluidContainerType.java b/src/main/java/binnie/core/liquid/FluidContainerType.java index 9c96badb..7211db8f 100644 --- a/src/main/java/binnie/core/liquid/FluidContainerType.java +++ b/src/main/java/binnie/core/liquid/FluidContainerType.java @@ -23,11 +23,11 @@ public enum FluidContainerType { public int getMaxStackSize() { return 16; } - - public static FluidContainerType[] getBinnieContainers(){ + + public static FluidContainerType[] getBinnieContainers() { return new FluidContainerType[]{GLASS, CYLINDER}; } - + public String getName() { return this.name().toLowerCase(); } @@ -44,9 +44,9 @@ public enum FluidContainerType { public void setItem(ItemFluidContainer item) { this.item = item; } - - public ItemStack get(int amount){ - if (item == null){ + + public ItemStack get(int amount) { + if (item == null) { throw new IllegalArgumentException("Null container item: " + this); } return new ItemStack(item, amount); diff --git a/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java b/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java index 58dd2683..ef67a562 100644 --- a/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java +++ b/src/main/java/binnie/core/liquid/FluidHandlerItemBinnie.java @@ -1,7 +1,6 @@ package binnie.core.liquid; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; @@ -24,7 +23,7 @@ public class FluidHandlerItemBinnie extends FluidHandlerItemStackSimple { return false; } - if(fluid instanceof BinnieFluid) { + if (fluid instanceof BinnieFluid) { BinnieFluid binnieFluid = (BinnieFluid) fluid; return binnieFluid.getType().canPlaceIn(containerType); } @@ -40,14 +39,13 @@ public class FluidHandlerItemBinnie extends FluidHandlerItemStackSimple { public boolean canDrainFluidType(FluidStack fluid) { return contentsAllowed(fluid); } - - @Override - protected void setContainerToEmpty() - { - super.setContainerToEmpty(); - container.setItemDamage(0); // show the empty container model - } - + + @Override + protected void setContainerToEmpty() { + super.setContainerToEmpty(); + container.setItemDamage(0); // show the empty container model + } + @Override protected void setFluid(FluidStack fluid) { super.setFluid(fluid); diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index ff0ee963..cbed7142 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -34,7 +34,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import java.util.List; public class ItemFluidContainer extends ItemFood implements IItemModelRegister { private final FluidContainerType container; @@ -92,13 +91,13 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { } return container.getEmpty(); } - + @Override public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase entityLiving) { - if(entityLiving instanceof EntityPlayer){ + if (entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entityLiving; player.getFoodStats().addStats(this, stack); - world.playSound((EntityPlayer)null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); + world.playSound((EntityPlayer) null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); onFoodEaten(stack, world, player); return this.container.getEmpty(); } @@ -120,7 +119,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { @Override public EnumAction getItemUseAction(final ItemStack stack) { - if(isDrinkable(stack)){ + if (isDrinkable(stack)) { return EnumAction.DRINK; } return EnumAction.NONE; @@ -132,25 +131,25 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { if (this.isDrinkable(stack) && playerIn.canEat(false)) { playerIn.setActiveHand(handIn); return new ActionResult<>(EnumActionResult.SUCCESS, stack); - }else{ + } else { return super.onItemRightClick(worldIn, playerIn, handIn); } } - + @Override public int getMaxItemUseDuration(ItemStack stack) { - if(isDrinkable(stack)){ + if (isDrinkable(stack)) { return 32; - }else{ + } else { return 0; } } - - @Override - public float getSaturationModifier(ItemStack stack){ - return 0.0F; - } - + + @Override + public float getSaturationModifier(ItemStack stack) { + return 0.0F; + } + @Override public int getHealAmount(ItemStack stack) { return 0; @@ -161,7 +160,7 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid); return liquid != null && liquid.isConsumable(); } - + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { @@ -169,32 +168,32 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister { manager.registerItemModel(item, meshDefinition); ModelBakery.registerItemVariants(item, meshDefinition.location, meshDefinition.empty); } - + @Override - public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt){ + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { return new FluidHandlerItemBinnie(stack, container); } - + @SideOnly(Side.CLIENT) - private class FluidContainerMeshDefinition implements ItemMeshDefinition{ + private class FluidContainerMeshDefinition implements ItemMeshDefinition { final ModelResourceLocation location; final ModelResourceLocation empty; - + public FluidContainerMeshDefinition() { ResourceLocation location = getRegistryName(); this.location = new ModelResourceLocation(location, "inventory"); this.empty = new ModelResourceLocation(new ResourceLocation(location.getResourceDomain(), location.getResourcePath() + "_empty"), "inventory"); } - + @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if(stack.getItemDamage() == 0){ + if (stack.getItemDamage() == 0) { return empty; } return location; } - + } } diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index d59a2657..4fd13210 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,7 +1,6 @@ package binnie.core.liquid; import binnie.core.ManagerBase; -import forestry.core.items.EnumContainerType; import forestry.core.render.TextureManager; import forestry.core.utils.OreDictUtil; import net.minecraft.init.Items; @@ -63,7 +62,7 @@ public class ManagerLiquid extends ManagerBase { GameRegistry.addShapelessRecipe(new ItemStack(Items.GLASS_BOTTLE), FluidContainerType.GLASS.get(1)); GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.GLASS.get(3), " b ", "g g", " g ", - 'g', OreDictUtil.BLOCK_GLASS, 'b', OreDictUtil.SLAB_WOOD)); + 'g', OreDictUtil.BLOCK_GLASS, 'b', OreDictUtil.SLAB_WOOD)); } public IFluidType getFluidType(final String liquid) { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 0653bfe9..58f32986 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -53,7 +53,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { } } } - + @Override public boolean isOpaqueCube(IBlockState state) { return false; diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index b1809d2a..38182de6 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -6,8 +6,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; -import javax.annotation.Nullable; - class DefaultInventory implements IInventory { @Override public int getSizeInventory() { diff --git a/src/main/java/binnie/core/machines/component/IComponentRecipe.java b/src/main/java/binnie/core/machines/component/IComponentRecipe.java index efae1402..35def51d 100644 --- a/src/main/java/binnie/core/machines/component/IComponentRecipe.java +++ b/src/main/java/binnie/core/machines/component/IComponentRecipe.java @@ -2,8 +2,6 @@ package binnie.core.machines.component; import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; - public interface IComponentRecipe { boolean isRecipe(); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 4ad570ac..35fd011c 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -4,7 +4,6 @@ import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; -import com.google.common.collect.Iterables; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/binnie/core/models/DefaultStateMapper.java b/src/main/java/binnie/core/models/DefaultStateMapper.java index 93584c30..536a453b 100644 --- a/src/main/java/binnie/core/models/DefaultStateMapper.java +++ b/src/main/java/binnie/core/models/DefaultStateMapper.java @@ -8,11 +8,11 @@ import net.minecraft.util.ResourceLocation; public class DefaultStateMapper extends StateMapperBase { private ResourceLocation resourceLocation; - + public DefaultStateMapper(ResourceLocation resourceLocation) { this.resourceLocation = resourceLocation; } - + @Override protected ModelResourceLocation getModelResourceLocation(IBlockState state) { return new ModelResourceLocation(resourceLocation, "normal"); diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index b91c7bdf..d87a958d 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -35,7 +35,6 @@ import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; import javax.vecmath.Vector3f; import java.util.ArrayList; import java.util.List; @@ -190,11 +189,11 @@ public class ModelManager implements IModelManager { stateMapperRegister.registerStateMapper(); } } - + @SideOnly(Side.CLIENT) public static void reloadSprites() { for (ISpriteRegister spriteRegister : spriteRegister) { - if(spriteRegister != null){ + if (spriteRegister != null) { spriteRegister.registerSprites(ForestryAPI.textureManager); } } diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/src/main/java/binnie/core/models/ModelMutlipass.java index 4dc8d253..70b02360 100644 --- a/src/main/java/binnie/core/models/ModelMutlipass.java +++ b/src/main/java/binnie/core/models/ModelMutlipass.java @@ -1,21 +1,16 @@ package binnie.core.models; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import binnie.core.block.IMultipassBlock; import forestry.api.core.IModelBaker; import forestry.core.blocks.properties.UnlistedBlockAccess; import forestry.core.blocks.properties.UnlistedBlockPos; import forestry.core.models.ModelBlockCached; -import forestry.core.models.baker.ModelBaker; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -23,6 +18,8 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; + @SideOnly(Side.CLIENT) public class ModelMutlipass, K> extends ModelBlockCached { @@ -39,7 +36,7 @@ public class ModelMutlipass, K> extends Mod protected K getWorldKey(IBlockState state) { return ((B) state.getBlock()).getWorldKey(state); } - + @Nullable protected IBakedModel bakeModel(IBlockState state, K key) { if (key == null) { @@ -72,7 +69,7 @@ public class ModelMutlipass, K> extends Mod protected void bakeBlock(B block, K key, IModelBaker baker, boolean inventory) { for (int pass = 0; pass < block.getRenderPasses(); pass++) { TextureAtlasSprite[] sprites = new TextureAtlasSprite[6]; - for(EnumFacing facing : EnumFacing.VALUES){ + for (EnumFacing facing : EnumFacing.VALUES) { sprites[facing.ordinal()] = block.getSprite(key, facing, pass); } baker.addBlockModel(null, sprites, pass); @@ -82,7 +79,7 @@ public class ModelMutlipass, K> extends Mod //TODO: Adding a preaking sprite baker.setParticleSprite(block.getSprite(key, null, 0)); } - + @Override protected IBakedModel bakeModel(ItemStack stack, World world, K key) { if (key == null) { @@ -95,7 +92,7 @@ public class ModelMutlipass, K> extends Mod return null; } B bBlock = blockClass.cast(block); - + // baker.setRenderBounds(bBlock.getItemBoundingBox()); bakeBlock(bBlock, key, baker, true); diff --git a/src/main/java/binnie/core/models/PanelModelBaker.java b/src/main/java/binnie/core/models/PanelModelBaker.java index 67609488..5eabb6d6 100644 --- a/src/main/java/binnie/core/models/PanelModelBaker.java +++ b/src/main/java/binnie/core/models/PanelModelBaker.java @@ -45,7 +45,7 @@ public class PanelModelBaker implements IModelBaker { public PanelModelBaker() { quadsUV = new float[]{0, 0, 1, 1, 0, 0, 1, 1}; - defUVs = new float[] { 0, 0, 1, 1 }; + defUVs = new float[]{0, 0, 1, 1}; } // @Override @@ -87,7 +87,7 @@ public class PanelModelBaker implements IModelBaker { public void addBlockModel(@Nullable BlockPos pos, TextureAtlasSprite[] sprites, int colorIndex) { setColorIndex(colorIndex); - if(pos != null){ + if (pos != null) { World world = Proxies.common.getRenderWorld(); IBlockState blockState = world.getBlockState(pos); for (EnumFacing facing : EnumFacing.VALUES) { @@ -95,7 +95,7 @@ public class PanelModelBaker implements IModelBaker { addFace(facing, sprites[facing.ordinal()]); } } - }else { + } else { for (EnumFacing facing : EnumFacing.VALUES) { addFace(facing, sprites[facing.ordinal()]); } @@ -110,7 +110,7 @@ public class PanelModelBaker implements IModelBaker { @Override public void addBakedModel(@Nullable IBlockState state, IBakedModel model) { - if(model != null){ + if (model != null) { this.bakedModels.add(Pair.of(state, model)); } } @@ -202,7 +202,7 @@ public class PanelModelBaker implements IModelBaker { } //Add baked models to the current model. - for(Pair bakedModel : bakedModels){ + for (Pair bakedModel : bakedModels) { currentModel.addModelQuads(bakedModel); } @@ -226,7 +226,7 @@ public class PanelModelBaker implements IModelBaker { } @Override - public void setModelState(IModelState modelState){ + public void setModelState(IModelState modelState) { currentModel.setModelState(modelState); } diff --git a/src/main/java/binnie/core/network/packet/PacketMetadata.java b/src/main/java/binnie/core/network/packet/PacketMetadata.java index 0dc256cd..313a69f8 100644 --- a/src/main/java/binnie/core/network/packet/PacketMetadata.java +++ b/src/main/java/binnie/core/network/packet/PacketMetadata.java @@ -1,35 +1,35 @@ package binnie.core.network.packet; -import java.io.IOException; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.math.BlockPos; +import java.io.IOException; + public class PacketMetadata extends SPacketUpdateTileEntity { public int metadata; - + public PacketMetadata(BlockPos blockPos, int metadata, NBTTagCompound compound) { super(blockPos, 0, compound); this.metadata = metadata; } - + @Override public void writePacketData(PacketBuffer buf) throws IOException { super.writePacketData(buf); buf.writeInt(metadata); } - + @Override public void readPacketData(PacketBuffer buf) throws IOException { super.readPacketData(buf); metadata = buf.readInt(); } - + public int getMetadata() { return metadata; } - + } diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index 34911c59..31cee303 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -18,7 +18,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; -import javax.annotation.Nonnull; import javax.annotation.Nullable; public class BinnieModProxy implements IBinnieModProxy { @@ -48,12 +47,12 @@ public class BinnieModProxy implements IBinnieModProxy { public Block registerBlock(Block block) { return GameRegistry.register(block); } - + @Override public void registerBlock(T block, ItemBlock itemBlock) { registerBlock(block); - if(itemBlock.getRegistryName() == null){ + if (itemBlock.getRegistryName() == null) { itemBlock.setRegistryName(block.getRegistryName()); } registerItem(itemBlock); @@ -96,10 +95,10 @@ public class BinnieModProxy implements IBinnieModProxy { public void registermodel(Item item, int meta, ModelResourceLocation modelResourceLocation) { } - + public void registerBlockModel(final BlockModelEntry index) { } - + public void registerModel(ModelEntry index) { } diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 3f68e849..f01dd669 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -104,7 +104,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { public void registerTileEntity(final Class tile, final String id, @Nullable final Object renderer) { registerTileEntity(tile, id); } - + @Override public void registerTileEntity(final Class tile, final String id) { GameRegistry.registerTileEntity(tile, id); @@ -158,7 +158,7 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { public void bindTexture(final ResourceLocation location) { } - public void reloadSprites(){ + public void reloadSprites() { } public EntityPlayer getPlayer() { diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 6ef4caaa..9ce096ed 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -24,7 +24,6 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Keyboard; import javax.annotation.Nullable; import java.io.File; @@ -54,7 +53,7 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy public void registerModels() { getModelManager().registerModels(); } - + @Override public void reloadSprites() { ModelManager.reloadSprites(); diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/src/main/java/binnie/core/proxy/IBinnieProxy.java index ea116d5d..b2441454 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -2,14 +2,10 @@ package binnie.core.proxy; import binnie.core.AbstractMod; -import binnie.core.network.INetworkedEntity; -import binnie.core.network.packet.MessageBase; import binnie.core.resource.BinnieResource; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; @@ -50,7 +46,7 @@ public interface IBinnieProxy extends IProxyCore { Object createObject(final String p0); void registerTileEntity(final Class tile, final String id, @Nullable final Object renderer); - + void registerTileEntity(final Class tile, final String id); void createPipe(final Item p0); diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/src/main/java/binnie/core/proxy/IProxyCore.java index 4a52c3c2..0aa4d1a4 100644 --- a/src/main/java/binnie/core/proxy/IProxyCore.java +++ b/src/main/java/binnie/core/proxy/IProxyCore.java @@ -13,7 +13,7 @@ public interface IProxyCore extends IInitializable { Item registerItem(Item item); Block registerBlock(Block block); - + void registerBlock(B block, ItemBlock itemBlock); public void registerModels(); diff --git a/src/main/java/binnie/core/resource/BinnieSprite.java b/src/main/java/binnie/core/resource/BinnieSprite.java index 69417d6a..208db6af 100644 --- a/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/src/main/java/binnie/core/resource/BinnieSprite.java @@ -26,7 +26,7 @@ public class BinnieSprite extends BinnieResource { Preconditions.checkState(this.sprite != null, "Tried to get sprite before it is registered."); return this.sprite; } - + @SideOnly(Side.CLIENT) public void registerSprites() { sprite = TextureManager.registerSprite(getResourceLocation()); diff --git a/src/main/java/binnie/core/util/FakeMapStorage.java b/src/main/java/binnie/core/util/FakeMapStorage.java index e25045ca..382c21e8 100644 --- a/src/main/java/binnie/core/util/FakeMapStorage.java +++ b/src/main/java/binnie/core/util/FakeMapStorage.java @@ -1,7 +1,6 @@ package binnie.core.util; import net.minecraft.world.WorldSavedData; -import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.MapStorage; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/core/util/FakeSaveHandler.java b/src/main/java/binnie/core/util/FakeSaveHandler.java index da5a6a75..8531d3f6 100644 --- a/src/main/java/binnie/core/util/FakeSaveHandler.java +++ b/src/main/java/binnie/core/util/FakeSaveHandler.java @@ -13,58 +13,48 @@ import java.io.File; public class FakeSaveHandler implements ISaveHandler { @Override - public WorldInfo loadWorldInfo() - { + public WorldInfo loadWorldInfo() { return null; } @Override - public void checkSessionLock() throws MinecraftException - { + public void checkSessionLock() throws MinecraftException { } @Override - public IChunkLoader getChunkLoader(WorldProvider provider) - { + public IChunkLoader getChunkLoader(WorldProvider provider) { throw new UnsupportedOperationException(); } @Override - public void saveWorldInfoWithPlayer(WorldInfo worldInformation, NBTTagCompound tagCompound) - { + public void saveWorldInfoWithPlayer(WorldInfo worldInformation, NBTTagCompound tagCompound) { } @Override - public void saveWorldInfo(WorldInfo worldInformation) - { + public void saveWorldInfo(WorldInfo worldInformation) { } @Override - public IPlayerFileData getPlayerNBTManager() - { + public IPlayerFileData getPlayerNBTManager() { throw new UnsupportedOperationException(); } @Override - public void flush() - { + public void flush() { } @Override - public File getMapFileFromName(String mapName) - { + public File getMapFileFromName(String mapName) { throw new UnsupportedOperationException(); } @Override - public File getWorldDirectory() - { + public File getWorldDirectory() { throw new UnsupportedOperationException(); } @Override - public TemplateManager getStructureTemplateManager() - { + public TemplateManager getStructureTemplateManager() { throw new UnsupportedOperationException(); } } diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index 643dee45..7198fed0 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -2,7 +2,6 @@ package binnie.core.util; import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/binnie/core/util/OreDictionaryUtil.java b/src/main/java/binnie/core/util/OreDictionaryUtil.java index 5914c368..f7f49619 100644 --- a/src/main/java/binnie/core/util/OreDictionaryUtil.java +++ b/src/main/java/binnie/core/util/OreDictionaryUtil.java @@ -3,7 +3,6 @@ package binnie.core.util; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; diff --git a/src/main/java/binnie/core/util/TileUtil.java b/src/main/java/binnie/core/util/TileUtil.java index 3a9434ff..88f1d1cd 100644 --- a/src/main/java/binnie/core/util/TileUtil.java +++ b/src/main/java/binnie/core/util/TileUtil.java @@ -7,7 +7,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; -import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TileUtil { diff --git a/src/main/java/binnie/craftgui/controls/core/Control.java b/src/main/java/binnie/craftgui/controls/core/Control.java index ee6f933f..d800290a 100644 --- a/src/main/java/binnie/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/craftgui/controls/core/Control.java @@ -13,7 +13,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java index edb3fb14..9e90da22 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java @@ -6,7 +6,6 @@ import binnie.craftgui.controls.scroll.ControlScrollableContent; import binnie.craftgui.core.IWidget; import binnie.craftgui.events.EventKey; -import javax.annotation.Nullable; import java.util.Collection; public class ControlListBox extends ControlScrollableContent> implements IControlValue { diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java index 21514a16..73c3a16d 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java @@ -4,7 +4,6 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.IWidget; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java index 7d000c53..d1d80dc6 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/craftgui/controls/tab/ControlTabBar.java @@ -9,7 +9,6 @@ import binnie.craftgui.events.EventValueChanged; import com.google.common.collect.Iterables; import java.util.Collection; -import java.util.List; public class ControlTabBar extends Control implements IControlValue { private T value; diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index fcc6ce5e..ef63e02d 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -250,7 +250,7 @@ public class Widget implements IWidget { public final void recieveEvent(final Event event) { for (final EventHandler handler : this.globalEventHandlers) { if (handler.handles(event)) { - ((EventHandler)handler).onEvent(event); + ((EventHandler) handler).onEvent(event); } } List widgets = new ArrayList<>(this.getWidgets()); diff --git a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java index 917f19a0..e826b779 100644 --- a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java +++ b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java @@ -21,7 +21,6 @@ import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/binnie/craftgui/events/EventHandler.java b/src/main/java/binnie/craftgui/events/EventHandler.java index 262fb360..34ce1290 100644 --- a/src/main/java/binnie/craftgui/events/EventHandler.java +++ b/src/main/java/binnie/craftgui/events/EventHandler.java @@ -2,8 +2,6 @@ package binnie.craftgui.events; import binnie.craftgui.core.IWidget; -import javax.annotation.Nullable; - public abstract class EventHandler { Class eventClass; Origin origin; diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index 93065c61..44fe3356 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -203,7 +203,7 @@ public class ContainerCraftGUI extends Container { } @SideOnly(Side.CLIENT) - public boolean handleNBTClient( final EntityPlayer player, final String name, final NBTTagCompound action) { + public boolean handleNBTClient(final EntityPlayer player, final String name, final NBTTagCompound action) { if (name.contains("tank-update")) { this.onTankUpdate(action); } else if (name.equals("power-update")) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java index e2f2a7a9..2fee5dae 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotArray.java @@ -31,7 +31,7 @@ public class ControlSlotArray extends Control implements Iterable { } public ControlSlotArray create(final InventoryType type, final int[] index) { - ControlSlotArray controlSlots = new ControlSlotArray(parent, x, y, columns, rows); + ControlSlotArray controlSlots = new ControlSlotArray(parent, x, y, columns, rows); int i = 0; for (int row = 0; row < rows; ++row) { for (int column = 0; column < columns; ++column) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java index 44c393c3..e63f9e49 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java @@ -16,8 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - public abstract class ControlSlotBase extends Control implements ITooltip { private ControlItemDisplay itemDisplay; diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java index bb997cbc..9c4a8fc6 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java @@ -8,8 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - public class ControlTabIcon extends ControlTab { private ControlItemDisplay item; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java index d8834829..4b14b985 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java @@ -12,7 +12,6 @@ import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.craftgui.resource.minecraft.StandardTexture; -import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java index ce9acff8..c8e56c54 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlSpeciesBox.java @@ -6,6 +6,7 @@ import binnie.craftgui.minecraft.Window; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; + import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 5bb0001f..47f16cd7 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -394,7 +394,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { final int rockBody = 10066329; final int endBody = 14278302; - for (ExtraBeesSpecies species : values()) { + for (ExtraBeesSpecies species : values()) { species.importTemplate(getDefaultTemplate()); } diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 8d2c9dcb..b8869244 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -6,7 +6,6 @@ import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesFlowers; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IArmorApiarist; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.AlleleManager; @@ -23,7 +22,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 04ea3397..afd1ba63 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java b/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java index 69cbeac1..4ac05528 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java @@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemPunnettSquare extends Item { diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java index 95bb1492..e3ca5fe5 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java @@ -1,8 +1,6 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlPlayerInventory; import binnie.craftgui.minecraft.control.ControlSlotArray; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java index 5a82c922..a0eacb67 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyIndustrialFrame.java @@ -1,8 +1,6 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlPlayerInventory; import binnie.craftgui.minecraft.control.ControlSlot; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java index 46463d98..dc14461f 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java @@ -1,8 +1,6 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; -import binnie.core.machines.Machine; -import binnie.core.machines.TileEntityMachine; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlEnergyBar; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java index c6c01eb7..50ca0fd9 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java @@ -12,8 +12,6 @@ import forestry.api.genetics.IChromosomeType; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - public class ControlChromosome extends Control implements IControlValue, ITooltip { private IChromosomeType value; diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index 3a548cfa..06675663 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -6,7 +6,6 @@ import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import javax.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index 0f09689c..481c5625 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -12,8 +12,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; -import javax.annotation.Nullable; - public class ItemHoneyComb extends ItemProduct implements IColoredItem { public ItemHoneyComb() { diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index 9dff84c7..7a567ef3 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -10,8 +10,6 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class ItemProduct extends Item implements IItemModelRegister { IItemEnum[] types; diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java index d32db4d1..b8230c78 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java @@ -7,8 +7,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import java.util.List; - public class ItemBeehive extends ItemBlock { public ItemBeehive(final Block block) { super(block); diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 1590fcfb..72374c5f 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,6 +1,5 @@ package binnie.extratrees; -import binnie.Binnie; import binnie.Constants; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -16,15 +15,18 @@ import binnie.extratrees.carpentry.ModuleCarpentry; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.core.ModuleCore; -import binnie.extratrees.genetics.*; +import binnie.extratrees.genetics.AlleleETFruit; +import binnie.extratrees.genetics.ButterflySpecies; +import binnie.extratrees.genetics.ETTreeDefinition; +import binnie.extratrees.genetics.ModuleGenetics; import binnie.extratrees.item.ModuleItems; import binnie.extratrees.kitchen.ModuleKitchen; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.proxy.Proxy; +import com.google.common.base.Preconditions; import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.AlleleSpeciesRegisterEvent; -import forestry.api.genetics.IClassification; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.MinecraftForge; @@ -35,18 +37,15 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Nullable; - -import com.google.common.base.Preconditions; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraTrees extends AbstractMod { @@ -203,10 +202,10 @@ public class ExtraTrees extends AbstractMod { Map map = Arrays.stream(ETTreeDefinition.values()).collect(Collectors.toMap(o -> o.name().toLowerCase(), o -> o)); models.forEach(model -> { String species = model.getVariant().split("=")[1]; - ETTreeDefinition treeSpecies = map.get(species); - int primaryColor = treeSpecies.getLeafColor().getRGB(); - int secondaryColor = treeSpecies.getWoodColor().getRGB(); - e.getModelRegistry().putObject(model, new DoublePassBakedModel(e.getModelRegistry().getObject(model), primaryColor, secondaryColor)); + ETTreeDefinition treeSpecies = map.get(species); + int primaryColor = treeSpecies.getLeafColor().getRGB(); + int secondaryColor = treeSpecies.getWoodColor().getRGB(); + e.getModelRegistry().putObject(model, new DoublePassBakedModel(e.getModelRegistry().getObject(model), primaryColor, secondaryColor)); }); } diff --git a/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/src/main/java/binnie/extratrees/api/IDesignMaterial.java index 3f312a44..b38a5858 100644 --- a/src/main/java/binnie/extratrees/api/IDesignMaterial.java +++ b/src/main/java/binnie/extratrees/api/IDesignMaterial.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; public interface IDesignMaterial { ItemStack getStack(); - + ItemStack getStack(boolean fireproof); String getName(); diff --git a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java index 318437d6..5ac51b3e 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockETDecorativeLeaves.java @@ -1,16 +1,15 @@ package binnie.extratrees.block; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import binnie.Constants; import binnie.extratrees.block.property.PropertyETType; import binnie.extratrees.genetics.ETTreeDefinition; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - +import forestry.api.arboriculture.IFruitProvider; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; +import forestry.core.blocks.IColoredBlock; +import forestry.core.proxy.Proxies; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -27,25 +26,17 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.IFruitProvider; -import forestry.api.arboriculture.ITreeGenome; -import forestry.api.core.IItemModelRegister; -import forestry.api.core.IModelManager; -import forestry.api.core.Tabs; -import forestry.arboriculture.PluginArboriculture; -import forestry.arboriculture.genetics.TreeDefinition; -import forestry.core.blocks.IColoredBlock; -import forestry.core.proxy.Proxies; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public abstract class BlockETDecorativeLeaves extends Block implements IItemModelRegister, IColoredBlock, IShearable { private static final int VARIANTS_PER_BLOCK = 16; @@ -56,7 +47,7 @@ public abstract class BlockETDecorativeLeaves extends Block implements IItemMode for (int blockNumber = 0; blockNumber < blockCount; blockNumber++) { final PropertyETType variant = PropertyETType.create("variant", blockNumber, VARIANTS_PER_BLOCK); BlockETDecorativeLeaves block = new BlockETDecorativeLeaves(blockNumber) { - @Override + @Override public PropertyETType getVariant() { return variant; } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 001e105d..03389cbb 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -22,9 +22,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.List; - public class BlockETDoor extends BlockDoor implements IBlockMetadata { // private IIcon getFlippedIcon(final boolean upper, final boolean flip, final int tileMeta) { // final DoorType type = getDoorType(tileMeta); @@ -212,7 +209,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { // public boolean hasTileEntity(final int meta) { // return true; // } - + @Override public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { TileEntity tileentity = world.getTileEntity(pos); @@ -223,7 +220,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); } - + @Override public int getDroppedMeta(IBlockState state, int tileMetadata) { return tileMetadata; diff --git a/src/main/java/binnie/extratrees/block/EnumETLog.java b/src/main/java/binnie/extratrees/block/EnumETLog.java index 6a7211d6..94a655d9 100644 --- a/src/main/java/binnie/extratrees/block/EnumETLog.java +++ b/src/main/java/binnie/extratrees/block/EnumETLog.java @@ -66,7 +66,7 @@ public enum EnumETLog implements IWoodType { public String getName() { return name().toLowerCase(); } - + @Override public String toString() { return getName(); @@ -76,20 +76,20 @@ public enum EnumETLog implements IWoodType { return this.name; } - public void addRecipe() { - if (this.plank == null) { - return; - } - ItemStack log = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, false); - ItemStack result = plank.getStack(false); - result.setCount(4); - GameRegistry.addShapelessRecipe(result, log); - - ItemStack logFireproof = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, true); - ItemStack resultFireproof = plank.getStack(true); - resultFireproof.setCount(4); - GameRegistry.addShapelessRecipe(resultFireproof, logFireproof); - } + public void addRecipe() { + if (this.plank == null) { + return; + } + ItemStack log = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, false); + ItemStack result = plank.getStack(false); + result.setCount(4); + GameRegistry.addShapelessRecipe(result, log); + + ItemStack logFireproof = TreeManager.woodAccess.getStack(this, WoodBlockKind.LOG, true); + ItemStack resultFireproof = plank.getStack(true); + resultFireproof.setCount(4); + GameRegistry.addShapelessRecipe(resultFireproof, logFireproof); + } @Override public float getHardness() { @@ -100,14 +100,14 @@ public enum EnumETLog implements IWoodType { public int getCarbonization() { return 4; } - + @Override public float getCharcoalChance(int numberOfCharcoal) { - if(numberOfCharcoal == 3){ + if (numberOfCharcoal == 3) { return 0.75F; - }else if(numberOfCharcoal == 4){ + } else if (numberOfCharcoal == 4) { return 0.5F; - }else if(numberOfCharcoal == 5){ + } else if (numberOfCharcoal == 5) { return 0.25F; } return 0.15F; diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index a4f3fe16..af07854f 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -1,9 +1,9 @@ package binnie.extratrees.block; -import java.util.Locale; - import binnie.core.BinnieCore; +import java.util.Locale; + public enum FruitPod { Cocoa, Banana, @@ -23,7 +23,7 @@ public enum FruitPod { public short[] getTextures() { return this.textures; } - + public String getModelName() { return name().toLowerCase(Locale.ENGLISH); } diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index 83b5fa40..3c4292a8 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -4,9 +4,10 @@ import binnie.extratrees.api.IDesignMaterial; import forestry.api.arboriculture.IWoodType; public interface IPlankType extends IDesignMaterial { -// IIcon getIcon(); + // IIcon getIcon(); String getPlankTextureName(); + String getDescription(); - + IWoodType getWoodType(); } diff --git a/src/main/java/binnie/extratrees/block/IWoodKind.java b/src/main/java/binnie/extratrees/block/IWoodKind.java index 2fc315bb..daa18780 100644 --- a/src/main/java/binnie/extratrees/block/IWoodKind.java +++ b/src/main/java/binnie/extratrees/block/IWoodKind.java @@ -5,6 +5,8 @@ import net.minecraft.block.properties.PropertyEnum; public interface IWoodKind { PropertyEnum getVariant(); + EnumETLog getWoodType(int meta); + WoodBlockKind getWoodKind(); } diff --git a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java index c6776c15..f8b76775 100644 --- a/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/block/ItemBlockETDecorativeLeaves.java @@ -1,7 +1,5 @@ package binnie.extratrees.block; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import binnie.extratrees.genetics.ETTreeDefinition; import forestry.api.arboriculture.IFruitProvider; import forestry.api.arboriculture.ITreeGenome; @@ -10,6 +8,8 @@ import forestry.arboriculture.items.ItemBlockLeaves; import forestry.core.items.IColoredItem; import forestry.core.items.ItemBlockForestry; import forestry.core.utils.Translator; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 98b5dfdf..562f6b5d 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -1,17 +1,17 @@ package binnie.extratrees.block; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import binnie.Constants; import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.block.ItemMetadata; import binnie.core.liquid.ILiquidType; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.decor.*; +import binnie.extratrees.block.decor.BlockHedge; +import binnie.extratrees.block.decor.BlockMultiFence; +import binnie.extratrees.block.decor.FenceType; +import binnie.extratrees.block.decor.MultiFenceRecipeEmbedded; +import binnie.extratrees.block.decor.MultiFenceRecipeSize; +import binnie.extratrees.block.decor.MultiFenceRecipeSolid; import binnie.extratrees.block.wood.BlockETFence; import binnie.extratrees.block.wood.BlockETLog; import binnie.extratrees.block.wood.BlockETPlank; @@ -44,7 +44,10 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; -import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class ModuleBlocks implements IInitializable { @@ -254,8 +257,8 @@ public class ModuleBlocks implements IInitializable { @Override public void postInit() { IWoodAccess woodAccess = TreeManager.woodAccess; - for(PlankType.ExtraTreePlanks plankType : PlankType.ExtraTreePlanks.VALUES){ - for(boolean fireproof : new boolean[]{false, true}){ + for (PlankType.ExtraTreePlanks plankType : PlankType.ExtraTreePlanks.VALUES) { + for (boolean fireproof : new boolean[]{false, true}) { ItemStack planks = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.PLANKS, fireproof); ItemStack slabs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.SLAB, fireproof); ItemStack stairs = woodAccess.getStack(plankType.getWoodType(), WoodBlockKind.STAIRS, fireproof); @@ -306,7 +309,7 @@ public class ModuleBlocks implements IInitializable { this.addSqueezer(log, liquid, amount, 0.5f); } - private static void addRecipeAtPosition(int position, IRecipe recipe){ + private static void addRecipeAtPosition(int position, IRecipe recipe) { CraftingManager manager = CraftingManager.getInstance(); manager.getRecipeList().add(position, recipe); } diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 91c98b98..d25c6921 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -68,7 +68,7 @@ public class PlankType { Banana(0); public static final ExtraTreePlanks[] VALUES = values(); - + private EnumETLog woodType; private final int color; //IIcon icon; @@ -77,7 +77,7 @@ public class PlankType { this.color = color; } - public static void initWoodTypes(){ + public static void initWoodTypes() { Fir.setWoodType(EnumETLog.Fir); Cedar.setWoodType(EnumETLog.Cedar); Hemlock.setWoodType(EnumETLog.Hemlock); @@ -115,23 +115,23 @@ public class PlankType { PinkIvory.setWoodType(EnumETLog.PinkIvory); Banana.setWoodType(EnumETLog.Banana); } - + public void setWoodType(EnumETLog woodType) { this.woodType = woodType; } - + @Override public EnumETLog getWoodType() { return woodType; } - + @Override public String getName() { return ExtraTrees.proxy.localise("block.planks." + this.toString().toLowerCase()); } @Override - public String getPlankTextureName(){ + public String getPlankTextureName() { return Constants.EXTRA_TREES_MOD_ID + ":blocks/planks/" + name(); } @@ -144,7 +144,7 @@ public class PlankType { public int getColour() { return this.color; } - + @Override public ItemStack getStack(boolean fireproof) { return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); @@ -197,7 +197,7 @@ public class PlankType { } @Override - public String getPlankTextureName(){ + public String getPlankTextureName() { return "minecraft:blocks/planks_" + name().toLowerCase(); } @@ -205,12 +205,12 @@ public class PlankType { public int getColour() { return this.color; } - + @Override public ItemStack getStack() { return getStack(true); } - + @Override public IWoodType getWoodType() { return woodType; @@ -272,7 +272,7 @@ public class PlankType { } @Override - public String getPlankTextureName(){ + public String getPlankTextureName() { return "forestry:blocks/wood/planks." + name().toLowerCase(); } @@ -290,12 +290,12 @@ public class PlankType { public int getColour() { return this.color; } - + @Override public IWoodType getWoodType() { return woodType; } - + @Override public ItemStack getStack(boolean fireproof) { return TreeManager.woodAccess.getStack(woodType, WoodBlockKind.PLANKS, fireproof); @@ -322,7 +322,7 @@ public class PlankType { } } - + //TODO: extrabiomes 1.10.2 /*public enum ExtraBiomesPlank implements IPlankType { Redwood(10185538), diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 951a4b1d..acc4e8b3 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -15,13 +15,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class WoodManager { public static String getDisplayName(IWoodTyped wood, IWoodType woodType) { WoodBlockKind blockKind = wood.getBlockKind(); @@ -48,7 +46,7 @@ public class WoodManager { return displayName; } - + public static IPlankType getPlankType(final int index) { final IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index); if (wood instanceof IPlankType) { diff --git a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java index d0b3638c..b4c57616 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockETFenceGate.java @@ -24,9 +24,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nullable; -import java.util.List; - public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { public BlockETFenceGate() { super(BlockPlanks.EnumType.OAK); @@ -79,7 +76,7 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { public boolean hasTileEntity(IBlockState state) { return true; } - + @Override public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { TileEntity tileentity = world.getTileEntity(pos); @@ -90,7 +87,7 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); } - + @Override public int getDroppedMeta(IBlockState state, int tileMetadata) { return tileMetadata; @@ -101,7 +98,7 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodgate.name", WoodManager.getPlankType(meta).getName()); } - + @Override public void breakBlock(World world, BlockPos pos, IBlockState state) { super.breakBlock(world, pos, state); @@ -127,19 +124,19 @@ public class BlockETFenceGate extends BlockFenceGate implements IBlockMetadata { public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { return 5; } - + @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); } - + // @Override // public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { // return BlockMetadata.getPickBlock(world, x, y, z); // } - + @Override - public boolean isPassable(IBlockAccess worldIn, BlockPos pos){ - return worldIn.getBlockState(pos).getValue(OPEN); - } + public boolean isPassable(IBlockAccess worldIn, BlockPos pos) { + return worldIn.getBlockState(pos).getValue(OPEN); + } } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index dc4762d1..aa43c9d7 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -29,7 +29,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import javax.annotation.Nullable; import java.util.List; public class BlockFence extends net.minecraft.block.BlockFence implements IBlockMetadata, IBlockFence { @@ -72,18 +71,18 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock // public int getRenderType() { // return ExtraTrees.fenceID; // } - + @Override public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { TileEntity tileentity = world.getTileEntity(pos); return tileentity != null && tileentity.receiveClientEvent(id, param); } - + @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { return BlockMetadata.getBlockDroppedAsList(this, world, pos); } - + @Override public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { return BlockMetadata.breakBlock(this, player, world, pos); @@ -93,7 +92,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock public TileEntity createNewTileEntity(final World var1, final int i) { return new TileEntityMetadata(); } - + @Override public boolean hasTileEntity(IBlockState state) { return true; @@ -119,7 +118,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos) { return true; } - + @Override public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { IBlockState state = worldIn.getBlockState(pos); @@ -145,7 +144,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock super.breakBlock(world, pos, state); world.removeTileEntity(pos); } - + @Override public boolean isWood(final IBlockAccess world, final BlockPos pos) { return true; @@ -170,7 +169,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock // @SideOnly(Side.CLIENT) // public void registerBlockIcons(final IIconRegister p_149651_1_) { // } - + @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { return BlockMetadata.getPickBlock(world, pos); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index 5720fa15..0cb8ea1a 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -148,9 +148,9 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { return true; } - private EnumLeafType getType(int meta) { - return EnumLeafType.values()[meta % 8]; - } + private EnumLeafType getType(int meta) { + return EnumLeafType.values()[meta % 8]; + } private boolean isFull(final int meta) { return meta / 8 > 0; @@ -182,9 +182,9 @@ public class BlockHedge extends Block implements IBlockFence, IColoredBlock { @SideOnly(Side.CLIENT) public static int getColor(int meta) { EnumLeafType type = EnumLeafType.values()[meta % 6]; - if (type == EnumLeafType.CONIFERS) { - return ColorizerFoliage.getFoliageColorPine(); - } + if (type == EnumLeafType.CONIFERS) { + return ColorizerFoliage.getFoliageColorPine(); + } final double d0 = 0.5; final double d2 = 1.0; return ColorizerFoliage.getFoliageColor(d0, d2); diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index cc489037..1d28dd53 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -12,8 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import java.util.List; - public class BlockMultiFence extends BlockFence implements IBlockMetadata { public BlockMultiFence() { super("multifence"); diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 285518bf..75e3c290 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -10,9 +10,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class MultiFenceRecipeEmbedded implements IRecipe { private ItemStack cached = ItemStack.EMPTY; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 67422be8..02f73071 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -10,8 +10,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 771a9cea..f0e8e911 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -9,9 +9,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - public class MultiFenceRecipeSolid implements IRecipe { private ItemStack cached = ItemStack.EMPTY; diff --git a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java index 6c2fe717..0f70ad57 100644 --- a/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/ETWoodTypePredicate.java @@ -1,9 +1,8 @@ package binnie.extratrees.block.property; -import com.google.common.base.Predicate; - import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.PlankType; +import com.google.common.base.Predicate; import javax.annotation.Nullable; diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETType.java b/src/main/java/binnie/extratrees/block/property/PropertyETType.java index 8700a290..ac0261a4 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETType.java @@ -1,14 +1,12 @@ package binnie.extratrees.block.property; +import binnie.extratrees.genetics.ETTreeDefinition; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; - -import binnie.extratrees.genetics.ETTreeDefinition; - -import javax.annotation.Nonnull; -import java.util.Collection; import net.minecraft.block.properties.PropertyEnum; +import java.util.Collection; + public class PropertyETType extends PropertyEnum { public static int getBlockCount(int variantsPerBlock) { return (int) Math.ceil((float) ETTreeDefinition.VALUES.length / variantsPerBlock); diff --git a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java index e486ef63..4519dc97 100644 --- a/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java +++ b/src/main/java/binnie/extratrees/block/property/PropertyETWoodType.java @@ -9,15 +9,16 @@ import forestry.arboriculture.blocks.PropertyWoodType; import java.util.Collection; public class PropertyETWoodType extends PropertyWoodType { - + public static PropertyETWoodType[] create(String name, int variantsPerBlock) { return create(name, variantsPerBlock, false); } + public static PropertyETWoodType[] create(String name, int variantsPerBlock, boolean isLog) { int length; - if(isLog){ + if (isLog) { length = EnumETLog.VALUES.length; - }else{ + } else { length = PlankType.ExtraTreePlanks.VALUES.length; } final int variantCount = (int) Math.ceil((float) length / variantsPerBlock); diff --git a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java index 57ac1391..5a6d7de9 100644 --- a/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java +++ b/src/main/java/binnie/extratrees/block/property/TreeTypePredicate.java @@ -1,10 +1,9 @@ package binnie.extratrees.block.property; -import javax.annotation.Nullable; - +import binnie.extratrees.genetics.ETTreeDefinition; import com.google.common.base.Predicate; -import binnie.extratrees.genetics.ETTreeDefinition; +import javax.annotation.Nullable; public class TreeTypePredicate implements Predicate { private final int minMeta; diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java index d4fc7975..28a48d51 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETFence.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETFence.java @@ -20,7 +20,7 @@ public abstract class BlockETFence extends BlockForestryFence impleme for (int i = 0; i < variants.length; i++) { PropertyETWoodType variant = variants[i]; BlockETFence block = new BlockETFence(fireproof, i) { - @Override + @Override public PropertyETWoodType getVariant() { return variant; } @@ -33,10 +33,10 @@ public abstract class BlockETFence extends BlockForestryFence impleme private BlockETFence(boolean fireproof, int blockNumber) { super(fireproof, blockNumber); String name = "fences."; - if(fireproof){ - name+="fireproof."; + if (fireproof) { + name += "fireproof."; } - name+=blockNumber; + name += blockNumber; setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); setUnlocalizedName(name); } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java index c12f9e2a..cdb0f702 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETLog.java @@ -6,6 +6,7 @@ import binnie.extratrees.block.property.PropertyETWoodType; import forestry.arboriculture.blocks.BlockForestryLog; import forestry.arboriculture.blocks.PropertyWoodType; import net.minecraft.util.ResourceLocation; + import java.util.ArrayList; import java.util.List; @@ -29,10 +30,10 @@ public abstract class BlockETLog extends BlockForestryLog { private BlockETLog(boolean fireproof, int blockNumber) { super(fireproof, blockNumber); String name = "logs."; - if(fireproof){ - name+="fireproof."; + if (fireproof) { + name += "fireproof."; } - name+=blockNumber; + name += blockNumber; setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); setUnlocalizedName(name); } @@ -43,5 +44,5 @@ public abstract class BlockETLog extends BlockForestryLog { int variantMeta = (meta % variantCount) + getBlockNumber() * VARIANTS_PER_BLOCK; return EnumETLog.byMetadata(variantMeta); } - + } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java index 3f9af283..cedc6845 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETPlank.java @@ -5,13 +5,13 @@ import binnie.extratrees.block.EnumETLog; import binnie.extratrees.block.property.PropertyETWoodType; import forestry.arboriculture.blocks.BlockForestryPlanks; import net.minecraft.util.ResourceLocation; + import java.util.ArrayList; import java.util.List; -import javax.annotation.Nonnull; public abstract class BlockETPlank extends BlockForestryPlanks { public static final String BLOCK_NAME = "plank"; - + public static List create(boolean fireproof) { List blocks = new ArrayList<>(); PropertyETWoodType[] variants = PropertyETWoodType.create("variant", VARIANTS_PER_BLOCK, false); @@ -31,10 +31,10 @@ public abstract class BlockETPlank extends BlockForestryPlanks { private BlockETPlank(boolean fireproof, int blockNumber) { super(fireproof, blockNumber); String name = "planks."; - if(fireproof){ - name+="fireproof."; + if (fireproof) { + name += "fireproof."; } - name+=blockNumber; + name += blockNumber; setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); setUnlocalizedName(name); } diff --git a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java index 9bebebf6..e0539968 100644 --- a/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/BlockETSlab.java @@ -34,13 +34,13 @@ public abstract class BlockETSlab extends BlockForestrySlab { private BlockETSlab(boolean fireproof, int blockNumber) { super(fireproof, blockNumber); String name = "slabs."; - if(fireproof){ - name+="fireproof."; + if (fireproof) { + name += "fireproof."; } - if(isDouble()){ - name+="double."; + if (isDouble()) { + name += "double."; } - name+=blockNumber; + name += blockNumber; setRegistryName(new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name)); setUnlocalizedName(name); } diff --git a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java index 14573e9f..fc0fd8a3 100644 --- a/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemBlockETWood.java @@ -13,7 +13,7 @@ public class ItemBlockETWood extends ItemBlockWood super(block); setRegistryName(block.getRegistryName()); } - + @Override public String getItemStackDisplayName(ItemStack itemstack) { IWoodTyped wood = getBlock(); diff --git a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java index a5a684ad..864b1608 100644 --- a/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/wood/ItemETSlab.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; public class ItemETSlab extends ItemSlab { - + public ItemETSlab(BlockETSlab block, BlockETSlab slab, BlockETSlab doubleSlab) { super(block, slab, doubleSlab); setRegistryName(block.getRegistryName()); diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 97b8dcbe..eb361f13 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -16,7 +16,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import javax.annotation.Nullable; -import java.util.List; public class BlockCarpentryPanel extends BlockCarpentry { public BlockCarpentryPanel() { @@ -28,7 +27,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { @Override public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { } - + @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { final DesignBlock block = this.getCarpentryBlock(source, pos); @@ -65,12 +64,12 @@ public class BlockCarpentryPanel extends BlockCarpentry { final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); } - + @Override public boolean isOpaqueCube(IBlockState state) { return false; } - + @Override public boolean isFullCube(IBlockState state) { return false; @@ -89,7 +88,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { IBlockState state = world.getBlockState(pos); return state.isSideSolid(world, pos, facing.getOpposite()); } - + @Override public int getPlacedMeta(ItemStack item, World world, BlockPos pos, EnumFacing clickedBlock) { final DesignBlock block = ModuleCarpentry.getCarpentryPanel(this.getDesignSystem(), TileEntityMetadata.getItemDamage(item)); @@ -111,12 +110,12 @@ public class BlockCarpentryPanel extends BlockCarpentry { block.setFacing(facing); return block.getBlockMetadata(this.getDesignSystem()); } - + @Override public boolean isSideSolid(IBlockState base_state, IBlockAccess world, BlockPos pos, EnumFacing side) { return false; } - + @Override public void onNeighborChange(IBlockAccess blockAccess, BlockPos pos, BlockPos neighbor) { super.onNeighborChange(blockAccess, pos, neighbor); @@ -129,5 +128,5 @@ public class BlockCarpentryPanel extends BlockCarpentry { world.setBlockToAir(pos); } } - + } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index cf05496e..2ed12b2c 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -121,11 +121,11 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo @SideOnly(Side.CLIENT) @Override public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - if(world == null || pos == null){ + if (world == null || pos == null) { return 0; } DesignBlock block = this.getCarpentryBlock(world, pos); - if(tintIndex > 0){ + if (tintIndex > 0) { return block.getSecondaryColour(); } return block.getPrimaryColour(); @@ -167,9 +167,9 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo @Override @SideOnly(Side.CLIENT) - public EnumBlockRenderType getRenderType(IBlockState state){ - return EnumBlockRenderType.MODEL; - } + public EnumBlockRenderType getRenderType(IBlockState state) { + return EnumBlockRenderType.MODEL; + } @SideOnly(Side.CLIENT) @Override @@ -188,7 +188,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo manager.registerItemModel(item, new DesignMeshDefinition()); } - private class DesignMeshDefinition implements ItemMeshDefinition{ + private class DesignMeshDefinition implements ItemMeshDefinition { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { @@ -204,7 +204,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { - return ((IExtendedBlockState)state).withProperty(UnlistedBlockPos.POS, pos).withProperty(UnlistedBlockAccess.BLOCKACCESS, world); + return ((IExtendedBlockState) state).withProperty(UnlistedBlockPos.POS, pos).withProperty(UnlistedBlockAccess.BLOCKACCESS, world); } @SideOnly(Side.CLIENT) @@ -233,11 +233,11 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public TextureAtlasSprite getSprite(Integer key, @Nullable EnumFacing facing, int pass) { DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), key); - if(facing == null){ + if (facing == null) { return block.getPrimarySprite(getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[0]); } - if(pass > 0){ + if (pass > 0) { return block.getSecondarySprite(getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[facing.ordinal()]); } return block.getPrimarySprite(getDesignSystem(), BlockDesign.RENDER_DIRECTIONS[facing.ordinal()]); diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 1a0abe9a..55ef20fa 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -28,7 +28,7 @@ public class BlockStainedDesign extends BlockDesign { public int quantityDropped(final Random p_149745_1_) { return 0; } - + @Override public boolean isOpaqueCube(IBlockState state) { return false; @@ -43,28 +43,28 @@ public class BlockStainedDesign extends BlockDesign { public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) { return layer == BlockRenderLayer.TRANSLUCENT; } - + @SideOnly(Side.CLIENT) @Override public int getRenderPasses() { return 2; } - - @Override + + @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); - Block block = iblockstate.getBlock(); - if (blockState != iblockstate) { - return true; - } + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + IBlockState iblockstate = blockAccess.getBlockState(pos.offset(side)); + Block block = iblockstate.getBlock(); + if (blockState != iblockstate) { + return true; + } - if (block == this){ - return false; - } + if (block == this) { + return false; + } - return super.shouldSideBeRendered(blockState, blockAccess, pos, side); - } + return super.shouldSideBeRendered(blockState, blockAccess, pos, side); + } @Override public ItemStack getCreativeStack(final IDesign design) { diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index ceaaefef..2e887911 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -100,7 +100,7 @@ public class CarpentryInterface implements ICarpentryInterface { @Nullable public IDesignMaterial getWoodMaterial(final ItemStack stack) { for (final Map.Entry entry : CarpentryInterface.woodMap.entrySet()) { - for(boolean fireproof : new boolean[]{true, false}){ + for (boolean fireproof : new boolean[]{true, false}) { final ItemStack key = entry.getValue().getStack(fireproof); if (key.isItemEqual(stack)) { return entry.getValue(); diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index 7f879ac4..c11a2355 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -135,249 +135,250 @@ public class DesignBlock { } } } - - private static final int[][] ROTATION_MATRIX = { - {0, 1, 4, 5, 3, 2, 6}, - {0, 1, 5, 4, 2, 3, 6}, - {5, 4, 2, 3, 0, 1, 6}, - {4, 5, 2, 3, 1, 0, 6}, - {2, 3, 1, 0, 4, 5, 6}, - {3, 2, 0, 1, 4, 5, 6}, - {0, 1, 2, 3, 4, 5, 6}, - }; - - public EnumFacing getRotation(EnumFacing facing, EnumFacing axis) { - return getNewFacing(ROTATION_MATRIX[axis.ordinal()][facing.ordinal()]); - } + + private static final int[][] ROTATION_MATRIX = { + {0, 1, 4, 5, 3, 2, 6}, + {0, 1, 5, 4, 2, 3, 6}, + {5, 4, 2, 3, 0, 1, 6}, + {4, 5, 2, 3, 1, 0, 6}, + {2, 3, 1, 0, 4, 5, 6}, + {3, 2, 0, 1, 4, 5, 6}, + {0, 1, 2, 3, 4, 5, 6}, + }; + + public EnumFacing getRotation(EnumFacing facing, EnumFacing axis) { + return getNewFacing(ROTATION_MATRIX[axis.ordinal()][facing.ordinal()]); + } public ILayout getLayout(EnumFacing facing) { EnumFacing adjustedFacing; facing = (adjustedFacing = getRotation(facing, EnumFacing.DOWN)); switch (this.getFacing()) { - case DOWN: { - adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); - adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); - break; - } - case EAST: { - adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); - adjustedFacing = getRotation(adjustedFacing, EnumFacing.NORTH); - break; - } - case NORTH: { - adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); - adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH); - adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH); - break; - } - case SOUTH: { - adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); - break; - } - case WEST: { - adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); - adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH); - break; - } + case DOWN: { + adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); + adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); + break; + } + case EAST: { + adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); + adjustedFacing = getRotation(adjustedFacing, EnumFacing.NORTH); + break; + } + case NORTH: { + adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); + adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH); + adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH); + break; + } + case SOUTH: { + adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); + break; + } + case WEST: { + adjustedFacing = getRotation(adjustedFacing, EnumFacing.EAST); + adjustedFacing = getRotation(adjustedFacing, EnumFacing.SOUTH); + break; + } } for (int i = 0; i < this.rotation; ++i) { adjustedFacing = getRotation(adjustedFacing, EnumFacing.DOWN); } ILayout layout = null; switch (adjustedFacing) { - case EAST: { - layout = this.getDesign().getEastPattern(); - break; - } - case NORTH: { - layout = this.getDesign().getNorthPattern(); - break; - } - case SOUTH: { - layout = this.getDesign().getSouthPattern(); - break; - } - case WEST: { - layout = this.getDesign().getWestPattern(); - break; - } - case DOWN: { - layout = this.getDesign().getBottomPattern(); - break; - } - default: { - layout = this.getDesign().getTopPattern(); - break; - } - } - LAYOUTS: { - switch (this.getFacing()) { - case UP: { - if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - break; - } - break; - } - case DOWN: { - switch (facing) { - case UP: - case DOWN: { - layout = layout.flipVertical(); - break; - } - case EAST: - case NORTH: - case SOUTH: - case WEST: { - layout = layout.rotateRight().rotateRight(); - break; - } - } - if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); - } - break; - } - break; - } case EAST: { - switch (facing) { - case SOUTH: - case UP: { - layout = layout.rotateRight(); - break; - } - case NORTH: { - layout = layout.rotateLeft(); - break; - } - case DOWN: { - layout = layout.rotateLeft().flipHorizontal(); - break; - } - case WEST: { - layout = layout.flipHorizontal(); - break; - } - } - if (facing == EnumFacing.EAST) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - } - if (facing == EnumFacing.WEST) { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); - } - break; - } - break; - } - case WEST: { - switch (facing) { - case NORTH: { - layout = layout.rotateRight(); - break; - } - case SOUTH: - case UP: { - layout = layout.rotateLeft(); - break; - } - case DOWN: { - layout = layout.rotateLeft().flipVertical(); - break; - } - case EAST: { - layout = layout.flipHorizontal(); - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); - } - break; - } - case WEST: { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - break; - } - } + layout = this.getDesign().getEastPattern(); break; } case NORTH: { - switch (facing) { - case WEST: { - layout = layout.rotateLeft(); - break LAYOUTS; - } - case EAST: { - layout = layout.rotateRight(); - break LAYOUTS; - } - case DOWN: { - layout = layout.flipHorizontal(); - break LAYOUTS; - } - case SOUTH: { - layout = layout.flipHorizontal(); - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); - } - break LAYOUTS; - } - case NORTH: { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); - } - break LAYOUTS; - } - default: { - break LAYOUTS; - } - } - + layout = this.getDesign().getNorthPattern(); + break; } case SOUTH: { - switch (facing) { - case EAST: { - layout = layout.rotateLeft(); - break LAYOUTS; - } - case WEST: { - layout = layout.rotateRight(); - break LAYOUTS; - } + layout = this.getDesign().getSouthPattern(); + break; + } + case WEST: { + layout = this.getDesign().getWestPattern(); + break; + } + case DOWN: { + layout = this.getDesign().getBottomPattern(); + break; + } + default: { + layout = this.getDesign().getTopPattern(); + break; + } + } + LAYOUTS: + { + switch (this.getFacing()) { case UP: { - layout = layout.rotateRight().rotateRight(); - break LAYOUTS; + if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateRight(); + } + break; + } + break; } case DOWN: { - layout = layout.flipVertical(); - break LAYOUTS; + switch (facing) { + case UP: + case DOWN: { + layout = layout.flipVertical(); + break; + } + case EAST: + case NORTH: + case SOUTH: + case WEST: { + layout = layout.rotateRight().rotateRight(); + break; + } + } + if (facing == EnumFacing.DOWN || facing == EnumFacing.UP) { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateLeft(); + } + break; + } + break; + } + case EAST: { + switch (facing) { + case SOUTH: + case UP: { + layout = layout.rotateRight(); + break; + } + case NORTH: { + layout = layout.rotateLeft(); + break; + } + case DOWN: { + layout = layout.rotateLeft().flipHorizontal(); + break; + } + case WEST: { + layout = layout.flipHorizontal(); + break; + } + } + if (facing == EnumFacing.EAST) { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateRight(); + } + } + if (facing == EnumFacing.WEST) { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateLeft(); + } + break; + } + break; + } + case WEST: { + switch (facing) { + case NORTH: { + layout = layout.rotateRight(); + break; + } + case SOUTH: + case UP: { + layout = layout.rotateLeft(); + break; + } + case DOWN: { + layout = layout.rotateLeft().flipVertical(); + break; + } + case EAST: { + layout = layout.flipHorizontal(); + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateLeft(); + } + break; + } + case WEST: { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateRight(); + } + break; + } + } + break; } case NORTH: { - layout = layout.flipHorizontal(); - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateLeft(); + switch (facing) { + case WEST: { + layout = layout.rotateLeft(); + break LAYOUTS; + } + case EAST: { + layout = layout.rotateRight(); + break LAYOUTS; + } + case DOWN: { + layout = layout.flipHorizontal(); + break LAYOUTS; + } + case SOUTH: { + layout = layout.flipHorizontal(); + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateLeft(); + } + break LAYOUTS; + } + case NORTH: { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateRight(); + } + break LAYOUTS; + } + default: { + break LAYOUTS; + } } - break LAYOUTS; + } case SOUTH: { - for (int j = 0; j < this.rotation; ++j) { - layout = layout.rotateRight(); + switch (facing) { + case EAST: { + layout = layout.rotateLeft(); + break LAYOUTS; + } + case WEST: { + layout = layout.rotateRight(); + break LAYOUTS; + } + case UP: { + layout = layout.rotateRight().rotateRight(); + break LAYOUTS; + } + case DOWN: { + layout = layout.flipVertical(); + break LAYOUTS; + } + case NORTH: { + layout = layout.flipHorizontal(); + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateLeft(); + } + break LAYOUTS; + } + case SOUTH: { + for (int j = 0; j < this.rotation; ++j) { + layout = layout.rotateRight(); + } + break LAYOUTS; + } + default: { + break LAYOUTS; + } } - break LAYOUTS; - } - default: { - break LAYOUTS; - } - } - } + } } } return layout; @@ -420,15 +421,13 @@ public class DesignBlock { hammerI.onHammerUsed(hammer, player); } this.setFacing(newFacing); - } - else { + } else { if (facing != this.getFacing()) { hammerI.onHammerUsed(hammer, player); } this.setFacing(facing); } - } - else { + } else { ++this.rotation; hammerI.onHammerUsed(hammer, player); } @@ -439,14 +438,13 @@ public class DesignBlock { this.rotation = 3; } } - - private EnumFacing getNewFacing(int index){ - if (index >= 0 && index < EnumFacing.VALUES.length) - { - return EnumFacing.VALUES[index]; - } - return EnumFacing.DOWN; - } + + private EnumFacing getNewFacing(int index) { + if (index >= 0 && index < EnumFacing.VALUES.length) { + return EnumFacing.VALUES[index]; + } + return EnumFacing.DOWN; + } public void setFacing(final EnumFacing facing) { this.facing = facing; diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java index 783d85cd..f044015d 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java @@ -328,7 +328,7 @@ public enum EnumPattern implements IPattern { protected void setLeftRotation(final EnumPattern pattern, final boolean inverted) { this.leftRotation = Layout.get(pattern, inverted); } - + @Override public void registerSprites(ITextureManager manager) { } diff --git a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java index 71b473db..f2cbf03c 100644 --- a/src/main/java/binnie/extratrees/carpentry/ItemDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/ItemDesign.java @@ -7,17 +7,17 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemDesign extends ItemMetadata implements IColoredItem{ +public class ItemDesign extends ItemMetadata implements IColoredItem { public ItemDesign(BlockDesign block) { super(block); } - + @SideOnly(Side.CLIENT) @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { - DesignBlock block = ModuleCarpentry.getDesignBlock(((BlockDesign)this.block).getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); - if(tintIndex > 0){ + DesignBlock block = ModuleCarpentry.getDesignBlock(((BlockDesign) this.block).getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + if (tintIndex > 0) { return block.getSecondaryColour(); } return block.getPrimaryColour(); diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index 8a19dfd6..5f768b99 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -12,11 +12,11 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; public class ModuleCarpentry implements IInitializable { - + public BlockCarpentry blockCarpentry; public BlockCarpentry blockPanel; public BlockStainedDesign blockStained; - + @Override public void preInit() { blockCarpentry = new BlockCarpentry("carpentry"); diff --git a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java index c3585f0e..793023b0 100644 --- a/src/main/java/binnie/extratrees/gen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/gen/WorldGenShrub.java @@ -3,11 +3,11 @@ package binnie.extratrees.gen; import forestry.api.world.ITreeGenData; public class WorldGenShrub { - public static class Shrub extends WorldGenTree{ + public static class Shrub extends WorldGenTree { public Shrub(ITreeGenData tree) { super(tree); } - + @Override public void generate() { float leafSpawn = this.height; @@ -30,7 +30,7 @@ public class WorldGenShrub { this.generateCylinder(new Vector(f3, h3, 0.0f), width, 1, this.leaf, false); } } - + @Override public void preGenerate() { this.minHeight = 1; diff --git a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java index 8bf8ae7d..4575c59b 100644 --- a/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java +++ b/src/main/java/binnie/extratrees/genetics/AlleleETFruit.java @@ -29,11 +29,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -42,7 +39,7 @@ import java.util.Random; public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IFruitProvider { - + /*public static void createAlleles() { List fruitAlleles = Arrays.asList( fruitNone = new AlleleFruit("none", new FruitProviderNone("for.fruits.none", null)), @@ -352,7 +349,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public void addProduct(ItemStack product, float chance) { this.products.put(product, chance); } - + private void setFamily(IFruitFamily family) { this.family = family; } @@ -365,8 +362,8 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override @SideOnly(Side.CLIENT) public void registerSprites() { - if(this == Apple){ - for(FruitSprite sprite : FruitSprite.VALUES){ + if (this == Apple) { + for (FruitSprite sprite : FruitSprite.VALUES) { sprite.registerSprites(); } } @@ -399,7 +396,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF @Override public boolean trySpawnFruitBlock(ITreeGenome genome, World world, Random rand, BlockPos pos) { - if(this.pod != null && world.rand.nextFloat() <= genome.getSappiness()){ + if (this.pod != null && world.rand.nextFloat() <= genome.getSappiness()) { TreeManager.treeRoot.setFruitBlock(world, genome, this, genome.getSappiness(), pos); } return false; @@ -453,7 +450,7 @@ public class AlleleETFruit extends AlleleCategorized implements IAlleleFruit, IF public String getModID() { return Constants.EXTRA_TREES_MOD_ID; } - + @Override public int getColour(ITreeGenome genome, IBlockAccess world, BlockPos pos, int ripeningTime) { if (!this.isRipening) { diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 895c528b..054bc3ada 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -22,9 +22,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.BiomeDictionary; -import javax.annotation.Nullable; import java.util.Collections; -import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java index 1109cc39..372f7811 100644 --- a/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java +++ b/src/main/java/binnie/extratrees/genetics/ETLeafProvider.java @@ -29,5 +29,5 @@ public class ETLeafProvider implements ILeafProvider { } return ModuleBlocks.getDecorativeLeaves(species.getUID()); } - + } diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index ce9be4e6..6d357f13 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -3,9 +3,44 @@ package binnie.extratrees.genetics; import binnie.Constants; import binnie.core.genetics.ForestryAllele; import binnie.extratrees.block.EnumETLog; -import binnie.extratrees.gen.*; +import binnie.extratrees.gen.WorldGenAlder; +import binnie.extratrees.gen.WorldGenApple; +import binnie.extratrees.gen.WorldGenAsh; +import binnie.extratrees.gen.WorldGenBanana; +import binnie.extratrees.gen.WorldGenBeech; +import binnie.extratrees.gen.WorldGenConifer; +import binnie.extratrees.gen.WorldGenEucalyptus; +import binnie.extratrees.gen.WorldGenFir; +import binnie.extratrees.gen.WorldGenHolly; +import binnie.extratrees.gen.WorldGenJungle; +import binnie.extratrees.gen.WorldGenLazy; +import binnie.extratrees.gen.WorldGenMaple; +import binnie.extratrees.gen.WorldGenPalm; +import binnie.extratrees.gen.WorldGenPoplar; +import binnie.extratrees.gen.WorldGenShrub; +import binnie.extratrees.gen.WorldGenSorbus; +import binnie.extratrees.gen.WorldGenTree; +import binnie.extratrees.gen.WorldGenTree2; +import binnie.extratrees.gen.WorldGenTree3; +import binnie.extratrees.gen.WorldGenTropical; +import binnie.extratrees.gen.WorldGenWalnut; import com.google.common.base.Preconditions; -import forestry.api.arboriculture.*; +import com.mojang.authlib.GameProfile; +import forestry.api.arboriculture.EnumForestryWoodType; +import forestry.api.arboriculture.EnumGermlingType; +import forestry.api.arboriculture.EnumLeafType; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.EnumVanillaWoodType; +import forestry.api.arboriculture.IAlleleTreeSpecies; +import forestry.api.arboriculture.IAlleleTreeSpeciesBuilder; +import forestry.api.arboriculture.ILeafSpriteProvider; +import forestry.api.arboriculture.ITree; +import forestry.api.arboriculture.ITreeGenerator; +import forestry.api.arboriculture.ITreeGenome; +import forestry.api.arboriculture.IWoodProvider; +import forestry.api.arboriculture.IWoodType; +import forestry.api.arboriculture.TreeManager; +import forestry.api.arboriculture.WoodBlockKind; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; @@ -30,20 +65,17 @@ import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import org.apache.commons.lang3.StringUtils; -import com.mojang.authlib.GameProfile; - -import java.awt.*; +import java.awt.Color; import java.util.Arrays; import java.util.Locale; public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, ITreeGenerator { - OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3),EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ - + OrchardApple("malus", "domestica", EnumLeafType.DECIDUOUS, new Color(0x09E67E), new Color(0xFF9CF3), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenApple.OrchardApple(tree); } - + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Apple); @@ -57,13 +89,12 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - SweetCrabapple("malus", "coronaria", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ - + SweetCrabapple("malus", "coronaria", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenApple.SweetCrabapple(tree); } - + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Crabapple); @@ -79,13 +110,12 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - FloweringCrabapple("malus", "hopa", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F),EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ - + FloweringCrabapple("malus", "hopa", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenApple.FloweringCrabapple(tree); } - + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Crabapple); @@ -102,13 +132,12 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - PrairieCrabapple("malus", "ioensis", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)){ - + PrairieCrabapple("malus", "ioensis", EnumLeafType.DECIDUOUS, new Color(0x7A9953), new Color(0xFC359F), EnumSaplingType.Default, EnumETLog.Apple, new Color(0x7B7A7B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenApple.PrairieCrabapple(tree); } - + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Crabapple); @@ -125,19 +154,18 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Blackthorn("prunus", "spinosa", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ - + Blackthorn("prunus", "spinosa", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blackthorn); - template.set(EnumTreeChromosome.HEIGHT,ForestryAllele.TreeHeight.Smallest.getAllele()); - template.set(EnumTreeChromosome.YIELD,ForestryAllele.Yield.Low.getAllele()); - template.set(EnumTreeChromosome.SAPPINESS,ForestryAllele.Sappiness.Average.getAllele()); + template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); + template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); + template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); } @@ -148,19 +176,18 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - CherryPlum("prunus", "cerasifera", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ - + CherryPlum("prunus", "cerasifera", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF87C7), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.CherryPlum); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); - template.set(EnumTreeChromosome.SAPPINESS,ForestryAllele.Sappiness.Average.getAllele()); + template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); } @@ -171,15 +198,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Peach("prunus", "persica", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ - + Peach("prunus", "persica", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Peach); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -194,15 +220,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Nectarine("prunus", "nectarina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ - + Nectarine("prunus", "nectarina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFF269A), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Nectarine); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -216,15 +241,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Apricot("prunus", "armeniaca", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF5B8D8), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ - + Apricot("prunus", "armeniaca", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF5B8D8), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Apricot); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -238,19 +262,19 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Almond("prunus", "amygdalus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF584C0), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)){ - + Almond("prunus", "amygdalus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF584C0), EnumSaplingType.Fruit, EnumForestryWoodType.PLUM, new Color(0xB68661)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Almond); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); - template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele());; + template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); + ; } @Override @@ -260,15 +284,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)){ - + WildCherry("prunus", "avium", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.WildCherry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -284,18 +307,18 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)){ - + SourCherry("prunus", "cerasus", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xF7EBF6), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.SourCherry); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); - template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele());; + template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); + ; } @Override @@ -305,13 +328,12 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)){ - + BlackCherry("prunus", "serotina", EnumLeafType.DECIDUOUS, new Color(0x6D8F1E), new Color(0xFAE1F8), EnumSaplingType.Fruit, EnumETLog.Cherry, new Color(0x716850)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPlum(tree); } - + @Override protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.BlackCherry); @@ -329,15 +351,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Orange("citrus", "sinensis", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Orange("citrus", "sinensis", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Orange); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -352,15 +373,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Manderin("citrus", "reticulata", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Manderin("citrus", "reticulata", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Manderin); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -375,15 +395,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Satsuma("citrus", "unshiu", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Satsuma("citrus", "unshiu", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Satsuma); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -398,15 +417,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Tangerine("citrus", "tangerina", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Tangerine("citrus", "tangerina", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Tangerine); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -422,15 +440,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Lime("citrus", "latifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Lime("citrus", "latifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Lime); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -444,15 +461,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - KeyLime("citrus", "aurantifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + KeyLime("citrus", "aurantifolia", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.KeyLime); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); @@ -468,15 +484,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - FingerLime("citrus", "australasica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + FingerLime("citrus", "australasica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.FingerLime); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -491,15 +506,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Pomelo("citrus", "maxima", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Pomelo("citrus", "maxima", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Pomelo); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -514,15 +528,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Grapefruit("citrus", "paradisi", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Grapefruit("citrus", "paradisi", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Grapefruit); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -538,15 +551,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Kumquat("citrus", "margarita", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Kumquat("citrus", "margarita", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Kumquat); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -560,15 +572,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Citron("citrus", "medica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + Citron("citrus", "medica", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Citron); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -582,15 +593,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - BuddhaHand("citrus", "sarcodactylus", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)){ - + BuddhaHand("citrus", "sarcodactylus", EnumLeafType.JUNGLE, new Color(0x88AF54), new Color(0xA3B850), EnumSaplingType.Fruit, EnumForestryWoodType.CITRUS, new Color(0x5B4B39)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLemon(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.BuddhaHand); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -603,15 +613,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)){ - + Banana("musa", "sinensis", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBanana(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Banana); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -624,15 +633,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - RedBanana("musa", "rubra", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)){ - + RedBanana("musa", "rubra", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBanana(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.RedBanana); } @@ -642,15 +650,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Plantain("musa", "paradisiaca", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)){ - + Plantain("musa", "paradisiaca", EnumLeafType.PALM, new Color(0xA1CD8E), new Color(0x44E500), EnumSaplingType.Default, EnumETLog.Banana, new Color(0x85924F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBanana(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Plantain); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -662,17 +669,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Butternut("juglans", "cinerea", EnumLeafType.DECIDUOUS, new Color(0x82B58C), new Color(0x82DD8C), EnumSaplingType.Default, EnumETLog.Butternut, new Color(0xB7ADA0)){ - + Butternut("juglans", "cinerea", EnumLeafType.DECIDUOUS, new Color(0x82B58C), new Color(0x82DD8C), EnumSaplingType.Default, EnumETLog.Butternut, new Color(0xB7ADA0)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenWalnut.Butternut(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Butternut); - template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); + template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); } @@ -685,15 +691,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Rowan("sorbus", "aucuparia", EnumLeafType.DECIDUOUS, new Color(0x9EC79B), new Color(0x9EE8B2), EnumSaplingType.Default, EnumETLog.Rowan, new Color(0xB6B09B)){ - + Rowan("sorbus", "aucuparia", EnumLeafType.DECIDUOUS, new Color(0x9EC79B), new Color(0x9EE8B2), EnumSaplingType.Default, EnumETLog.Rowan, new Color(0xB6B09B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenSorbus.Rowan(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Larger.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -705,30 +710,28 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Hemlock("tsuga", "heterophylla", EnumLeafType.CONIFERS, new Color(0x5CAC72), new Color(0x5CD172), EnumSaplingType.Default, EnumETLog.Hemlock, new Color(0xADA39B)){ - + Hemlock("tsuga", "heterophylla", EnumLeafType.CONIFERS, new Color(0x5CAC72), new Color(0x5CD172), EnumSaplingType.Default, EnumETLog.Hemlock, new Color(0xADA39B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenConifer.WesternHemlock(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); } }, - Ash("fraxinus", "excelsior", EnumLeafType.DECIDUOUS, new Color(0x488E2B), new Color(0x48E42B), EnumSaplingType.Default, EnumETLog.Ash, new Color(0x898982)){ - + Ash("fraxinus", "excelsior", EnumLeafType.DECIDUOUS, new Color(0x488E2B), new Color(0x48E42B), EnumSaplingType.Default, EnumETLog.Ash, new Color(0x898982)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenAsh.CommonAsh(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } @@ -741,15 +744,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Alder("alnus", "glutinosa", EnumLeafType.DECIDUOUS, new Color(0x698A33), new Color(0x69AE33), EnumSaplingType.Default, EnumETLog.Alder, new Color(0xC6C0B8)){ - + Alder("alnus", "glutinosa", EnumLeafType.DECIDUOUS, new Color(0x698A33), new Color(0x69AE33), EnumSaplingType.Default, EnumETLog.Alder, new Color(0xC6C0B8)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenAlder.CommonAlder(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } @@ -761,15 +763,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Beech("fagus", "sylvatica", EnumLeafType.DECIDUOUS, new Color(0x83A04C), new Color(0x83C64C), EnumSaplingType.Default, EnumETLog.Beech, new Color(0xB2917E)){ - + Beech("fagus", "sylvatica", EnumLeafType.DECIDUOUS, new Color(0x83A04C), new Color(0x83C64C), EnumSaplingType.Default, EnumETLog.Beech, new Color(0xB2917E)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBeech.CommonBeech(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Beechnut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -781,15 +782,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - CopperBeech("fagus", "purpurea", EnumLeafType.DECIDUOUS, new Color(0x801318), new Color(0xD15B4D), EnumSaplingType.Default, EnumETLog.Beech, new Color(0xB2917E)){ - + CopperBeech("fagus", "purpurea", EnumLeafType.DECIDUOUS, new Color(0x801318), new Color(0xD15B4D), EnumSaplingType.Default, EnumETLog.Beech, new Color(0xB2917E)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenBeech.CopperBeech(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Beechnut); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } @@ -800,15 +800,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Aspen("populus", "tremula", EnumLeafType.DECIDUOUS, new Color(0x8ACC37), new Color(0x8AE18F), EnumSaplingType.Default, EnumForestryWoodType.POPLAR, new Color(0x8CA687)){ - + Aspen("populus", "tremula", EnumLeafType.DECIDUOUS, new Color(0x8ACC37), new Color(0x8AE18F), EnumSaplingType.Default, EnumForestryWoodType.POPLAR, new Color(0x8CA687)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPoplar.Aspen(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } @@ -819,58 +818,54 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Yew("taxus", "baccata", EnumLeafType.CONIFERS, new Color(0x948A4D), new Color(0x94AE4D), EnumSaplingType.Default, EnumETLog.Yew, new Color(0xD1BBC1)){ - + Yew("taxus", "baccata", EnumLeafType.CONIFERS, new Color(0x948A4D), new Color(0x94AE4D), EnumSaplingType.Default, EnumETLog.Yew, new Color(0xD1BBC1)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenConifer.Yew(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } }, - Cypress("chamaecyparis", "lawsoniana", EnumLeafType.CONIFERS, new Color(0x89C9A7), new Color(0x89DDC6), EnumSaplingType.Poplar, EnumETLog.Cypress, new Color(0x9A8483)){ - + Cypress("chamaecyparis", "lawsoniana", EnumLeafType.CONIFERS, new Color(0x89C9A7), new Color(0x89DDC6), EnumSaplingType.Poplar, EnumETLog.Cypress, new Color(0x9A8483)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenConifer.Cypress(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Larger.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - DouglasFir("pseudotsuga", "menziesii", EnumLeafType.CONIFERS, new Color(0x99B582), new Color(0x99D1AA), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)){ - + DouglasFir("pseudotsuga", "menziesii", EnumLeafType.CONIFERS, new Color(0x99B582), new Color(0x99D1AA), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenFir.DouglasFir(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); + protected void setAlleles(AlleleTemplate template) { + template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); } }, - Hazel("Corylus", "avellana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Default, EnumETLog.Hazel, new Color(0xAA986F)){ - + Hazel("Corylus", "avellana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Default, EnumETLog.Hazel, new Color(0xAA986F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Hazel(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Hazelnut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -884,15 +879,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Sycamore("ficus", "sycomorus", EnumLeafType.DECIDUOUS, new Color(0xA0A52F), new Color(0xB4D55C), EnumSaplingType.Default, EnumETLog.Fig, new Color(0x807357)){ - + Sycamore("ficus", "sycomorus", EnumLeafType.DECIDUOUS, new Color(0xA0A52F), new Color(0xB4D55C), EnumSaplingType.Default, EnumETLog.Fig, new Color(0x807357)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Sycamore(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Fig); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -905,15 +899,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Whitebeam("sorbus", "aria", EnumLeafType.DECIDUOUS, new Color(0xBACE99), new Color(0x72863F), EnumSaplingType.Default, EnumETLog.Whitebeam, new Color(0x786A6D)){ - + Whitebeam("sorbus", "aria", EnumLeafType.DECIDUOUS, new Color(0xBACE99), new Color(0x72863F), EnumSaplingType.Default, EnumETLog.Whitebeam, new Color(0x786A6D)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenSorbus.Whitebeam(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); } @@ -923,15 +916,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); } }, - Hawthorn("crataegus", "monogyna", EnumLeafType.DECIDUOUS, new Color(0x6BA84A), new Color(0x98B77B), EnumSaplingType.Default, EnumETLog.Hawthorn, new Color(0x5F5745)){ - + Hawthorn("crataegus", "monogyna", EnumLeafType.DECIDUOUS, new Color(0x6BA84A), new Color(0x98B77B), EnumSaplingType.Default, EnumETLog.Hawthorn, new Color(0x5F5745)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Hawthorn(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); } @@ -941,15 +933,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Pecan("carya", "illinoinensis", EnumLeafType.DECIDUOUS, new Color(0x85B674), new Color(0x2C581B), EnumSaplingType.Default, EnumETLog.Hickory, new Color(0x3E3530)){ - + Pecan("carya", "illinoinensis", EnumLeafType.DECIDUOUS, new Color(0x85B674), new Color(0x2C581B), EnumSaplingType.Default, EnumETLog.Hickory, new Color(0x3E3530)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Pecan(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Pecan); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -964,15 +955,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Elm("ulmus", "procera", EnumLeafType.DECIDUOUS, new Color(0x7C9048), new Color(0x7CBE48), EnumSaplingType.Default, EnumETLog.Elm, new Color(0x848386)){ - + Elm("ulmus", "procera", EnumLeafType.DECIDUOUS, new Color(0x7C9048), new Color(0x7CBE48), EnumSaplingType.Default, EnumETLog.Elm, new Color(0x848386)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Elm(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Average.getAllele()); @@ -984,15 +974,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.prunes")); } }, - Elder("sambucus", "nigra", EnumLeafType.DECIDUOUS, new Color(0xAEB873), new Color(0xE0E7BD), EnumSaplingType.Default, EnumETLog.Elder, new Color(0xD8B874)){ - + Elder("sambucus", "nigra", EnumLeafType.DECIDUOUS, new Color(0xAEB873), new Color(0xE0E7BD), EnumSaplingType.Default, EnumETLog.Elder, new Color(0xD8B874)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Elder(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Elderberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -1006,15 +995,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Holly("ilex", "aquifolium", EnumLeafType.DECIDUOUS, new Color(0x254B4C), new Color(0x6E9284), EnumSaplingType.Default, EnumETLog.Holly, new Color(0xB5AA85)){ - + Holly("ilex", "aquifolium", EnumLeafType.DECIDUOUS, new Color(0x254B4C), new Color(0x6E9284), EnumSaplingType.Default, EnumETLog.Holly, new Color(0xB5AA85)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenHolly.Holly(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); } @@ -1026,15 +1014,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Hornbeam("carpinus", "betulus", EnumLeafType.DECIDUOUS, new Color(0x96A71B), new Color(0x96DD1B), EnumSaplingType.Default, EnumETLog.Hornbeam, new Color(0xA39276)){ - + Hornbeam("carpinus", "betulus", EnumLeafType.DECIDUOUS, new Color(0x96A71B), new Color(0x96DD1B), EnumSaplingType.Default, EnumETLog.Hornbeam, new Color(0xA39276)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Hornbeam(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -1047,15 +1034,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Sallow("salix", "caprea", EnumLeafType.WILLOW, new Color(0xAEB323), new Color(0xB7EC25), EnumSaplingType.Default, EnumForestryWoodType.WILLOW, new Color(0xA19A95)){ - + Sallow("salix", "caprea", EnumLeafType.WILLOW, new Color(0xAEB323), new Color(0xB7EC25), EnumSaplingType.Default, EnumForestryWoodType.WILLOW, new Color(0xA19A95)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.Sallow(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); } @@ -1067,17 +1053,16 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - AcornOak("quercus", "robur", EnumLeafType.DECIDUOUS, new Color(0x66733E), new Color(0x9EA231), EnumSaplingType.Default, EnumVanillaWoodType.OAK, new Color(0x614D30)){ - + AcornOak("quercus", "robur", EnumLeafType.DECIDUOUS, new Color(0x66733E), new Color(0x9EA231), EnumSaplingType.Default, EnumVanillaWoodType.OAK, new Color(0x614D30)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree3.AcornOak(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Acorn); - template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); + template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -1090,44 +1075,41 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Fir("abies", "alba", EnumLeafType.CONIFERS, new Color(0x6F7C20), new Color(0x6FD120), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)){ - + Fir("abies", "alba", EnumLeafType.CONIFERS, new Color(0x6F7C20), new Color(0x6FD120), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenFir.SilverFir(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - Cedar("cedrus", "libani", EnumLeafType.CONIFERS, new Color(0x95A370), new Color(0x95E870), EnumSaplingType.Default, EnumETLog.Cedar, new Color(0xAD764F)){ - + Cedar("cedrus", "libani", EnumLeafType.CONIFERS, new Color(0x95A370), new Color(0x95E870), EnumSaplingType.Default, EnumETLog.Cedar, new Color(0xAD764F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenConifer.Cedar(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); + protected void setAlleles(AlleleTemplate template) { + template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); } }, - Olive("olea", "europaea", EnumLeafType.DECIDUOUS, new Color(0x3C4834), new Color(0x3C4834), EnumSaplingType.Default, EnumETLog.Olive, new Color(0x7B706A)){ - + Olive("olea", "europaea", EnumLeafType.DECIDUOUS, new Color(0x3C4834), new Color(0x3C4834), EnumSaplingType.Default, EnumETLog.Olive, new Color(0x7B706A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Olive(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Olive); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); } @@ -1139,15 +1121,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - RedMaple("acer", "ubrum", EnumLeafType.MAPLE, new Color(0xE82E17), new Color(0xE82E17), EnumSaplingType.Default, EnumForestryWoodType.MAPLE, new Color(0x8A8781)){ - + RedMaple("acer", "ubrum", EnumLeafType.MAPLE, new Color(0xE82E17), new Color(0xE82E17), EnumSaplingType.Default, EnumForestryWoodType.MAPLE, new Color(0x8A8781)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenMaple.RedMaple(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.High.getAllele()); } @@ -1159,43 +1140,40 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - BalsamFir("abies", "balsamea", EnumLeafType.CONIFERS, new Color(0x74A07C), new Color(0x74A07C), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)){ - + BalsamFir("abies", "balsamea", EnumLeafType.CONIFERS, new Color(0x74A07C), new Color(0x74A07C), EnumSaplingType.Default, EnumETLog.Fir, new Color(0x828382)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenFir.BalsamFir(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - LoblollyPine("pinus", "taeda", EnumLeafType.CONIFERS, new Color(0x6F8A47), new Color(0x6F8A47), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649)){ - + LoblollyPine("pinus", "taeda", EnumLeafType.CONIFERS, new Color(0x6F8A47), new Color(0x6F8A47), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenConifer.LoblollyPine(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slow.getAllele()); } }, - Sweetgum("liquidambar", "styraciflua", EnumLeafType.DECIDUOUS, new Color(0x8B8762), new Color(0x8B8762), EnumSaplingType.Default, EnumETLog.Sweetgum, new Color(0xA1A19C)){ - + Sweetgum("liquidambar", "styraciflua", EnumLeafType.DECIDUOUS, new Color(0x8B8762), new Color(0x8B8762), EnumSaplingType.Default, EnumETLog.Sweetgum, new Color(0xA1A19C)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Sweetgum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.High.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -1207,15 +1185,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Locust("robinia", "pseudoacacia", EnumLeafType.DECIDUOUS, new Color(0x887300), new Color(0x887300), EnumSaplingType.Default, EnumETLog.Locust, new Color(0xADACBC)){ - + Locust("robinia", "pseudoacacia", EnumLeafType.DECIDUOUS, new Color(0x887300), new Color(0x887300), EnumSaplingType.Default, EnumETLog.Locust, new Color(0xADACBC)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Locust(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); } @@ -1226,15 +1203,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Pear("pyrus", "communis", EnumLeafType.DECIDUOUS, new Color(0x5E8826), new Color(0x5E8826), EnumSaplingType.Default, EnumETLog.Pear, new Color(0xA89779)){ - + Pear("pyrus", "communis", EnumLeafType.DECIDUOUS, new Color(0x5E8826), new Color(0x5E8826), EnumSaplingType.Default, EnumETLog.Pear, new Color(0xA89779)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Pear(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Pear); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1250,15 +1226,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)){ - + OsangeOsange("maclura", "pomifera", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.OsangeOsange(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.OsangeOsange); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); } @@ -1271,15 +1246,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - OldFustic("maclura", "tinctoria", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)){ - + OldFustic("maclura", "tinctoria", EnumLeafType.JUNGLE, new Color(0x687A50), new Color(0x687A50), EnumSaplingType.Default, EnumETLog.Maclura, new Color(0x8B5734)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.OldFustic(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } @@ -1289,15 +1263,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Brazilwood("caesalpinia", "echinata", EnumLeafType.JUNGLE, new Color(0x607459), new Color(0x607459), EnumSaplingType.Default, EnumETLog.Brazilwood, new Color(0x9E8068)){ - + Brazilwood("caesalpinia", "echinata", EnumLeafType.JUNGLE, new Color(0x607459), new Color(0x607459), EnumSaplingType.Default, EnumETLog.Brazilwood, new Color(0x9E8068)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.Brazilwood(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -1309,15 +1282,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Logwood("haematoxylum", "campechianum", EnumLeafType.JUNGLE, new Color(0x889F6B), new Color(0x889F6B), EnumSaplingType.Default, EnumETLog.Logwood, new Color(0xF9E2D2)){ - + Logwood("haematoxylum", "campechianum", EnumLeafType.JUNGLE, new Color(0x889F6B), new Color(0x889F6B), EnumSaplingType.Default, EnumETLog.Logwood, new Color(0xF9E2D2)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.Logwood(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -1328,15 +1300,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Rosewood("dalbergia", "latifolia", EnumLeafType.JUNGLE, new Color(0x879B22), new Color(0x879B22), EnumSaplingType.Default, EnumETLog.Rosewood, new Color(0x998666)){ - + Rosewood("dalbergia", "latifolia", EnumLeafType.JUNGLE, new Color(0x879B22), new Color(0x879B22), EnumSaplingType.Default, EnumETLog.Rosewood, new Color(0x998666)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.Rosewood(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lowest.getAllele()); } @@ -1346,15 +1317,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Purpleheart("peltogyne", "spp", EnumLeafType.JUNGLE, new Color(0x778F55), new Color(0x778F55), EnumSaplingType.Default, EnumETLog.Purpleheart, new Color(0x9392A2)){ - + Purpleheart("peltogyne", "spp", EnumLeafType.JUNGLE, new Color(0x778F55), new Color(0x778F55), EnumSaplingType.Default, EnumETLog.Purpleheart, new Color(0x9392A2)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.Purpleheart(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); } @@ -1364,15 +1334,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Iroko("milicia", "excelsa", EnumLeafType.DECIDUOUS, new Color(0xAFC86C), new Color(0xAFC86C), EnumSaplingType.Default, EnumETLog.Iroko, new Color(0x605C5B)){ - + Iroko("milicia", "excelsa", EnumLeafType.DECIDUOUS, new Color(0xAFC86C), new Color(0xAFC86C), EnumSaplingType.Default, EnumETLog.Iroko, new Color(0x605C5B)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Iroko(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); } @@ -1383,15 +1352,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Gingko("ginkgo", "biloba", EnumLeafType.JUNGLE, new Color(0x719651), new Color(0x719651), EnumSaplingType.Default, EnumETLog.Gingko, new Color(0xADAE9C)){ - + Gingko("ginkgo", "biloba", EnumLeafType.JUNGLE, new Color(0x719651), new Color(0x719651), EnumSaplingType.Default, EnumETLog.Gingko, new Color(0xADAE9C)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Gingko(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.GingkoNut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -1404,15 +1372,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Brazilnut("bertholletia", "excelsa", EnumLeafType.JUNGLE, new Color(0x7C8F7B), new Color(0x7C8F7B), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Brazilnut("bertholletia", "excelsa", EnumLeafType.JUNGLE, new Color(0x7C8F7B), new Color(0x7C8F7B), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.BrazilNut(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.BrazilNut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Larger.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); @@ -1425,15 +1392,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - RoseGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0x9CA258), new Color(0x9CA258), EnumSaplingType.Default, EnumETLog.Eucalyptus, new Color(0xEADEDA)){ - + RoseGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0x9CA258), new Color(0x9CA258), EnumSaplingType.Default, EnumETLog.Eucalyptus, new Color(0xEADEDA)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenEucalyptus.RoseGum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Largest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); @@ -1446,16 +1412,15 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - SwampGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0xA2C686), new Color(0xA2C686), EnumSaplingType.Default, EnumETLog.Eucalyptus2, new Color(0x867E65)){ - + SwampGum("eucalyptus", "grandis", EnumLeafType.JUNGLE, new Color(0xA2C686), new Color(0xA2C686), EnumSaplingType.Default, EnumETLog.Eucalyptus2, new Color(0x867E65)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenEucalyptus.SwampGum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); + protected void setAlleles(AlleleTemplate template) { + template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Slower.getAllele()); @@ -1466,15 +1431,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Box("boxus", "sempervirens", EnumLeafType.DECIDUOUS, new Color(0x72996D), new Color(0x72996D), EnumSaplingType.Default, EnumETLog.Box, new Color(0xAB6F57)){ - + Box("boxus", "sempervirens", EnumLeafType.DECIDUOUS, new Color(0x72996D), new Color(0x72996D), EnumSaplingType.Default, EnumETLog.Box, new Color(0xAB6F57)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Box(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Faster.getAllele()); } @@ -1487,15 +1451,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Clove("syzygium", "aromaticum", EnumLeafType.DECIDUOUS, new Color(0x7A821F), new Color(0x7A821F), EnumSaplingType.Default, EnumETLog.Syzgium, new Color(0xAB6F57)){ - + Clove("syzygium", "aromaticum", EnumLeafType.DECIDUOUS, new Color(0x7A821F), new Color(0x7A821F), EnumSaplingType.Default, EnumETLog.Syzgium, new Color(0xAB6F57)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree2.Clove(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Clove); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1510,15 +1473,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Coffee("coffea", "arabica", EnumLeafType.JUNGLE, new Color(0x6F9065), new Color(0x6F9065), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Coffee("coffea", "arabica", EnumLeafType.JUNGLE, new Color(0x6F9065), new Color(0x6F9065), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenJungle.Coffee(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Coffee); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Large.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1531,16 +1493,15 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - MonkeyPuzzle("araucaria", "araucana", EnumLeafType.CONIFERS, new Color(0x576158), new Color(0x576158), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649)){ - + MonkeyPuzzle("araucaria", "araucana", EnumLeafType.CONIFERS, new Color(0x576158), new Color(0x576158), EnumSaplingType.Default, EnumForestryWoodType.PINE, new Color(0x735649)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenConifer.MonkeyPuzzle(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { - template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); + protected void setAlleles(AlleleTemplate template) { + template.set(EnumTreeChromosome.GIRTH, ForestryAllele.Int.Int2.getAllele()); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); @@ -1552,15 +1513,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - RainbowGum("eucalyptus", "deglupta", EnumLeafType.JUNGLE, new Color(0xB7F025), new Color(0xB7F025), EnumSaplingType.Default, EnumETLog.Eucalyptus3, new Color(0x6CB03F)){ - + RainbowGum("eucalyptus", "deglupta", EnumLeafType.JUNGLE, new Color(0xB7F025), new Color(0xB7F025), EnumSaplingType.Default, EnumETLog.Eucalyptus3, new Color(0x6CB03F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenEucalyptus.RainbowGum(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); } @@ -1571,15 +1531,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - PinkIvory("berchemia", "zeyheri", EnumLeafType.DECIDUOUS, new Color(0x7C9159), new Color(0x7C9159), EnumSaplingType.Default, EnumETLog.PinkIvory, new Color(0x7F6554)){ - + PinkIvory("berchemia", "zeyheri", EnumLeafType.DECIDUOUS, new Color(0x7C9159), new Color(0x7C9159), EnumSaplingType.Default, EnumETLog.PinkIvory, new Color(0x7F6554)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); } @@ -1589,15 +1548,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Blackcurrant("ribes", "nigrum", EnumLeafType.DECIDUOUS, new Color(0xA6DA5C), new Color(0xA6DA5C), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Blackcurrant("ribes", "nigrum", EnumLeafType.DECIDUOUS, new Color(0xA6DA5C), new Color(0xA6DA5C), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blackcurrant); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1613,15 +1571,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Redcurrant("ribes", "rubrum", EnumLeafType.DECIDUOUS, new Color(0x74AC00), new Color(0x74AC00), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Redcurrant); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); @@ -1637,15 +1594,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Blackberry("rubus", "fruticosus", EnumLeafType.DECIDUOUS, new Color(0x92C15B), new Color(0x92C15B), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blackberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1660,15 +1616,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Raspberry("rubus", "idaeus", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Raspberry("rubus", "idaeus", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Raspberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1684,15 +1639,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Blueberry("vaccinium", "corymbosum", EnumLeafType.DECIDUOUS, new Color(0x72C750), new Color(0x72C750), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Blueberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); @@ -1708,15 +1662,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Cranberry("vaccinium", "oxycoccos", EnumLeafType.DECIDUOUS, new Color(0x96D179), new Color(0x96D179), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Cranberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); @@ -1732,15 +1685,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Juniper("juniperus", "communis", EnumLeafType.CONIFERS, new Color(0x90B149), new Color(0x90B149), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Juniper); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1756,15 +1708,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + Gooseberry("ribes", "grossularia", EnumLeafType.DECIDUOUS, new Color(0x79BB00), new Color(0x79BB00), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Gooseberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.High.getAllele()); @@ -1779,15 +1730,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)){ - + GoldenRaspberry("rubus", "occidentalis", EnumLeafType.DECIDUOUS, new Color(0x83B96E), new Color(0x83B96E), EnumSaplingType.Shrub, EnumETLog.Shrub, new Color(0xFFFFFF)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.GoldenRaspberry); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1803,15 +1753,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Berry); } }, - Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumETLog.Cinnamon, new Color(0x86583C)){ - + Cinnamon("cinnamomum", "cassia", EnumLeafType.JUNGLE, new Color(0x738E0B), new Color(0x738E0B), EnumSaplingType.Default, EnumETLog.Cinnamon, new Color(0x86583C)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); @@ -1823,15 +1772,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Coconut("cocous", "nucifera", EnumLeafType.PALM, new Color(0x649923), new Color(0x649923), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Coconut("cocous", "nucifera", EnumLeafType.PALM, new Color(0x649923), new Color(0x649923), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenPalm.Coconut(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Coconut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1844,15 +1792,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.jungle")); } }, - Cashew("anacardium", "occidentale", EnumLeafType.JUNGLE, new Color(0xABB962), new Color(0xABB962), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Cashew("anacardium", "occidentale", EnumLeafType.JUNGLE, new Color(0xABB962), new Color(0xABB962), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Cashew); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Low.getAllele()); } @@ -1863,15 +1810,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Avacado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Avacado("persea", "americana", EnumLeafType.JUNGLE, new Color(0x96A375), new Color(0x96A375), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Avacado); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); @@ -1884,15 +1830,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Nutmeg("myristica", "fragrans", EnumLeafType.JUNGLE, new Color(0x488D4C), new Color(0x488D4C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Nutmeg("myristica", "fragrans", EnumLeafType.JUNGLE, new Color(0x488D4C), new Color(0x488D4C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Nutmeg); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1905,15 +1850,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Allspice("pimenta", "dioica", EnumLeafType.JUNGLE, new Color(0x7C9724), new Color(0x7C9724), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Allspice("pimenta", "dioica", EnumLeafType.JUNGLE, new Color(0x7C9724), new Color(0x7C9724), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Allspice); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1926,15 +1870,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Chilli("capsicum", "annuum", EnumLeafType.JUNGLE, new Color(0x2A9F01), new Color(0x2A9F01), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Chilli("capsicum", "annuum", EnumLeafType.JUNGLE, new Color(0x2A9F01), new Color(0x2A9F01), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Chilli); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Higher.getAllele()); @@ -1948,15 +1891,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - StarAnise("illicium", "verum", EnumLeafType.JUNGLE, new Color(0x7FC409), new Color(0x7FC409), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + StarAnise("illicium", "verum", EnumLeafType.JUNGLE, new Color(0x7FC409), new Color(0x7FC409), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.StarAnise); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Average.getAllele()); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.High.getAllele()); @@ -1968,15 +1910,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - Mango("mangifera", "indica", EnumLeafType.JUNGLE, new Color(0x87B574), new Color(0x87B574), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Mango("mangifera", "indica", EnumLeafType.JUNGLE, new Color(0x87B574), new Color(0x87B574), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenTropical.Mango(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Mango); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smaller.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Low.getAllele()); @@ -1993,15 +1934,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Starfruit("averrhoa", "carambola", EnumLeafType.JUNGLE, new Color(0x6DA92D), new Color(0x6DA92D), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Starfruit("averrhoa", "carambola", EnumLeafType.JUNGLE, new Color(0x6DA92D), new Color(0x6DA92D), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Starfruit); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Average.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); @@ -2014,15 +1954,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(ETFruitFamily.Citrus); } }, - Candlenut("aleurites", "moluccana", EnumLeafType.DECIDUOUS, new Color(0x8AA36C), new Color(0x8AA36C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)){ - + Candlenut("aleurites", "moluccana", EnumLeafType.DECIDUOUS, new Color(0x8AA36C), new Color(0x8AA36C), EnumSaplingType.Default, EnumVanillaWoodType.JUNGLE, new Color(0x53411A)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenLazy.Tree(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Candlenut); template.set(EnumTreeChromosome.HEIGHT, ForestryAllele.TreeHeight.Smallest.getAllele()); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Lowest.getAllele()); @@ -2036,15 +1975,14 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }, - DwarfHazel("Corylus", "americana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Shrub, EnumETLog.Hazel, new Color(0xAA986F)){ - + DwarfHazel("Corylus", "americana", EnumLeafType.DECIDUOUS, new Color(0x9BB552), new Color(0x9BE152), EnumSaplingType.Shrub, EnumETLog.Hazel, new Color(0xAA986F)) { @Override public WorldGenerator getWorldGenerator(ITreeGenData tree) { return new WorldGenShrub.Shrub(tree); } - + @Override - protected void setAlleles(AlleleTemplate template) { + protected void setAlleles(AlleleTemplate template) { template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.Hazelnut); template.set(EnumTreeChromosome.FERTILITY, ForestryAllele.Saplings.Average.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); @@ -2057,7 +1995,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT species.addFruitFamily(AlleleManager.alleleRegistry.getFruitFamily("forestry.nuts")); } }; - + public static ETTreeDefinition[] VALUES = values(); private String branchName; @@ -2128,12 +2066,12 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT genome = TreeManager.treeRoot.templateAsGenome(template.getAlleles()); TreeManager.treeRoot.registerTemplate(template.getAlleles()); } - + @Override public final ITreeGenome getGenome() { return genome; } - + @Override public final ITree getIndividual() { return new Tree(genome); @@ -2144,7 +2082,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT ITree tree = getIndividual(); return TreeManager.treeRoot.getMemberStack(tree, treeType); } - + @Override public final IAllele[] getTemplate() { IAllele[] alleles = template.getAlleles(); @@ -2194,7 +2132,7 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT public IAlleleTreeSpecies getSpecies() { return species; } - + public int getMetadata() { return ordinal(); } @@ -2205,12 +2143,12 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT } return VALUES[meta]; } - + @Override public String getName() { return name().toLowerCase(Locale.ENGLISH); } - + @Override public boolean setLogBlock(ITreeGenome genome, World world, BlockPos pos, EnumFacing facing) { AlleleBoolean fireproofAllele = (AlleleBoolean) genome.getActiveAllele(EnumTreeChromosome.FIREPROOF); diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index c475921d..fa8f21a5 100644 --- a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -10,8 +10,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nonnull; -import java.awt.*; +import java.awt.Color; public enum EnumSaplingType { Default, @@ -22,7 +21,7 @@ public enum EnumSaplingType { Palm, Shrub; - public IGermlingModelProvider getGermlingModelProvider(Color leaf, Color wood){ + public IGermlingModelProvider getGermlingModelProvider(Color leaf, Color wood) { return new DefaultGermlingModelProvider(this, leaf, wood); } @@ -52,7 +51,7 @@ public enum EnumSaplingType { } } - @Override + @Override public ModelResourceLocation getModel(EnumGermlingType type) { if (type == EnumGermlingType.SAPLING) { return germlingModel; @@ -65,7 +64,7 @@ public enum EnumSaplingType { @Override public int getSpriteColor(EnumGermlingType type, int renderPass) { - return type == EnumGermlingType.SAPLING && renderPass==0 ? wood.getRGB() : leaf.getRGB(); + return type == EnumGermlingType.SAPLING && renderPass == 0 ? wood.getRGB() : leaf.getRGB(); } } } diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index 896a3bce..976b772b 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -1,7 +1,5 @@ package binnie.extratrees.genetics; -import java.util.Locale; - import binnie.Constants; import forestry.core.proxy.Proxies; import net.minecraft.client.renderer.texture.TextureMap; @@ -9,7 +7,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public enum FruitSprite{ +import java.util.Locale; + +public enum FruitSprite { TINY, SMALL, AVERAGE, @@ -23,11 +23,11 @@ public enum FruitSprite{ private FruitSprite() { location = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "blocks/fruit/" + name().toLowerCase(Locale.ENGLISH)); } - + public ResourceLocation getLocation() { return location; } - + @SideOnly(Side.CLIENT) public void registerSprites() { TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index 46da3489..2ca4a520 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -3,8 +3,6 @@ package binnie.extratrees.genetics; import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IClassification; import java.util.ArrayList; import java.util.List; @@ -28,7 +26,7 @@ public class ModuleGenetics implements IInitializable { public void init() { AlleleETFruit.init(); ETTreeDefinition.initTrees(); - ExtraTreeMutation.init(); + ExtraTreeMutation.init(); } @Override diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java index 62d2df28..42a0a1fd 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeMaker.java @@ -2,6 +2,7 @@ package binnie.extratrees.integration.jei.brewery; import binnie.extratrees.machines.brewery.BreweryRecipes; import binnie.extratrees.machines.brewery.IBreweryRecipe; + import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java index 390b9641..fb028bc2 100644 --- a/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemArboristDatabase.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/extratrees/item/ItemETFood.java b/src/main/java/binnie/extratrees/item/ItemETFood.java index af69c637..0fca2fd0 100644 --- a/src/main/java/binnie/extratrees/item/ItemETFood.java +++ b/src/main/java/binnie/extratrees/item/ItemETFood.java @@ -57,11 +57,11 @@ public class ItemETFood extends ItemFood implements IItemModelRegister { IItemMiscProvider item = this.getItem(stack.getItemDamage()); return item.getName(stack); } - + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - for(IItemMiscProvider provider : items){ + for (IItemMiscProvider provider : items) { manager.registerItemModel(item, provider.ordinal(), "foods/" + provider.getModelPath()); } } @@ -69,14 +69,14 @@ public class ItemETFood extends ItemFood implements IItemModelRegister { private Food getFood(final ItemStack par1ItemStack) { return Food.VALUES[par1ItemStack.getItemDamage()]; } - + @Override public int getHealAmount(ItemStack stack) { return getFood(stack).getHealth(); } - + @Override - public float getSaturationModifier(ItemStack stack) { - return 3.0f; - } + public float getSaturationModifier(ItemStack stack) { + return 3.0f; + } } diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index a1c35e15..55355a69 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -22,7 +22,7 @@ public class ItemHammer extends Item implements IToolHammer, IItemModelRegister this.setMaxDamage(durable ? 1562 : 251); setRegistryName(durable ? "durable_hammer" : "hammer"); } - + @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 8ea2ad16..3c26c76a 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/extratrees/item/ItemSetSquare.java b/src/main/java/binnie/extratrees/item/ItemSetSquare.java index 1ff30878..9477b0d2 100644 --- a/src/main/java/binnie/extratrees/item/ItemSetSquare.java +++ b/src/main/java/binnie/extratrees/item/ItemSetSquare.java @@ -20,7 +20,7 @@ public class ItemSetSquare extends Item implements IToolHammer, IItemModelRegist setRegistryName("setSquare" + mode); this.setMaxStackSize(1); } - + @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 226fbe6c..dbf4d3e9 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -22,14 +22,14 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItems implements IInitializable { - + public Item itemDictionary; public Item itemDictionaryLepi; public ItemMisc itemMisc; public Item itemFood; public Item itemHammer; public Item itemDurableHammer; - + @Override public void preInit() { itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values()); @@ -65,7 +65,7 @@ public class ModuleItems implements IInitializable { OreDictionary.registerOre("seedCorn", ExtraTreeItems.GrainCorn.get(1)); OreDictionary.registerOre("seedRye", ExtraTreeItems.GrainRye.get(1)); OreDictionary.registerOre("seedRoasted", ExtraTreeItems.GrainRoasted.get(1)); - + OreDictionary.registerOre("gearWood", ExtraTreeItems.ProvenGear.get(1)); Food.CRABAPPLE.addJuice(10, 150, 10); @@ -123,7 +123,7 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { ModuleItems items = ExtraTrees.items(); - + CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(items.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(items.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); diff --git a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java index ee076548..4eae493b 100644 --- a/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java +++ b/src/main/java/binnie/extratrees/kitchen/KitchenMachine.java @@ -56,7 +56,7 @@ public enum KitchenMachine implements IMachineType { @Override public void register() { } - + @Override @SideOnly(Side.CLIENT) public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { diff --git a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java index be91a312..dd7acf9a 100644 --- a/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/ModuleKitchen.java @@ -1,16 +1,13 @@ package binnie.extratrees.kitchen; import binnie.core.IInitializable; -import binnie.core.machines.MachineGroup; -import binnie.extratrees.ExtraTrees; -import forestry.api.core.Tabs; import net.minecraft.block.Block; import net.minecraft.init.Blocks; public class ModuleKitchen implements IInitializable { - + public Block blockKitchen = Blocks.AIR; - + @Override public void preInit() { // TODO implement kitchen diff --git a/src/main/java/binnie/extratrees/machines/Designer.java b/src/main/java/binnie/extratrees/machines/Designer.java index 4743ef37..e1f4cf4f 100644 --- a/src/main/java/binnie/extratrees/machines/Designer.java +++ b/src/main/java/binnie/extratrees/machines/Designer.java @@ -164,7 +164,7 @@ public abstract class Designer { @Override public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { - if (name.equals("design")) { + if (name.equals("design")) { this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getShort("d"))); } } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index a969b07c..9f544dfb 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -87,7 +87,7 @@ public enum ExtraTreeMachine implements IMachineType { @Override public void register() { } - + @Override @SideOnly(Side.CLIENT) public void renderMachine(Machine machine, double x, double y, double z, float partialTicks, int destroyStage) { diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 5f9cbcb9..4abe02ea 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -17,9 +17,9 @@ import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { public static ValidatorSprite spritePolish; - + public Block blockMachine; - + @Override public void preInit() { final MachineGroup machineGroup = new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values()); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java index 5fe146d7..40647de4 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryCrafting.java @@ -24,7 +24,7 @@ public class BreweryCrafting implements INbtWritable { public static BreweryCrafting create(final NBTTagCompound nbt) { FluidStack inputFluid = FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("fluid")); ItemStack ingredient = new ItemStack(nbt.getCompoundTag("ingr")); - ItemStack[] inputGrains = new ItemStack[] { + ItemStack[] inputGrains = new ItemStack[]{ new ItemStack(nbt.getCompoundTag("in1")), new ItemStack(nbt.getCompoundTag("in2")), new ItemStack(nbt.getCompoundTag("in3")) diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java index 390bfbd8..228a5a5a 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java @@ -4,7 +4,6 @@ import binnie.extratrees.item.ExtraTreeItems; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collections; import java.util.List; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java index ae5f8852..0c246cae 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlRecipeSlot.java @@ -11,8 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import javax.annotation.Nullable; - public class ControlRecipeSlot extends ControlSlotBase { public ControlRecipeSlot(final IWidget parent, final int x, final int y) { super(parent, x, y, 50); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index e4438252..7b99439a 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -1,7 +1,5 @@ package binnie.extratrees.machines.craftgui; -import java.util.stream.Collectors; - import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.genetics.TreeBreedingSystem; @@ -26,6 +24,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; +import java.util.stream.Collectors; + public class WindowArboristDatabase extends WindowAbstractDatabase { ControlListBox selectionBoxFruit; ControlListBox selectionBoxWood; diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java index 8e7a6806..6bc6af02 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillRecipes.java @@ -1,7 +1,7 @@ package binnie.extratrees.machines.lumbermill; -import binnie.core.util.OreDictionaryUtil; import binnie.core.util.FakeCraftingWorld; +import binnie.core.util.OreDictionaryUtil; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import forestry.api.arboriculture.IWoodType; @@ -17,8 +17,6 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Collection; import java.util.List; diff --git a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java index caae28a7..df10f765 100644 --- a/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java +++ b/src/main/java/binnie/extratrees/models/ModelETDecorativeLeaves.java @@ -1,8 +1,5 @@ package binnie.extratrees.models; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import binnie.extratrees.block.BlockETDecorativeLeaves; import binnie.extratrees.genetics.ETTreeDefinition; import forestry.api.arboriculture.IAlleleTreeSpecies; diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index c565a06b..f2abb6fe 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -1,7 +1,5 @@ package binnie.extratrees.proxy; -import javax.annotation.Nonnull; - import binnie.Constants; import binnie.core.models.ModelManager; import binnie.extratrees.ExtraTrees; @@ -29,16 +27,16 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { public void init() { //ForestryAPI.textureManager.registerIconProvider(FruitSprite.Average); } - + @Override public void registerBlockModel(final BlockModelEntry index) { ModelManager.registerCustomBlockModel(index); - if(index.addStateMapper){ + if (index.addStateMapper) { StateMapperBase ignoreState = new BlockModeStateMapper(index); ModelLoader.setCustomStateMapper(index.block, ignoreState); } } - + @Override public void registerModel(ModelEntry index) { ModelManager.registerCustomModel(index); @@ -74,11 +72,11 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { BlockModelEntry blockModelIndex = new BlockModelEntry(blockModelLocation, itemModeLocation, new ModelETDecorativeLeaves(), leaves); registerBlockModel(blockModelIndex); } - - for(BlockETSlab slab : ExtraTrees.blocks().slabsDouble){ + + for (BlockETSlab slab : ExtraTrees.blocks().slabsDouble) { PluginArboriculture.proxy.registerWoodModel(slab, true); } - for(BlockETSlab slab : ExtraTrees.blocks().slabsDoubleFireproof){ + for (BlockETSlab slab : ExtraTrees.blocks().slabsDoubleFireproof) { PluginArboriculture.proxy.registerWoodModel(slab, true); } getModelManager().registerModels(); @@ -88,7 +86,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { public void registerItemAndBlockColors() { getModelManager().registerItemAndBlockColors(); } - + class CustomMapper extends StateMapperBase { ResourceLocation rl; @@ -101,7 +99,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy { return new ModelResourceLocation(rl, this.getPropertyString(state.getProperties())); } } - + class BlockModeStateMapper extends StateMapperBase { private final BlockModelEntry index; diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 06fcb803..a0e58d98 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -26,7 +26,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import javax.annotation.Nonnull; import javax.annotation.Nullable; @Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index 0657c0fd..f115bd97 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -1,7 +1,6 @@ package binnie.genetics.genetics; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index fef92898..aa189917 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -4,8 +4,6 @@ import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; -import binnie.genetics.item.GeneticsItems; -import com.google.common.base.Preconditions; import forestry.api.core.INbtWritable; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java index d5eff12e..46b0722f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java @@ -20,7 +20,6 @@ import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IButterfly; import net.minecraft.init.Biomes; import net.minecraft.world.biome.Biome; -import net.minecraftforge.common.BiomeDictionary; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 17e1c20c..73aedb4e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -23,7 +23,6 @@ import forestry.api.genetics.IIndividual; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; import java.util.Objects; diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/ControlBiome.java index 8531f1ec..dcbd51ba 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/ControlBiome.java @@ -7,8 +7,6 @@ import binnie.craftgui.core.Tooltip; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; -import javax.annotation.Nullable; - public class ControlBiome extends Control implements ITooltip { private final Biome biome; private String iconCategory; diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 650fffa6..54e3b247 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -4,7 +4,9 @@ import binnie.core.integration.jei.Drawables; import binnie.core.integration.jei.SimpleRecipeHandler; import binnie.genetics.Genetics; import binnie.genetics.api.IItemChargeable; +import binnie.genetics.integration.jei.database.DatabaseRecipeCategory; import binnie.genetics.integration.jei.database.DatabaseRecipeMaker; +import binnie.genetics.integration.jei.database.DatabaseRecipeWrapper; import binnie.genetics.integration.jei.genepool.GenepoolRecipeCategory; import binnie.genetics.integration.jei.genepool.GenepoolRecipeMaker; import binnie.genetics.integration.jei.genepool.GenepoolRecipeWrapper; @@ -27,8 +29,6 @@ import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeWrapper; import binnie.genetics.integration.jei.sequencer.SequencerRecipeCategory; import binnie.genetics.integration.jei.sequencer.SequencerRecipeMaker; import binnie.genetics.integration.jei.sequencer.SequencerRecipeWrapper; -import binnie.genetics.integration.jei.database.DatabaseRecipeCategory; -import binnie.genetics.integration.jei.database.DatabaseRecipeWrapper; import binnie.genetics.machine.AdvGeneticMachine; import binnie.genetics.machine.GeneticMachine; import binnie.genetics.machine.LaboratoryMachine; diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java index 725d89ba..2e86680c 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java @@ -8,9 +8,6 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; - -import java.util.List; public class DatabaseRecipeCategory extends BlankRecipeCategory { @Override diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java index a7f5a974..8f10873f 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeWrapper.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; public class IncubatorRecipeWrapper extends BlankRecipeWrapper { private final IIncubatorRecipe recipe; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index 2a4a3fbc..45cadce3 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; public class IsolatorRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java index bc1427c5..06727276 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeWrapper.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.awt.*; +import java.awt.Color; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 2fd1a676..02984d8a 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -5,7 +5,6 @@ import binnie.genetics.Genetics; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import javax.annotation.Nonnull; import java.util.List; public enum GeneticsItems implements IItemMiscProvider { diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index bf0cc830..4ce52877 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemAnalyst extends ItemCore { diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index f06f9a84..e7fc4eb1 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -12,13 +12,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class ItemDatabase extends ItemCore { public ItemDatabase() { diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index f595b4a6..bb69e46e 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemMasterRegistry extends ItemCore { diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index a91dcfaf..24797f01 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemRegistry extends ItemCore { diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index 94c8fec8..7f55a547 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -41,7 +41,8 @@ public class MachineRendererLab { GlStateManager.rotate(180.0f, 0.0f, 0.0f, 1.0f); World world = machine.getWorld(); LaboratoryMachine.ComponentGUIHolder holder = Machine.getInterface(LaboratoryMachine.ComponentGUIHolder.class, machine); - Label_0591: { + Label_0591: + { if (world != null && holder != null && !holder.getStack().isEmpty()) { BinnieCore.getBinnieProxy().getMinecraftInstance(); if (Minecraft.isFancyGraphicsEnabled()) { diff --git a/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/src/main/java/binnie/genetics/machine/analyser/Analyser.java index 1a68de0d..788e0925 100644 --- a/src/main/java/binnie/genetics/machine/analyser/Analyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/Analyser.java @@ -8,8 +8,6 @@ import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import javax.annotation.Nullable; - public class Analyser { public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3, 4, 5}; public static final int SLOT_TARGET = 6; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java index bf351f08..aa4b2187 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -23,7 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { - + public PackagePolymeriser() { super("polymeriser", GeneticsTexture.Polymeriser, 58819, true); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java index 2ad21b87..f85cd2fd 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java @@ -8,5 +8,5 @@ public class Polymeriser { public static final int SLOT_GOLD = 1; public static final int[] SLOT_SERUM_RESERVE = new int[]{2, 3, 4, 5}; public static final int[] SLOT_SERUM_FINISHED = new int[]{6, 7, 8, 9}; - + } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index 5a9024e2..1ab39798 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -1,7 +1,5 @@ package binnie.genetics.machine.sequencer; -import java.util.Random; - import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; @@ -12,6 +10,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.Random; + public class SequencerFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { public SequencerFX(final IMachine machine) { super(machine); diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java index 9ab2aadc..2cd5e04c 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerLogic.java @@ -11,8 +11,6 @@ import binnie.genetics.item.GeneticsItems; import com.google.common.base.Preconditions; import net.minecraft.item.ItemStack; -import javax.annotation.Nullable; - public class SequencerLogic extends ComponentProcess implements IProcess { public SequencerLogic(final Machine machine) { super(machine);