diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index cd3d0ca6..4fba8986 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -1,5 +1,8 @@ package binnie; +import java.util.ArrayList; +import java.util.List; + import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; import binnie.core.item.ManagerItem; @@ -7,10 +10,9 @@ import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; import binnie.core.mod.config.ManagerConfig; import binnie.core.resource.ManagerResource; -import java.util.ArrayList; -import java.util.List; public final class Binnie { + public static List Managers = new ArrayList<>(); public static ManagerGenetics Genetics = new ManagerGenetics(); public static ManagerConfig Configuration = new ManagerConfig(); diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 34aef437..22f4931b 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -1,5 +1,15 @@ package binnie.botany; +import net.minecraft.block.Block; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.world.BlockEvent; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumSoilType; import binnie.botany.api.IFlower; @@ -42,15 +52,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import net.minecraft.block.Block; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.BonemealEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.world.BlockEvent; @Mod( modid = "Botany", @@ -59,6 +60,7 @@ import net.minecraftforge.event.world.BlockEvent; useMetadata = true, dependencies = "after:BinnieCore") public class Botany extends AbstractMod { + @Mod.Instance("Botany") public static Botany instance; @@ -155,8 +157,7 @@ public class Botany extends AbstractMod { return; } - if (event.entityPlayer != null - && event.entityPlayer.getHeldItem() != null + if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Items.shears) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); if (tile instanceof TileEntityFlower) { @@ -166,8 +167,7 @@ public class Botany extends AbstractMod { } } - if (event.entityPlayer != null - && event.entityPlayer.getHeldItem() != null + if (event.entityPlayer != null && event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().getItem() == Botany.pollen) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); if (tile instanceof TileEntityFlower) { @@ -291,8 +291,7 @@ public class Botany extends AbstractMod { } IFlower flower = BotanyCore.getFlowerRoot().getConversion(event.entityPlayer.getHeldItem()); - if (flower != null - && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile()) + if (flower != null && Gardening.plant(world, x, y + py, z, flower, event.entityPlayer.getGameProfile()) && !event.entityPlayer.capabilities.isCreativeMode) { ItemStack heldItem = event.entityPlayer.getHeldItem(); heldItem.stackSize--; @@ -345,6 +344,7 @@ public class Botany extends AbstractMod { } public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { super(Botany.instance); } diff --git a/src/main/java/binnie/botany/CreativeTabBotany.java b/src/main/java/binnie/botany/CreativeTabBotany.java index a20c11d1..c6f7b6f8 100644 --- a/src/main/java/binnie/botany/CreativeTabBotany.java +++ b/src/main/java/binnie/botany/CreativeTabBotany.java @@ -1,14 +1,16 @@ package binnie.botany; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class CreativeTabBotany extends CreativeTabs { + public static CreativeTabs instance = new CreativeTabBotany(); public CreativeTabBotany() { diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index c72b81be..d150adf0 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -1,6 +1,7 @@ package binnie.botany.api; public enum EnumAcidity { + ACID, NEUTRAL, ALKALINE; diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index 736a2929..f760c8bc 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -10,6 +10,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; public enum EnumFlowerChromosome implements IChromosomeType { + SPECIES(IAlleleFlowerSpecies.class), PRIMARY(IAlleleInteger.class), SECONDARY(IAlleleInteger.class), diff --git a/src/main/java/binnie/botany/api/EnumFlowerStage.java b/src/main/java/binnie/botany/api/EnumFlowerStage.java index 0a06890c..be547e57 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerStage.java +++ b/src/main/java/binnie/botany/api/EnumFlowerStage.java @@ -1,6 +1,7 @@ package binnie.botany.api; public enum EnumFlowerStage { + FLOWER("Flower"), SEED("Seed"), POLLEN("Pollen"), diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index 4710fb9a..8a9c2f54 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -1,6 +1,7 @@ package binnie.botany.api; public enum EnumMoisture { + DRY, NORMAL, DAMP; diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index ee6f6680..968d7407 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -1,6 +1,7 @@ package binnie.botany.api; public enum EnumSoilType { + SOIL, LOAM, FLOWERBED; diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java b/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java index 3c982b6e..2911b9b1 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java @@ -1,9 +1,11 @@ package binnie.botany.api; +import net.minecraft.world.World; + import forestry.api.genetics.IAlleleEffect; import forestry.api.genetics.IEffectData; -import net.minecraft.world.World; public interface IAlleleFlowerEffect extends IAlleleEffect { + IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z); } diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index 71b281a8..53f13bab 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -3,6 +3,7 @@ package binnie.botany.api; import forestry.api.genetics.IAlleleSpecies; public interface IAlleleFlowerSpecies extends IAlleleSpecies { + IFlowerType getType(); EnumAcidity getPH(); diff --git a/src/main/java/binnie/botany/api/IBotanistTracker.java b/src/main/java/binnie/botany/api/IBotanistTracker.java index ea7ad714..af68545b 100644 --- a/src/main/java/binnie/botany/api/IBotanistTracker.java +++ b/src/main/java/binnie/botany/api/IBotanistTracker.java @@ -2,4 +2,5 @@ package binnie.botany.api; import forestry.api.genetics.IBreedingTracker; -public interface IBotanistTracker extends IBreedingTracker {} +public interface IBotanistTracker extends IBreedingTracker { +} diff --git a/src/main/java/binnie/botany/api/IColourMix.java b/src/main/java/binnie/botany/api/IColourMix.java index 8c317abd..5a47d2d3 100644 --- a/src/main/java/binnie/botany/api/IColourMix.java +++ b/src/main/java/binnie/botany/api/IColourMix.java @@ -1,6 +1,7 @@ package binnie.botany.api; public interface IColourMix { + IFlowerColor getColor1(); IFlowerColor getColor2(); diff --git a/src/main/java/binnie/botany/api/IFlower.java b/src/main/java/binnie/botany/api/IFlower.java index 0854d639..e5b44a8e 100644 --- a/src/main/java/binnie/botany/api/IFlower.java +++ b/src/main/java/binnie/botany/api/IFlower.java @@ -1,9 +1,11 @@ package binnie.botany.api; -import forestry.api.genetics.IIndividual; import net.minecraft.world.World; +import forestry.api.genetics.IIndividual; + public interface IFlower extends IIndividual { + @Override IFlowerGenome getGenome(); diff --git a/src/main/java/binnie/botany/api/IFlowerColor.java b/src/main/java/binnie/botany/api/IFlowerColor.java index 293707c2..b23f9b32 100644 --- a/src/main/java/binnie/botany/api/IFlowerColor.java +++ b/src/main/java/binnie/botany/api/IFlowerColor.java @@ -3,6 +3,7 @@ package binnie.botany.api; import forestry.api.genetics.IAlleleInteger; public interface IFlowerColor { + int getColor(boolean dis); IAlleleInteger getAllele(); diff --git a/src/main/java/binnie/botany/api/IFlowerGenome.java b/src/main/java/binnie/botany/api/IFlowerGenome.java index f7528345..8d99400a 100644 --- a/src/main/java/binnie/botany/api/IFlowerGenome.java +++ b/src/main/java/binnie/botany/api/IFlowerGenome.java @@ -5,6 +5,7 @@ import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IGenome; public interface IFlowerGenome extends IGenome { + @Override IAlleleFlowerSpecies getPrimary(); diff --git a/src/main/java/binnie/botany/api/IFlowerMutation.java b/src/main/java/binnie/botany/api/IFlowerMutation.java index 638ebec8..53370770 100644 --- a/src/main/java/binnie/botany/api/IFlowerMutation.java +++ b/src/main/java/binnie/botany/api/IFlowerMutation.java @@ -5,5 +5,6 @@ import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutation; public interface IFlowerMutation extends IMutation { + float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1); } diff --git a/src/main/java/binnie/botany/api/IFlowerRoot.java b/src/main/java/binnie/botany/api/IFlowerRoot.java index 0dbdfed9..aea37a6a 100644 --- a/src/main/java/binnie/botany/api/IFlowerRoot.java +++ b/src/main/java/binnie/botany/api/IFlowerRoot.java @@ -1,13 +1,17 @@ package binnie.botany.api; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.ISpeciesRoot; import java.util.Collection; + import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.IAllele; +import forestry.api.genetics.ISpeciesRoot; + public interface IFlowerRoot extends ISpeciesRoot { + @Override IFlower getMember(ItemStack stack); diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index 16831bb5..4a7755ea 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -3,6 +3,7 @@ package binnie.botany.api; import net.minecraft.util.IIcon; public interface IFlowerType { + IIcon getStem(EnumFlowerStage stage, boolean flowered, int section); IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section); diff --git a/src/main/java/binnie/botany/api/gardening/IBlockSoil.java b/src/main/java/binnie/botany/api/gardening/IBlockSoil.java index 237d740c..023889ed 100644 --- a/src/main/java/binnie/botany/api/gardening/IBlockSoil.java +++ b/src/main/java/binnie/botany/api/gardening/IBlockSoil.java @@ -1,11 +1,13 @@ package binnie.botany.api.gardening; +import net.minecraft.world.World; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; -import net.minecraft.world.World; public interface IBlockSoil { + EnumAcidity getPH(World world, int x, int y, int z); EnumMoisture getMoisture(World world, int x, int y, int z); diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index e22be813..04fa82c8 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -1,16 +1,8 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,7 +18,18 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockCeramic extends Block implements IBlockMetadata { + public BlockCeramic() { super(Material.rock); setHardness(1.0f); diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index e28f7253..25da0db2 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -1,20 +1,8 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.botany.items.BotanyItems; -import binnie.core.BinnieCore; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.IMultipassBlock; -import binnie.core.block.MultipassBlockRenderer; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,7 +18,22 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.items.BotanyItems; +import binnie.core.BinnieCore; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.IMultipassBlock; +import binnie.core.block.MultipassBlockRenderer; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock { + public BlockCeramicBrick() { super(Material.rock); setHardness(1.0f); @@ -190,6 +193,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public enum TileType { + Tile("tile", "ceramicTile"), Brick("brick", "ceramicBricks"), StripeBrick("brickstripe", "strippedCeramicBricks"), @@ -284,7 +288,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return null; } - int[] colors = {-1, -1}; + int[] colors = { -1, -1 }; int altCounter = 0; for (ItemStack stack : stacks) { int alt = (altCounter != 0 && altCounter != 3) ? 1 : 0; @@ -314,7 +318,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return null; } - int[] colors = {-1, -1}; + int[] colors = { -1, -1 }; for (ItemStack stack : stacks) { if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { return null; @@ -343,7 +347,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return null; } - int[] colors = {-1, -1}; + int[] colors = { -1, -1 }; for (ItemStack stack : stacks) { if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { return null; @@ -395,7 +399,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return null; } - int[] colors = {-1, -1}; + int[] colors = { -1, -1 }; for (ItemStack stack4 : stacks) { if (stack4.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { return null; @@ -443,7 +447,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa return null; } - int[] colors = {-1, -1}; + int[] colors = { -1, -1 }; for (int index2 = 0; index2 < stacks.size(); ++index2) { ItemStack stack = stacks.get(index2); if (stack.getItem() != Item.getItemFromBlock(Botany.ceramicBrick)) { @@ -502,6 +506,7 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } public static class BlockType { + protected EnumFlowerColor color1; protected EnumFlowerColor color2; protected TileType type; diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java index db08adea..dd47bd7a 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicPatterned.java @@ -1,5 +1,11 @@ package binnie.botany.ceramic; +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; @@ -8,12 +14,9 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.carpentry.BlockDesign; import binnie.extratrees.carpentry.DesignBlock; import binnie.extratrees.carpentry.ModuleCarpentry; -import java.util.List; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class BlockCeramicPatterned extends BlockDesign { + public BlockCeramicPatterned() { super(CeramicDesignSystem.instance, Material.rock); setHardness(1.0f); @@ -25,7 +28,10 @@ public class BlockCeramicPatterned extends BlockDesign { @Override public ItemStack getCreativeStack(IDesign design) { return ModuleCarpentry.getItemStack( - this, CeramicColor.get(EnumFlowerColor.WHITE), CeramicColor.get(EnumFlowerColor.BLACK), design); + this, + CeramicColor.get(EnumFlowerColor.WHITE), + CeramicColor.get(EnumFlowerColor.BLACK), + design); } @Override diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index 97f8d5a8..1be83881 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -1,18 +1,9 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -28,7 +19,19 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockStained extends Block implements IBlockMetadata { + public BlockStained() { super(Material.glass); setCreativeTab(CreativeTabBotany.instance); @@ -59,7 +62,7 @@ public class BlockStained extends Block implements IBlockMetadata { @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - // Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - + // Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - // Facing.offsetsZForSide[side]); Block block = world.getBlock(x, y, z); return block != this && block != ExtraTrees.blockStained && super.shouldSideBeRendered(world, x, y, z, side); diff --git a/src/main/java/binnie/botany/ceramic/CeramicColor.java b/src/main/java/binnie/botany/ceramic/CeramicColor.java index cb1c1654..8f9ca8d6 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicColor.java +++ b/src/main/java/binnie/botany/ceramic/CeramicColor.java @@ -1,14 +1,17 @@ package binnie.botany.ceramic; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; -import java.util.LinkedHashMap; -import java.util.Map; -import net.minecraft.item.ItemStack; public class CeramicColor implements IDesignMaterial { + private static Map map; static { diff --git a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index 127a93f1..9daf34dc 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -1,5 +1,13 @@ package binnie.botany.ceramic; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; @@ -10,14 +18,9 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.carpentry.DesignerManager; import binnie.extratrees.carpentry.EnumPattern; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class CeramicDesignSystem implements IDesignSystem { + public static CeramicDesignSystem instance = new CeramicDesignSystem(); protected Map primary; diff --git a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java index 7563417c..f499d673 100644 --- a/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java +++ b/src/main/java/binnie/botany/ceramic/CeramicTileRecipe.java @@ -1,15 +1,18 @@ package binnie.botany.ceramic; -import binnie.botany.Botany; import java.util.ArrayList; import java.util.List; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import binnie.botany.Botany; + public class CeramicTileRecipe implements IRecipe { + protected ItemStack cached; @Override diff --git a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java index 26a3ef75..7938f644 100644 --- a/src/main/java/binnie/botany/ceramic/PigmentRecipe.java +++ b/src/main/java/binnie/botany/ceramic/PigmentRecipe.java @@ -1,14 +1,16 @@ package binnie.botany.ceramic; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.IFlower; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.IFlower; + public class PigmentRecipe implements IRecipe { + protected ItemStack cached; private ItemStack unknown; @@ -45,10 +47,7 @@ public class PigmentRecipe implements IRecipe { IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(crafting.getStackInSlot(i)); if (flower.getAge() >= 1) { - stack = new ItemStack( - Botany.pigment, - 1, - flower.getGenome().getPrimaryColor().getID()); + stack = new ItemStack(Botany.pigment, 1, flower.getGenome().getPrimaryColor().getID()); } } } diff --git a/src/main/java/binnie/botany/core/BotanyCore.java b/src/main/java/binnie/botany/core/BotanyCore.java index da14f8aa..a1664353 100644 --- a/src/main/java/binnie/botany/core/BotanyCore.java +++ b/src/main/java/binnie/botany/core/BotanyCore.java @@ -4,6 +4,7 @@ import binnie.botany.api.IFlowerRoot; import binnie.botany.genetics.FlowerHelper; public class BotanyCore { + public static IFlowerRoot speciesRoot = new FlowerHelper(); public static IFlowerRoot getFlowerRoot() { diff --git a/src/main/java/binnie/botany/core/BotanyGUI.java b/src/main/java/binnie/botany/core/BotanyGUI.java index f4a90a7a..ea81f884 100644 --- a/src/main/java/binnie/botany/core/BotanyGUI.java +++ b/src/main/java/binnie/botany/core/BotanyGUI.java @@ -1,13 +1,15 @@ package binnie.botany.core; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import binnie.botany.craftgui.WindowBotanistDatabase; import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; public enum BotanyGUI implements IBinnieGUID { + Database, DatabaseNEI; diff --git a/src/main/java/binnie/botany/core/ModuleCore.java b/src/main/java/binnie/botany/core/ModuleCore.java index e12c2ec0..7d1dc53c 100644 --- a/src/main/java/binnie/botany/core/ModuleCore.java +++ b/src/main/java/binnie/botany/core/ModuleCore.java @@ -3,6 +3,7 @@ package binnie.botany.core; import binnie.core.IInitializable; public class ModuleCore implements IInitializable { + @Override public void preInit() { // ignored diff --git a/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java index 5ebbddf1..2d817ddc 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorDisplay.java @@ -11,6 +11,7 @@ import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.geometry.IArea; public class ControlColorDisplay extends Control implements IControlValue, ITooltip { + private IFlowerColor value; public ControlColorDisplay(IWidget parent, float x, float y) { diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java index dab103f1..4367314a 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java @@ -5,6 +5,7 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; public class ControlColorMixBox extends ControlListBox { + private Type type; public ControlColorMixBox(IWidget parent, int x, int y, int width, int height, Type type) { diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java index 26317c9c..a2e9195a 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java @@ -5,6 +5,7 @@ import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlOption; public class ControlColorMixItem extends ControlOption { + protected ControlColorDisplay itemWidget1; protected ControlColorDisplay itemWidget2; protected ControlColorDisplay itemWidget3; diff --git a/src/main/java/binnie/botany/craftgui/ControlColorOption.java b/src/main/java/binnie/botany/craftgui/ControlColorOption.java index c46d5d4f..d1bad758 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorOption.java @@ -9,6 +9,7 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.IPoint; public class ControlColorOption extends ControlTextOption { + protected ControlColorDisplay controlBee; protected IPoint boxPosition; @@ -19,8 +20,7 @@ public class ControlColorOption extends ControlTextOption { addAttribute(WidgetAttribute.MOUSE_OVER); CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f))); - int th = (int) CraftGUI.render.textHeight( - textWidget.getValue(), textWidget.getSize().x()); + int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x()); int height = Math.max(20, th + 6); setSize(new IPoint(size().x(), height)); textWidget.setSize(new IPoint(textWidget.getSize().x(), height)); diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index 1108139e..58701826 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -14,6 +14,7 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.util.I18N; public class ControlColourMixSymbol extends Control implements ITooltip { + protected static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); protected static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); diff --git a/src/main/java/binnie/botany/craftgui/PageColorMix.java b/src/main/java/binnie/botany/craftgui/PageColorMix.java index 4792bbb2..7a2f29cb 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMix.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import java.util.ArrayList; +import java.util.List; + import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; @@ -9,10 +12,9 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; import binnie.core.util.I18N; -import java.util.ArrayList; -import java.util.List; public class PageColorMix extends PageAbstract { + ControlText title; ControlColorMixBox list; diff --git a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java index 3d5970aa..c89b7df9 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java @@ -1,5 +1,8 @@ package binnie.botany.craftgui; +import java.util.ArrayList; +import java.util.List; + import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; @@ -9,10 +12,9 @@ import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.database.DatabaseTab; import binnie.core.craftgui.database.PageAbstract; import binnie.core.util.I18N; -import java.util.ArrayList; -import java.util.List; public class PageColorMixResultant extends PageAbstract { + protected ControlText title; protected ControlColorMixBox list; diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index a880f197..a7969485 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -1,5 +1,7 @@ package binnie.botany.craftgui; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -22,9 +24,9 @@ import binnie.genetics.genetics.AlleleHelper; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; public class PageSpeciesFlowerGenome extends PageSpecies { + public PageSpeciesFlowerGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); } @@ -103,7 +105,10 @@ public class PageSpeciesFlowerGenome extends PageSpecies { I18N.localise("botany.gui.database.tab.genome.fertility"), TextJustification.MIDDLE_RIGHT); new ControlText( - contents, new IArea(valueX, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFT); + contents, + new IArea(valueX, y, w3, th), + genome.getFertility() + "x", + TextJustification.MIDDLE_LEFT); y += th; float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f; diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 599dad1b..073edf44 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -1,5 +1,11 @@ package binnie.botany.craftgui; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.IFlowerColor; @@ -21,12 +27,9 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.minecraft.Window; import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; public class WindowBotanistDatabase extends WindowAbstractDatabase { + public WindowBotanistDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.flowerBreedingSystem, 130.0f); } @@ -40,7 +43,8 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.overview")); new PageSpeciesFlowerGenome(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "genome")); new PageSpeciesClassification( - getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.classification")); + getInfoPages(Mode.Species), + new DatabaseTab(Botany.instance, "species.classification")); new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.resultant")); new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(Botany.instance, "species.further")); new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(Botany.instance, "branches.overview")); @@ -62,6 +66,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { } enum FlowerMode implements IDatabaseMode { + COLOR; @Override @@ -71,6 +76,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { } private class ColorModeWidget extends ModeWidgets { + public ColorModeWidget() { super(FlowerMode.COLOR, WindowBotanistDatabase.this); } @@ -78,6 +84,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { @Override public void createListBox(IArea area) { listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { + @Override public IWidget createOption(IFlowerColor value, int y) { return new ControlColorOption(getContent(), value, y); diff --git a/src/main/java/binnie/botany/farm/CircuitGarden.java b/src/main/java/binnie/botany/farm/CircuitGarden.java index 57e78580..2acc9852 100644 --- a/src/main/java/binnie/botany/farm/CircuitGarden.java +++ b/src/main/java/binnie/botany/farm/CircuitGarden.java @@ -1,5 +1,8 @@ package binnie.botany.farm; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.core.circuits.BinnieCircuit; @@ -7,29 +10,24 @@ import binnie.core.util.I18N; import forestry.api.circuits.ChipsetManager; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmHousing; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class CircuitGarden extends BinnieCircuit { + private boolean isManual; private boolean isFertilised; private ItemStack icon; private EnumMoisture moisture; private EnumAcidity acidity; - public CircuitGarden( - EnumMoisture moisture, - EnumAcidity ph, - boolean manual, - boolean fertilised, - ItemStack recipe, + public CircuitGarden(EnumMoisture moisture, EnumAcidity ph, boolean manual, boolean fertilised, ItemStack recipe, ItemStack icon) { super( - "garden." + moisture.getID() + ((ph != null) ? ("." + ph.getID()) : "") + (manual ? ".manual" : "") + "garden." + moisture.getID() + + ((ph != null) ? ("." + ph.getID()) : "") + + (manual ? ".manual" : "") + (fertilised ? ".fert" : ""), 4, - manual - ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") + manual ? ChipsetManager.circuitRegistry.getLayout("forestry.farms.manual") : ChipsetManager.circuitRegistry.getLayout("forestry.farms.managed"), recipe); this.moisture = moisture; diff --git a/src/main/java/binnie/botany/farm/FarmLogic.java b/src/main/java/binnie/botany/farm/FarmLogic.java index 40d91283..ed153902 100644 --- a/src/main/java/binnie/botany/farm/FarmLogic.java +++ b/src/main/java/binnie/botany/farm/FarmLogic.java @@ -1,15 +1,17 @@ package binnie.botany.farm; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmLogic; -import forestry.core.utils.vect.Vect; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmLogic; +import forestry.core.utils.vect.Vect; + public abstract class FarmLogic implements IFarmLogic { + protected World world; protected IFarmHousing housing; protected boolean isManual; diff --git a/src/main/java/binnie/botany/farm/FarmableFlower.java b/src/main/java/binnie/botany/farm/FarmableFlower.java index 902dc697..82afa07c 100644 --- a/src/main/java/binnie/botany/farm/FarmableFlower.java +++ b/src/main/java/binnie/botany/farm/FarmableFlower.java @@ -1,5 +1,9 @@ package binnie.botany.farm; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IFlower; @@ -7,11 +11,9 @@ import binnie.botany.core.BotanyCore; import binnie.botany.gardening.Gardening; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class FarmableFlower implements IFarmable { + @Override public boolean isSaplingAt(World world, int x, int y, int z) { return world.getBlock(x, y, z) == Botany.flower; diff --git a/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java b/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java index 89d09e43..7626b645 100644 --- a/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java +++ b/src/main/java/binnie/botany/farm/FarmableVanillaFlower.java @@ -1,13 +1,15 @@ package binnie.botany.farm; -import binnie.botany.api.IFlower; -import binnie.botany.core.BotanyCore; -import binnie.botany.gardening.Gardening; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import binnie.botany.api.IFlower; +import binnie.botany.core.BotanyCore; +import binnie.botany.gardening.Gardening; + public class FarmableVanillaFlower extends FarmableFlower { + @Override public boolean isGermling(ItemStack itemstack) { return BotanyCore.getFlowerRoot().getConversion(itemstack) != null; diff --git a/src/main/java/binnie/botany/farm/GardenLogic.java b/src/main/java/binnie/botany/farm/GardenLogic.java index 403eb91f..60f33123 100644 --- a/src/main/java/binnie/botany/farm/GardenLogic.java +++ b/src/main/java/binnie/botany/farm/GardenLogic.java @@ -1,25 +1,9 @@ package binnie.botany.farm; -import binnie.Binnie; -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.gardening.IBlockSoil; -import binnie.botany.flower.TileEntityFlower; -import binnie.botany.gardening.Gardening; -import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.farming.FarmDirection; -import forestry.api.farming.ICrop; -import forestry.api.farming.IFarmHousing; -import forestry.api.farming.IFarmable; -import forestry.core.access.IOwnable; -import forestry.core.utils.vect.Vect; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; @@ -31,7 +15,28 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.gardening.IBlockSoil; +import binnie.botany.flower.TileEntityFlower; +import binnie.botany.gardening.Gardening; + +import com.mojang.authlib.GameProfile; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.farming.FarmDirection; +import forestry.api.farming.ICrop; +import forestry.api.farming.IFarmHousing; +import forestry.api.farming.IFarmable; +import forestry.core.access.IOwnable; +import forestry.core.utils.vect.Vect; + public class GardenLogic extends FarmLogic { + protected EnumMoisture moisture; protected EnumAcidity acidity; protected boolean fertilised; @@ -62,8 +67,7 @@ public class GardenLogic extends FarmLogic { @Override public boolean isAcceptedResource(ItemStack stack) { Item item = stack.getItem(); - return Gardening.isSoil(item) - || item == Item.getItemFromBlock(Blocks.sand) + return Gardening.isSoil(item) || item == Item.getItemFromBlock(Blocks.sand) || item == Item.getItemFromBlock(Blocks.dirt) || Gardening.isAcidFertiliser(stack) || Gardening.isAlkalineFertiliser(stack); @@ -79,8 +83,7 @@ public class GardenLogic extends FarmLogic { @Override public boolean cultivate(int x, int y, int z, FarmDirection direction, int extent) { world = housing.getWorld(); - return maintainSoil(x, y, z, direction, extent) - || !isManual && maintainWater(x, y, z, direction, extent) + return maintainSoil(x, y, z, direction, extent) || !isManual && maintainWater(x, y, z, direction, extent) || maintainCrops(x, y + 1, z, direction, extent); } @@ -126,36 +129,25 @@ public class GardenLogic extends FarmLogic { EnumAcidity pH = soil.getPH(world, position.x, position.y, position.z); if (pH.ordinal() < acidity.ordinal()) { ItemStack stack = getAvailableAlkaline(); - if (stack != null - && soil.setPH( - world, - position.x, - position.y, - position.z, - EnumAcidity.values()[pH.ordinal() + 1])) { - housing.getFarmInventory().removeResources(new ItemStack[] {stack}); + if (stack != null && soil + .setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() + 1])) { + housing.getFarmInventory().removeResources(new ItemStack[] { stack }); continue; } } if (pH.ordinal() > acidity.ordinal()) { ItemStack stack = getAvailableAcid(); - if (stack != null - && soil.setPH( - world, - position.x, - position.y, - position.z, - EnumAcidity.values()[pH.ordinal() - 1])) { - housing.getFarmInventory().removeResources(new ItemStack[] {stack}); + if (stack != null && soil + .setPH(world, position.x, position.y, position.z, EnumAcidity.values()[pH.ordinal() - 1])) { + housing.getFarmInventory().removeResources(new ItemStack[] { stack }); continue; } } } - if (!isAirBlock(position) - && !world.getBlock(position.x, position.y, position.z) - .isReplaceable(world, position.x, position.y, position.z)) { + if (!isAirBlock(position) && !world.getBlock(position.x, position.y, position.z) + .isReplaceable(world, position.x, position.y, position.z)) { ItemStack block = getAsItemStack(position); ItemStack loam = getAvailableLoam(); if (isWaste(block) && loam != null) { @@ -224,20 +216,20 @@ public class GardenLogic extends FarmLogic { private ItemStack getAvailableLoam() { EnumMoisture[] moistures; if (moisture == EnumMoisture.DAMP) { - moistures = new EnumMoisture[] {EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY}; + moistures = new EnumMoisture[] { EnumMoisture.DAMP, EnumMoisture.NORMAL, EnumMoisture.DRY }; } else if (moisture == EnumMoisture.DRY) { - moistures = new EnumMoisture[] {EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY}; + moistures = new EnumMoisture[] { EnumMoisture.DRY, EnumMoisture.DAMP, EnumMoisture.DRY }; } else { - moistures = new EnumMoisture[] {EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP}; + moistures = new EnumMoisture[] { EnumMoisture.DRY, EnumMoisture.NORMAL, EnumMoisture.DAMP }; } - EnumAcidity[] acidities = {EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE}; + EnumAcidity[] acidities = { EnumAcidity.NEUTRAL, EnumAcidity.ACID, EnumAcidity.ALKALINE }; for (EnumMoisture moist : moistures) { for (EnumAcidity acid : acidities) { - for (Block type : new Block[] {Botany.flowerbed, Botany.loam, Botany.soil}) { + for (Block type : new Block[] { Botany.flowerbed, Botany.loam, Botany.soil }) { int meta = acid.ordinal() * 3 + moist.ordinal(); - ItemStack[] resource = {new ItemStack(type, 1, meta)}; + ItemStack[] resource = { new ItemStack(type, 1, meta) }; if (housing.getFarmInventory().hasResources(resource)) { return resource[0]; } @@ -245,7 +237,7 @@ public class GardenLogic extends FarmLogic { } } - if (housing.getFarmInventory().hasResources(new ItemStack[] {new ItemStack(Blocks.dirt)})) { + if (housing.getFarmInventory().hasResources(new ItemStack[] { new ItemStack(Blocks.dirt) })) { return new ItemStack(Blocks.dirt); } return null; @@ -266,7 +258,7 @@ public class GardenLogic extends FarmLogic { } setBlock(position, ((ItemBlock) loam.getItem()).field_150939_a, loam.getItemDamage()); - housing.getFarmInventory().removeResources(new ItemStack[] {copy}); + housing.getFarmInventory().removeResources(new ItemStack[] { copy }); return true; } @@ -286,7 +278,7 @@ public class GardenLogic extends FarmLogic { return trySetSoil(position); } - ItemStack[] sand = {new ItemStack(Blocks.sand, 1)}; + ItemStack[] sand = { new ItemStack(Blocks.sand, 1) }; if (!housing.getFarmInventory().hasResources(sand)) { return false; } @@ -368,8 +360,7 @@ public class GardenLogic extends FarmLogic { try { IOwnable housing2 = (IOwnable) housing; - GameProfile prof = (GameProfile) IOwnable.class - .getMethod("getOwnerProfile", new Class[0]) + GameProfile prof = (GameProfile) IOwnable.class.getMethod("getOwnerProfile", new Class[0]) .invoke(housing2); ((TileEntityFlower) tile).setOwner(prof); } catch (Exception ex) { @@ -382,9 +373,8 @@ public class GardenLogic extends FarmLogic { public ItemStack getAvailableAcid() { for (ItemStack stack : Gardening.getAcidFertilisers()) { - if (stack != null - && stack.getItem() != null - && housing.getFarmInventory().hasResources(new ItemStack[] {stack})) { + if (stack != null && stack.getItem() != null + && housing.getFarmInventory().hasResources(new ItemStack[] { stack })) { return stack; } } @@ -393,22 +383,16 @@ public class GardenLogic extends FarmLogic { public ItemStack getAvailableAlkaline() { for (ItemStack stack : Gardening.getAlkalineFertilisers()) { - if (stack != null - && stack.getItem() != null - && housing.getFarmInventory().hasResources(new ItemStack[] {stack})) { + if (stack != null && stack.getItem() != null + && housing.getFarmInventory().hasResources(new ItemStack[] { stack })) { return stack; } } return null; } - public void setData( - EnumMoisture moisture, - EnumAcidity acidity, - boolean isManual, - boolean fertilised, - ItemStack icon, - String name) { + public void setData(EnumMoisture moisture, EnumAcidity acidity, boolean isManual, boolean fertilised, + ItemStack icon, String name) { this.moisture = moisture; this.acidity = acidity; this.isManual = isManual; diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index 009ad81a..1c479819 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -1,19 +1,9 @@ package binnie.botany.flower; -import binnie.botany.Botany; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerType; -import binnie.botany.core.BotanyCore; -import binnie.botany.gardening.Gardening; -import binnie.botany.genetics.EnumFlowerType; -import binnie.core.BinnieCore; -import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -28,7 +18,22 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.botany.Botany; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerType; +import binnie.botany.core.BotanyCore; +import binnie.botany.gardening.Gardening; +import binnie.botany.genetics.EnumFlowerType; +import binnie.core.BinnieCore; + +import com.mojang.authlib.GameProfile; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockFlower extends BlockContainer { + public BlockFlower() { super(Material.plants); float f = 0.2f; @@ -117,8 +122,7 @@ public class BlockFlower extends BlockContainer { return flower.getStem(stage, flowered, section); } - return (RendererBotany.pass == 1) - ? flower.getPetalIcon(stage, flowered, section) + return (RendererBotany.pass == 1) ? flower.getPetalIcon(stage, flowered, section) : flower.getVariantIcon(stage, flowered, section); } @@ -155,8 +159,7 @@ public class BlockFlower extends BlockContainer { } TileEntityFlower flower = (TileEntityFlower) tile; - if (flower.getSection() == 0 - && flower.getFlower() != null + if (flower.getSection() == 0 && flower.getFlower() != null && flower.getFlower().getAge() > 0 && flower.getFlower().getGenome().getPrimary().getType().getSections() > 1 && world.getBlock(x, y + 1, z) != Botany.flower) { @@ -209,8 +212,7 @@ public class BlockFlower extends BlockContainer { public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { List drops = getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0); boolean hasBeenBroken = world.setBlockToAir(x, y, z); - if (hasBeenBroken - && BinnieCore.proxy.isSimulating(world) + if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 0a7293af..d6f98aed 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -1,5 +1,19 @@ package binnie.botany.flower; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; @@ -18,20 +32,9 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.core.config.Config; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; public abstract class ItemBotany extends Item { + public ItemBotany(String name) { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName(name); @@ -86,11 +89,12 @@ public abstract class ItemBotany extends Item { IFlowerColor stemColor = genome.getStemColor(); if (primaryColor == secondColor) { - tooltip.add(EnumChatFormatting.YELLOW - + I18N.localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName())); + tooltip.add( + EnumChatFormatting.YELLOW + I18N + .localise("botany.item.tooltip.flowerColor1", primaryColor.getName(), stemColor.getName())); } else { - tooltip.add(EnumChatFormatting.YELLOW - + I18N.localise( + tooltip.add( + EnumChatFormatting.YELLOW + I18N.localise( "botany.item.tooltip.flowerColor2", primaryColor.getName(), secondColor.getName(), @@ -143,8 +147,7 @@ public abstract class ItemBotany extends Item { if (hideSecrets && individual.isSecret() && !Config.isDebug) { continue; } - itemList.add(BotanyCore.speciesRoot.getMemberStack( - individual.copy(), getStage().ordinal())); + itemList.add(BotanyCore.speciesRoot.getMemberStack(individual.copy(), getStage().ordinal())); } } @@ -158,8 +161,7 @@ public abstract class ItemBotany extends Item { if (renderPass == 0) { return flower.getGenome().getStemColor().getColor(flower.isWilted()); } - return (renderPass == 1) - ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted()) + return (renderPass == 1) ? flower.getGenome().getPrimaryColor().getColor(flower.isWilted()) : flower.getGenome().getSecondaryColor().getColor(flower.isWilted()); } @@ -192,17 +194,8 @@ public abstract class ItemBotany extends Item { } @Override - public boolean onItemUse( - ItemStack itemstack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float px, - float py, - float pz) { + public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, + float px, float py, float pz) { if (getStage() == EnumFlowerStage.POLLEN) { IFlower flower = Binnie.Genetics.getFlowerRoot().getMember(itemstack); TileEntity target = world.getTileEntity(x, y, z); @@ -224,24 +217,23 @@ public abstract class ItemBotany extends Item { Block blockAlreadyThere = world.getBlock(x, y, z); if (blockAlreadyThere == Blocks.snow_layer && (world.getBlockMetadata(x, y, z) & 0x7) < 1) { side = 1; - } else if (blockAlreadyThere != Blocks.vine - && blockAlreadyThere != Blocks.tallgrass + } else if (blockAlreadyThere != Blocks.vine && blockAlreadyThere != Blocks.tallgrass && blockAlreadyThere != Blocks.deadbush && !blockAlreadyThere.isReplaceable(world, x, y, z)) { - if (side == 0) { - y--; - } else if (side == 1) { - y++; - } else if (side == 2) { - z--; - } else if (side == 3) { - z++; - } else if (side == 4) { - x--; - } else if (side == 5) { - x++; - } - } + if (side == 0) { + y--; + } else if (side == 1) { + y++; + } else if (side == 2) { + z--; + } else if (side == 3) { + z++; + } else if (side == 4) { + x--; + } else if (side == 5) { + x++; + } + } if (itemstack.stackSize == 0 || !player.canPlayerEdit(x, y, z, side, itemstack)) { return false; @@ -274,39 +266,28 @@ public abstract class ItemBotany extends Item { Block block = world.getBlock(x, y, z); if (block == Blocks.snow_layer) { side = 1; - } else if (block != Blocks.vine - && block != Blocks.tallgrass + } else if (block != Blocks.vine && block != Blocks.tallgrass && block != Blocks.deadbush && !block.isReplaceable(world, x, y, z)) { - if (side == 0) { - y--; - } else if (side == 1) { - y++; - } else if (side == 2) { - z--; - } else if (side == 3) { - z++; - } else if (side == 4) { - x--; - } else if (side == 5) { - x++; - } - } + if (side == 0) { + y--; + } else if (side == 1) { + y++; + } else if (side == 2) { + z--; + } else if (side == 3) { + z++; + } else if (side == 4) { + x--; + } else if (side == 5) { + x++; + } + } return world.canPlaceEntityOnSide(field_150939_a, x, y, z, false, side, null, stack); } - public boolean placeBlockAt( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ, - int metadata) { + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ, int metadata) { Block block = Botany.flower; if (!world.setBlock(x, y, z, block, metadata, 3)) { return false; diff --git a/src/main/java/binnie/botany/flower/ItemFlower.java b/src/main/java/binnie/botany/flower/ItemFlower.java index 6ce6a1e6..3b9d8353 100644 --- a/src/main/java/binnie/botany/flower/ItemFlower.java +++ b/src/main/java/binnie/botany/flower/ItemFlower.java @@ -3,6 +3,7 @@ package binnie.botany.flower; import binnie.botany.api.EnumFlowerStage; public class ItemFlower extends ItemBotany { + public ItemFlower() { super("itemFlower"); } diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 4dbe0f50..1dc313c5 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,11 +1,7 @@ package binnie.botany.flower; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +10,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemInsulatedTube extends Item { + IIcon[] icons; public ItemInsulatedTube() { @@ -52,8 +55,7 @@ public class ItemInsulatedTube extends Item { if (pass == 0) { return 0xffffff; } - return (pass == 1) - ? Material.get(stack.getItemDamage()).getColor() + return (pass == 1) ? Material.get(stack.getItemDamage()).getColor() : Insulate.get(stack.getItemDamage()).getColor(); } @@ -85,6 +87,7 @@ public class ItemInsulatedTube extends Item { } enum Material { + Copper(0xe3b78e, "cooper"), Tin(0xe1eef4, "tin"), Bronze(0xddc276, "bronze"), @@ -112,6 +115,7 @@ public class ItemInsulatedTube extends Item { } enum Insulate { + Clay(0xa1aacc, "clay"), Cobble(0x7b7b7b, "cobblestone"), Sand(0xefeab5, "sand"), diff --git a/src/main/java/binnie/botany/flower/ItemPollen.java b/src/main/java/binnie/botany/flower/ItemPollen.java index 1c848ebc..c37d094e 100644 --- a/src/main/java/binnie/botany/flower/ItemPollen.java +++ b/src/main/java/binnie/botany/flower/ItemPollen.java @@ -4,6 +4,7 @@ import binnie.botany.api.EnumFlowerStage; import binnie.core.util.I18N; public class ItemPollen extends ItemBotany { + public ItemPollen() { super("pollen"); } diff --git a/src/main/java/binnie/botany/flower/ItemSeed.java b/src/main/java/binnie/botany/flower/ItemSeed.java index e95d111b..ad3329b2 100644 --- a/src/main/java/binnie/botany/flower/ItemSeed.java +++ b/src/main/java/binnie/botany/flower/ItemSeed.java @@ -4,6 +4,7 @@ import binnie.botany.api.EnumFlowerStage; import binnie.core.util.I18N; public class ItemSeed extends ItemBotany { + public ItemSeed() { super("seed"); } diff --git a/src/main/java/binnie/botany/flower/RendererBotany.java b/src/main/java/binnie/botany/flower/RendererBotany.java index 034acdbf..d2d57e98 100644 --- a/src/main/java/binnie/botany/flower/RendererBotany.java +++ b/src/main/java/binnie/botany/flower/RendererBotany.java @@ -1,6 +1,5 @@ package binnie.botany.flower; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -8,7 +7,10 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class RendererBotany implements ISimpleBlockRenderingHandler { + public static int renderID; public static int pass; @@ -18,8 +20,8 @@ public class RendererBotany implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z)); double d1 = x; diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index ebbd060b..7c693f43 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -1,5 +1,21 @@ package binnie.botany.flower; +import java.util.EnumSet; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.EnumPlantType; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; @@ -17,7 +33,9 @@ import binnie.botany.genetics.EnumFlowerType; import binnie.botany.genetics.Flower; import binnie.botany.network.MessageFlowerUpdate; import binnie.core.BinnieCore; + import com.mojang.authlib.GameProfile; + import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IIndividual; @@ -25,22 +43,9 @@ import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import forestry.lepidopterology.entities.EntityButterfly; -import java.util.EnumSet; -import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.EnumPlantType; public class TileEntityFlower extends TileEntity implements IPollinatable, IButterflyNursery { + protected IFlower flower; protected GameProfile owner; protected int section; @@ -119,8 +124,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt @Override public boolean canMateWith(IIndividual individual) { - return isBreeding() - && individual instanceof IFlower + return isBreeding() && individual instanceof IFlower && getFlower() != null && getFlower().getMate() == null && getFlower().hasFlowered() @@ -133,8 +137,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return; } - IAlleleFlowerSpecies primary = - (IAlleleFlowerSpecies) individual.getGenome().getPrimary(); + IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) individual.getGenome().getPrimary(); IAlleleFlowerSpecies primary2 = getFlower().getGenome().getPrimary(); if (primary == primary2 || worldObj.rand.nextInt(4) == 0) { getFlower().mate((IFlower) individual); @@ -283,9 +286,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt Gardening.onGrowFromSeed(worldObj, xCoord, yCoord, zCoord); if (getOwner() != null && getFlower() != null) { - BotanyCore.getFlowerRoot() - .getBreedingTracker(getWorldObj(), getOwner()) - .registerBirth(getFlower()); + BotanyCore.getFlowerRoot().getBreedingTracker(getWorldObj(), getOwner()).registerBirth(getFlower()); } } @@ -294,11 +295,8 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt if (renderInfo == null && getFlower() != null && getFlower().getGenome() != null) { renderInfo = new RenderInfo(getFlower(), this); } - return (renderInfo != null) - ? Botany.instance - .getNetworkWrapper() - .getPacketFrom(new MessageFlowerUpdate(xCoord, yCoord, zCoord, renderInfo).getMessage()) - : null; + return (renderInfo != null) ? Botany.instance.getNetworkWrapper() + .getPacketFrom(new MessageFlowerUpdate(xCoord, yCoord, zCoord, renderInfo).getMessage()) : null; } public void updateRender(boolean update) { @@ -454,11 +452,8 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt return; } - IButterfly spawn = Binnie.Genetics.getButterflyRoot() - .getIndividualTemplates() - .get(worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot() - .getIndividualTemplates() - .size())); + IButterfly spawn = Binnie.Genetics.getButterflyRoot().getIndividualTemplates() + .get(worldObj.rand.nextInt(Binnie.Genetics.getButterflyRoot().getIndividualTemplates().size())); if (worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) { return; } @@ -528,9 +523,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } matureTime++; - if (matureTime - >= caterpillar.getGenome().getLifespan() - / (caterpillar.getGenome().getFertility() * 2) + if (matureTime >= caterpillar.getGenome().getLifespan() / (caterpillar.getGenome().getFertility() * 2) && caterpillar.canTakeFlight(worldObj, xCoord, yCoord, zCoord)) { if (worldObj.isAirBlock(xCoord, yCoord + 1, zCoord)) { attemptButterflySpawn(worldObj, caterpillar, xCoord, yCoord + 1, zCoord); @@ -601,6 +594,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt } public static class RenderInfo { + public IFlowerColor primary; public IFlowerColor secondary; public IFlowerColor stem; @@ -627,8 +621,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public boolean equals(Object obj) { if (obj instanceof RenderInfo) { RenderInfo o = (RenderInfo) obj; - return o.age == age - && o.wilted == wilted + return o.age == age && o.wilted == wilted && o.flowered == flowered && o.primary == primary && o.secondary == secondary diff --git a/src/main/java/binnie/botany/gardening/BlockPlant.java b/src/main/java/binnie/botany/gardening/BlockPlant.java index 06afd05c..ed8d7287 100644 --- a/src/main/java/binnie/botany/gardening/BlockPlant.java +++ b/src/main/java/binnie/botany/gardening/BlockPlant.java @@ -1,15 +1,9 @@ package binnie.botany.gardening; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.gardening.IBlockSoil; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,7 +14,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.gardening.IBlockSoil; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockPlant extends BlockBush { + public BlockPlant() { setBlockName("plant"); setCreativeTab(CreativeTabBotany.instance); @@ -125,6 +128,7 @@ public class BlockPlant extends BlockBush { } public enum Type { + Weeds("weeds"), WeedsLong("longWeeds"), WeedsVeryLong("veryLongWeeds"), diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index 1612445f..b99b3c66 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -1,15 +1,8 @@ package binnie.botany.gardening; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.gardening.IBlockSoil; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,7 +17,17 @@ import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.gardening.IBlockSoil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockSoil extends Block implements IBlockSoil { + protected boolean weedKilled; protected IIcon[] iconsTop; protected IIcon[] iconsSide; @@ -115,8 +118,7 @@ public class BlockSoil extends Block implements IBlockSoil { if (meta != meta2) { world.setBlockMetadataWithNotify(x, y, z, meta2, 2); } - if (!weedKilled - && random.nextInt(5 - getType(world, x, y, z).ordinal()) == 0 + if (!weedKilled && random.nextInt(5 - getType(world, x, y, z).ordinal()) == 0 && world.getBlock(x, y + 1, z) == Blocks.air) { world.setBlock(x, y + 1, z, Botany.plant, BlockPlant.Type.Weeds.ordinal(), 2); } @@ -195,8 +197,8 @@ public class BlockSoil extends Block implements IBlockSoil { } @Override - public boolean canSustainPlant( - IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { + public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, + IPlantable plantable) { Block plant = plantable.getPlant(world, x, y + 1, z); if (plant == Botany.flower) { return true; diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 91c5b54f..c383e527 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -1,5 +1,18 @@ package binnie.botany.gardening; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; @@ -9,21 +22,12 @@ import binnie.botany.api.gardening.IBlockSoil; import binnie.botany.flower.TileEntityFlower; import binnie.botany.items.BotanyItems; import binnie.core.BinnieCore; + import com.mojang.authlib.GameProfile; import forestry.api.core.EnumTemperature; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public class Gardening { + public static Map fertiliserAcid = new LinkedHashMap<>(); public static Map fertiliserAlkaline = new LinkedHashMap<>(); public static Map fertiliserNutrient = new LinkedHashMap<>(); @@ -81,8 +85,10 @@ public class Gardening { public static float getBiomeMoisture(BiomeGenBase biome, int H) { double R = biome.rainfall; double T = biome.temperature; - double m = - 3.2 * (R - 0.5) - 0.4 * (1.0 + T + 0.5 * T * T) + 1.1 - 1.6 * (T - 0.9) * (T - 0.9) - 0.002 * (H - 64); + double m = 3.2 * (R - 0.5) - 0.4 * (1.0 + T + 0.5 * T * T) + + 1.1 + - 1.6 * (T - 0.9) * (T - 0.9) + - 0.002 * (H - 64); if (m == 0.0) { return (float) m; } @@ -95,14 +101,13 @@ public class Gardening { public static float getBiomePH(BiomeGenBase biome, int H) { double R = biome.rainfall; double T = biome.temperature; - return (float) (-3.0 * (R - 0.5) - + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071) + return (float) (-3.0 * (R - 0.5) + 0.5 * (T - 0.699999988079071) * (T - 0.699999988079071) + 0.02f * (H - 64) - 0.15000000596046448); } - public static void createSoil( - World world, int x, int y, int z, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity) { + public static void createSoil(World world, int x, int y, int z, EnumSoilType soil, EnumMoisture moisture, + EnumAcidity acidity) { int meta = moisture.ordinal() + acidity.ordinal() * 3; world.setBlock(x, y, z, getSoilBlock(soil), meta, 2); } @@ -139,8 +144,7 @@ public class Gardening { IFlower iflower = ((TileEntityFlower) flower).getFlower(); int section = ((TileEntityFlower) flower).getSection(); - if (iflower == null - || section >= iflower.getGenome().getPrimary().getType().getSections() - 1 + if (iflower == null || section >= iflower.getGenome().getPrimary().getType().getSections() - 1 || iflower.getAge() <= 0) { return; } @@ -257,8 +261,7 @@ public class Gardening { } public static boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) { - return flower.getGenome().canTolerate(ePH) - && flower.getGenome().canTolerate(eMoisture) + return flower.getGenome().canTolerate(ePH) && flower.getGenome().canTolerate(eMoisture) && flower.getGenome().canTolerate(eTemp); } diff --git a/src/main/java/binnie/botany/gardening/ItemSoil.java b/src/main/java/binnie/botany/gardening/ItemSoil.java index 4088eb87..a2f11d93 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoil.java +++ b/src/main/java/binnie/botany/gardening/ItemSoil.java @@ -1,20 +1,23 @@ package binnie.botany.gardening; +import java.util.List; +import java.util.Locale; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; -import java.util.Locale; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class ItemSoil extends ItemBlock { + protected EnumSoilType type; private boolean noWeed; diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index d6ead555..5173969e 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -1,5 +1,15 @@ package binnie.botany.gardening; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; @@ -11,17 +21,9 @@ import binnie.core.util.I18N; import binnie.genetics.genetics.AlleleHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; public class ItemSoilMeter extends Item { + public ItemSoilMeter() { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName("soilMeter"); @@ -29,17 +31,8 @@ public class ItemSoilMeter extends Item { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float blockX, - float blockY, - float blockZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float blockX, float blockY, float blockZ) { Block block = world.getBlock(x, y, z); if (!Gardening.isSoil(block)) { y--; @@ -52,21 +45,18 @@ public class ItemSoilMeter extends Item { EnumMoisture moisture = soil.getMoisture(world, x, y, z); EnumAcidity pH = soil.getPH(world, x, y, z); - EnumChatFormatting[] colors = new EnumChatFormatting[] { - EnumChatFormatting.DARK_GRAY, EnumChatFormatting.GOLD, EnumChatFormatting.LIGHT_PURPLE, - }; + EnumChatFormatting[] colors = new EnumChatFormatting[] { EnumChatFormatting.DARK_GRAY, + EnumChatFormatting.GOLD, EnumChatFormatting.LIGHT_PURPLE, }; String info = I18N.localise("botany.soil.tooltip.type") + " "; info += colors[type.ordinal()] + AlleleHelper.toDisplay(type) + EnumChatFormatting.RESET; - colors = new EnumChatFormatting[] { - EnumChatFormatting.YELLOW, EnumChatFormatting.GRAY, EnumChatFormatting.BLUE, - }; + colors = new EnumChatFormatting[] { EnumChatFormatting.YELLOW, EnumChatFormatting.GRAY, + EnumChatFormatting.BLUE, }; info += ", " + I18N.localise("botany.soil.tooltip.moisture") + " "; info += colors[moisture.ordinal()] + AlleleHelper.toDisplay(moisture) + EnumChatFormatting.RESET; - colors = new EnumChatFormatting[] { - EnumChatFormatting.RED, EnumChatFormatting.GREEN, EnumChatFormatting.AQUA, - }; + colors = new EnumChatFormatting[] { EnumChatFormatting.RED, EnumChatFormatting.GREEN, + EnumChatFormatting.AQUA, }; info += ", " + I18N.localise("botany.soil.tooltip.pH") + " "; info += colors[pH.ordinal()] + AlleleHelper.toDisplay(pH) + EnumChatFormatting.RESET; IChatComponent chat = new ChatComponentText(info); diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 466edcb6..5a2408c1 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -1,12 +1,5 @@ package binnie.botany.gardening; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +8,16 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemTrowel extends Item { + protected Item.ToolMaterial theToolMaterial; String locName; @@ -35,17 +37,8 @@ public class ItemTrowel extends Item { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float blockX, - float blockY, - float blockZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float blockX, float blockY, float blockZ) { if (!player.canPlayerEdit(x, y, z, side, stack)) { return false; } diff --git a/src/main/java/binnie/botany/gardening/ItemWeed.java b/src/main/java/binnie/botany/gardening/ItemWeed.java index 04c5c594..0e059260 100644 --- a/src/main/java/binnie/botany/gardening/ItemWeed.java +++ b/src/main/java/binnie/botany/gardening/ItemWeed.java @@ -1,13 +1,15 @@ package binnie.botany.gardening; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemWeed extends ItemBlock { + public ItemWeed(Block block) { super(block); setHasSubtypes(true); diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 09aaa045..55bf7a3c 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -1,5 +1,17 @@ package binnie.botany.gardening; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; @@ -26,18 +38,9 @@ import binnie.core.block.ItemMetadataRenderer; import binnie.core.block.MultipassItemRenderer; import binnie.core.block.TileEntityMetadata; import cpw.mods.fml.common.registry.GameRegistry; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleGardening implements IInitializable { + public static HashMap queuedAcidFertilisers = new HashMap<>(); public static HashMap queuedAlkalineFertilisers = new HashMap<>(); public static HashMap queuedNutrientFertilisers = new HashMap<>(); @@ -86,13 +89,13 @@ public class ModuleGardening implements IInitializable { Botany.ceramicTile = new BlockCeramicPatterned(); GameRegistry.registerBlock(Botany.ceramicTile, ItemMetadata.class, "ceramicPattern"); - BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); + BinnieCore.proxy + .registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicTile), new MultipassItemRenderer()); Botany.ceramicBrick = new BlockCeramicBrick(); GameRegistry.registerBlock(Botany.ceramicBrick, ItemMetadata.class, "ceramicBrick"); - BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); + BinnieCore.proxy + .registerCustomItemRenderer(Item.getItemFromBlock(Botany.ceramicBrick), new MultipassItemRenderer()); } @Override @@ -104,11 +107,11 @@ public class ModuleGardening implements IInitializable { ItemStack red = new ItemStack(Blocks.red_flower, 1); ItemStack blue = new ItemStack(Blocks.red_flower, 1, 7); - for (boolean manual : new boolean[] {true, false}) { - for (boolean fertilised : new boolean[] {true, false}) { + for (boolean manual : new boolean[] { true, false }) { + for (boolean fertilised : new boolean[] { true, false }) { for (EnumMoisture moist : EnumMoisture.values()) { - ItemStack icon = - (moist == EnumMoisture.DRY) ? yellow : ((moist == EnumMoisture.NORMAL) ? red : blue); + ItemStack icon = (moist == EnumMoisture.DRY) ? yellow + : ((moist == EnumMoisture.NORMAL) ? red : blue); int insulate = 2 - moist.ordinal(); if (fertilised) { insulate += 3; @@ -159,36 +162,48 @@ public class ModuleGardening implements IInitializable { } GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.dirt), new ItemStack(Botany.soil, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(Blocks.dirt), + new ItemStack(Botany.soil, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.dirt), new ItemStack(Botany.loam, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(Blocks.dirt), + new ItemStack(Botany.loam, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbed, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(Blocks.dirt), + new ItemStack(Botany.flowerbed, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.dirt), new ItemStack(Botany.soilNoWeed, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(Blocks.dirt), + new ItemStack(Botany.soilNoWeed, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.dirt), new ItemStack(Botany.loamNoWeed, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(Blocks.dirt), + new ItemStack(Botany.loamNoWeed, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addShapelessRecipe( - new ItemStack(Blocks.dirt), new ItemStack(Botany.flowerbedNoWeed, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(Blocks.dirt), + new ItemStack(Botany.flowerbedNoWeed, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe( - Botany.trowelWood, - new Object[] {"d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood"})); - GameRegistry.addRecipe(new ShapedOreRecipe( - Botany.trowelStone, - new Object[] {"d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone"})); - GameRegistry.addRecipe(new ShapedOreRecipe( - Botany.trowelIron, - new Object[] {"d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron"})); - GameRegistry.addRecipe(new ShapedOreRecipe( - Botany.trowelGold, - new Object[] {"d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold"})); - GameRegistry.addRecipe(new ShapedOreRecipe( - Botany.trowelDiamond, - new Object[] {"d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond"})); - GameRegistry.addRecipe(new ShapedOreRecipe( - Botany.soilMeter, - new Object[] {" gg", " rg", "i ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron"})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Botany.trowelWood, + new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "plankWood" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Botany.trowelStone, + new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "cobblestone" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Botany.trowelIron, + new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotIron" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Botany.trowelGold, + new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "ingotGold" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Botany.trowelDiamond, + new Object[] { "d ", " x ", " s", 'd', Blocks.dirt, 's', "stickWood", 'x', "gemDiamond" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Botany.soilMeter, + new Object[] { " gg", " rg", "i ", 'g', "ingotGold", 'r', "dustRedstone", 'i', "ingotIron" })); GameRegistry.addShapelessRecipe( BotanyItems.Weedkiller.get(4), new ItemStack(Items.spider_eye), @@ -201,11 +216,13 @@ public class ModuleGardening implements IInitializable { GameRegistry.addShapelessRecipe(BotanyItems.CompostPowder.get(4), Mods.forestry.stack("fertilizerBio")); GameRegistry.addShapelessRecipe(BotanyItems.FertiliserPowder.get(4), Mods.forestry.stack("fertilizerCompound")); GameRegistry.addShapelessRecipe(BotanyItems.PulpPowder.get(4), Mods.forestry.stack("woodPulp")); - GameRegistry.addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), new Object[] {"dustSulphur"})); + GameRegistry + .addRecipe(new ShapelessOreRecipe(BotanyItems.SulphurPowder.get(4), new Object[] { "dustSulphur" })); - GameRegistry.addRecipe(new ShapelessOreRecipe( - new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()), - new Object[] {"pigment", "pigment", "dyeBlack"})); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + new ItemStack(Botany.pigment, 2, EnumFlowerColor.BLACK.ordinal()), + new Object[] { "pigment", "pigment", "dyeBlack" })); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.SulphurPowder.get(1), 1); ModuleGardening.queuedAcidFertilisers.put(BotanyItems.MulchPowder.get(1), 1); @@ -221,10 +238,10 @@ public class ModuleGardening implements IInitializable { ModuleGardening.queuedAlkalineFertilisers.put(new ItemStack(GameRegistry.findItem("Forestry", "woodPulp")), 2); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.CompostPowder.get(1), 1); ModuleGardening.queuedNutrientFertilisers.put(BotanyItems.FertiliserPowder.get(1), 1); - ModuleGardening.queuedNutrientFertilisers.put( - new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2); - ModuleGardening.queuedNutrientFertilisers.put( - new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2); + ModuleGardening.queuedNutrientFertilisers + .put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerBio")), 2); + ModuleGardening.queuedNutrientFertilisers + .put(new ItemStack(GameRegistry.findItem("Forestry", "fertilizerCompound")), 2); for (Map.Entry entry : ModuleGardening.queuedAcidFertilisers.entrySet()) { addAcidFertiliser(entry.getKey(), entry.getValue()); @@ -238,8 +255,8 @@ public class ModuleGardening implements IInitializable { addNutrientFertiliser(entry.getKey(), entry.getValue()); } - GameRegistry.addRecipe( - BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); + GameRegistry + .addRecipe(BotanyItems.Mortar.get(6), " c ", "cgc", " c ", 'c', Items.clay_ball, 'g', Blocks.gravel); for (EnumFlowerColor c : EnumFlowerColor.values()) { ItemStack clay = new ItemStack(Botany.clay, 1, c.ordinal()); diff --git a/src/main/java/binnie/botany/genetics/AlleleColor.java b/src/main/java/binnie/botany/genetics/AlleleColor.java index 0fc2dae7..891a028a 100644 --- a/src/main/java/binnie/botany/genetics/AlleleColor.java +++ b/src/main/java/binnie/botany/genetics/AlleleColor.java @@ -3,6 +3,7 @@ package binnie.botany.genetics; import forestry.api.genetics.IAlleleInteger; public class AlleleColor implements IAlleleInteger { + private String uid; private int value; private EnumFlowerColor color; diff --git a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java index af97b305..798d1575 100644 --- a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java +++ b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java @@ -1,12 +1,14 @@ package binnie.botany.genetics; +import net.minecraft.world.World; + import binnie.botany.api.IAlleleFlowerEffect; import binnie.botany.api.IFlowerGenome; import binnie.core.util.I18N; import forestry.api.genetics.IEffectData; -import net.minecraft.world.World; public class AlleleEffectNone implements IAlleleFlowerEffect { + @Override public boolean isCombinable() { return true; diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index 81384f6d..93e5a595 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -1,13 +1,15 @@ package binnie.botany.genetics; +import net.minecraft.entity.player.EntityPlayer; + import binnie.Binnie; import binnie.botany.api.IBotanistTracker; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; -import net.minecraft.entity.player.EntityPlayer; public class BotanistTracker extends BreedingTracker implements IBotanistTracker { + public BotanistTracker(String s) { super(s); } diff --git a/src/main/java/binnie/botany/genetics/ColorMix.java b/src/main/java/binnie/botany/genetics/ColorMix.java index 1dc8f359..a60bba62 100644 --- a/src/main/java/binnie/botany/genetics/ColorMix.java +++ b/src/main/java/binnie/botany/genetics/ColorMix.java @@ -4,6 +4,7 @@ import binnie.botany.api.IColourMix; import binnie.botany.api.IFlowerColor; public class ColorMix implements IColourMix { + protected IFlowerColor color1; protected IFlowerColor color2; protected IFlowerColor result; diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java index 676dc715..dc8b1b74 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerColor.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerColor.java @@ -1,13 +1,16 @@ package binnie.botany.genetics; +import java.util.Locale; + +import org.apache.commons.lang3.StringUtils; + import binnie.botany.api.IFlowerColor; import binnie.botany.core.BotanyCore; import binnie.core.util.I18N; import forestry.api.genetics.IAlleleInteger; -import java.util.Locale; -import org.apache.commons.lang3.StringUtils; public enum EnumFlowerColor implements IFlowerColor { + AQUAMARINE("aquamarine", 0x7fffd4), BLACK("black", 0x282828), BLUE("blue", 0x0000ff), diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/src/main/java/binnie/botany/genetics/EnumFlowerType.java index bb6c3268..7dff32e5 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -1,12 +1,14 @@ package binnie.botany.genetics; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IFlowerType; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public enum EnumFlowerType implements IFlowerType { + DANDELION, POPPY, ORCHID, diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index 273a4273..7a69500f 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -1,5 +1,11 @@ package binnie.botany.genetics; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; + import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IColourMix; @@ -15,12 +21,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; import forestry.core.genetics.Chromosome; import forestry.core.genetics.Individual; -import java.util.List; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; public class Flower extends Individual implements IFlower { + public IFlowerGenome genome; public IFlowerGenome mate; @@ -56,23 +59,24 @@ public class Flower extends Individual implements IFlower { IAlleleFlowerSpecies primary = genome.getPrimary(); IAlleleFlowerSpecies secondary = genome.getSecondary(); if (!isPureBred(EnumFlowerChromosome.SPECIES)) { - list.add(EnumChatFormatting.BLUE - + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName())); + list.add( + EnumChatFormatting.BLUE + + I18N.localise("botany.item.tooltip.hybrid", primary.getName(), secondary.getName())); } list.add(EnumChatFormatting.GRAY + I18N.localise("botany.item.tooltip.age", getAge())); - list.add(EnumChatFormatting.GREEN - + I18N.localise( + list.add( + EnumChatFormatting.GREEN + I18N.localise( "botany.item.tooltip.temperature", AlleleHelper.toDisplay(primary.getTemperature()), AlleleHelper.toDisplay(genome.getToleranceTemperature()))); - list.add(EnumChatFormatting.GREEN - + I18N.localise( + list.add( + EnumChatFormatting.GREEN + I18N.localise( "botany.item.tooltip.moisture", AlleleHelper.toDisplay(primary.getMoisture()), AlleleHelper.toDisplay(genome.getToleranceMoisture()))); - list.add(EnumChatFormatting.GREEN - + I18N.localise( + list.add( + EnumChatFormatting.GREEN + I18N.localise( "botany.item.tooltip.pH", AlleleHelper.toDisplay(primary.getHumidity()), AlleleHelper.toDisplay(genome.getTolerancePH()))); @@ -88,8 +92,7 @@ public class Flower extends Individual implements IFlower { public void readFromNBT(NBTTagCompound nbttagcompound) { super.readFromNBT(nbttagcompound); if (nbttagcompound == null) { - genome = BotanyCore.getFlowerRoot() - .templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate()); + genome = BotanyCore.getFlowerRoot().templateAsGenome(BotanyCore.getFlowerRoot().getDefaultTemplate()); return; } @@ -235,8 +238,7 @@ public class Flower extends Individual implements IFlower { if (colour1 != colour2) { for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) { if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) { - parent1[EnumFlowerChromosome.PRIMARY.ordinal()] = - new Chromosome(mutation.getResult().getAllele()); + parent1[EnumFlowerChromosome.PRIMARY.ordinal()] = new Chromosome(mutation.getResult().getAllele()); } } } @@ -246,8 +248,8 @@ public class Flower extends Individual implements IFlower { if (colour1 != colour2) { for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) { if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) { - parent1[EnumFlowerChromosome.SECONDARY.ordinal()] = - new Chromosome(mutation.getResult().getAllele()); + parent1[EnumFlowerChromosome.SECONDARY.ordinal()] = new Chromosome( + mutation.getResult().getAllele()); } } } @@ -257,8 +259,7 @@ public class Flower extends Individual implements IFlower { if (colour1 != colour2) { for (IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) { if (mutation.isMutation(colour1, colour2) && world.rand.nextFloat() * 100.0f < mutation.getChance()) { - parent1[EnumFlowerChromosome.STEM.ordinal()] = - new Chromosome(mutation.getResult().getAllele()); + parent1[EnumFlowerChromosome.STEM.ordinal()] = new Chromosome(mutation.getResult().getAllele()); } } } diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index 39e60b36..ffd01eda 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -1,5 +1,7 @@ package binnie.botany.genetics; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; @@ -16,9 +18,9 @@ import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosome; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.Genome; -import net.minecraft.nbt.NBTTagCompound; public class FlowerGenome extends Genome implements IFlowerGenome { + public FlowerGenome(NBTTagCompound nbttagcompound) { super(nbttagcompound); } diff --git a/src/main/java/binnie/botany/genetics/FlowerHelper.java b/src/main/java/binnie/botany/genetics/FlowerHelper.java index efcc3299..1fbab142 100644 --- a/src/main/java/binnie/botany/genetics/FlowerHelper.java +++ b/src/main/java/binnie/botany/genetics/FlowerHelper.java @@ -1,5 +1,17 @@ package binnie.botany.genetics; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -10,7 +22,9 @@ import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerMutation; import binnie.botany.api.IFlowerRoot; + import com.mojang.authlib.GameProfile; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; @@ -18,18 +32,9 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesType; import forestry.core.genetics.SpeciesRoot; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Random; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { + public static int flowerSpeciesCount = -1; public static ArrayList flowerTemplates = new ArrayList<>(); @@ -53,8 +58,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { public int getSpeciesCount() { if (FlowerHelper.flowerSpeciesCount < 0) { FlowerHelper.flowerSpeciesCount = 0; - for (Map.Entry entry : - AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) { + for (Map.Entry entry : AlleleManager.alleleRegistry.getRegisteredAlleles().entrySet()) { if (entry.getValue() instanceof IAlleleFlowerSpecies && ((IAlleleFlowerSpecies) entry.getValue()).isCounted()) { FlowerHelper.flowerSpeciesCount++; @@ -185,9 +189,7 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { @Override public IAllele[] getRandomTemplate(Random rand) { - return speciesTemplates.values() - .toArray(new IAllele[0][])[ - rand.nextInt(speciesTemplates.values().size())]; + return speciesTemplates.values().toArray(new IAllele[0][])[rand.nextInt(speciesTemplates.values().size())]; } @Override @@ -201,10 +203,8 @@ public class FlowerHelper extends SpeciesRoot implements IFlowerRoot { @Override public void registerMutation(IMutation mutation) { if (AlleleManager.alleleRegistry.isBlacklisted(mutation.getTemplate()[0].getUID()) - || AlleleManager.alleleRegistry.isBlacklisted( - mutation.getAllele0().getUID()) - || AlleleManager.alleleRegistry.isBlacklisted( - mutation.getAllele1().getUID())) { + || AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele0().getUID()) + || AlleleManager.alleleRegistry.isBlacklisted(mutation.getAllele1().getUID())) { return; } FlowerHelper.flowerMutations.add((IFlowerMutation) mutation); diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index 33e37059..2752b307 100644 --- a/src/main/java/binnie/botany/genetics/FlowerMutation.java +++ b/src/main/java/binnie/botany/genetics/FlowerMutation.java @@ -1,15 +1,17 @@ package binnie.botany.genetics; +import java.util.ArrayList; +import java.util.Collection; + import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IFlowerMutation; import binnie.botany.core.BotanyCore; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.Collection; public class FlowerMutation implements IFlowerMutation { + protected IAlleleFlowerSpecies allele0; protected IAlleleFlowerSpecies allele1; protected IAllele[] template; @@ -62,12 +64,10 @@ public class FlowerMutation implements IFlowerMutation { if (allele0 == null || allele1 == null) { return 0.0f; } - if (this.allele0.getUID().equals(allele0.getUID()) - && this.allele1.getUID().equals(allele1.getUID())) { + if (this.allele0.getUID().equals(allele0.getUID()) && this.allele1.getUID().equals(allele1.getUID())) { return getBaseChance(); } - if (this.allele1.getUID().equals(allele0.getUID()) - && this.allele0.getUID().equals(allele1.getUID())) { + if (this.allele1.getUID().equals(allele0.getUID()) && this.allele0.getUID().equals(allele1.getUID())) { return getBaseChance(); } return 0.0f; diff --git a/src/main/java/binnie/botany/genetics/FlowerSpecies.java b/src/main/java/binnie/botany/genetics/FlowerSpecies.java index 0920d0bd..590bd596 100644 --- a/src/main/java/binnie/botany/genetics/FlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/FlowerSpecies.java @@ -1,5 +1,12 @@ package binnie.botany.genetics; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumMoisture; @@ -9,7 +16,9 @@ import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; import binnie.core.util.I18N; import binnie.genetics.genetics.AlleleHelper; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.EnumHumidity; @@ -22,13 +31,9 @@ import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.alleles.EnumAllele; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public enum FlowerSpecies implements IAlleleFlowerSpecies { + DANDELION("dandelion", "taraxacum", "officinale", EnumFlowerType.DANDELION, EnumFlowerColor.YELLOW), POPPY("poppy", "papaver", "rhoeas", EnumFlowerType.POPPY, EnumFlowerColor.RED), ORCHID("orchid", "vanda", "coerulea", EnumFlowerType.ORCHID, EnumFlowerColor.DEEP_SKY_BLUE), @@ -41,123 +46,53 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { IRIS("iris", "iris", "germanica", EnumFlowerType.IRIS, EnumFlowerColor.LIGHT_GRAY, EnumFlowerColor.PURPLE), LAVENDER("lavender", "Lavandula", "angustifolia", EnumFlowerType.LAVENDER, EnumFlowerColor.MEDIUM_ORCHID), VIOLA("viola", "viola", "odorata", EnumFlowerType.VIOLA, EnumFlowerColor.MEDIUM_PURPLE, EnumFlowerColor.SLATE_BLUE), - DAFFODIL( - "daffodil", - "narcissus", - "pseudonarcissus", - EnumFlowerType.DAFFODIL, - EnumFlowerColor.YELLOW, + DAFFODIL("daffodil", "narcissus", "pseudonarcissus", EnumFlowerType.DAFFODIL, EnumFlowerColor.YELLOW, EnumFlowerColor.GOLD), - DAHLIA( - "dahlia", - "dahlia", - "variabilis", - EnumFlowerType.DAHLIA, - EnumFlowerColor.HOT_PINK, + DAHLIA("dahlia", "dahlia", "variabilis", EnumFlowerType.DAHLIA, EnumFlowerColor.HOT_PINK, EnumFlowerColor.DEEP_PINK), PEONY("peony", "paeonia", "suffruticosa", EnumFlowerType.PEONY, EnumFlowerColor.THISTLE), ROSE("rose", "rosa", "rubiginosa", EnumFlowerType.ROSE, EnumFlowerColor.RED), LILAC("lilac", "syringa", "vulgaris", EnumFlowerType.LILAC, EnumFlowerColor.PLUM), HYDRANGEA("hydrangea", "hydrangea", "macrophylla", EnumFlowerType.HYDRANGEA, EnumFlowerColor.DEEP_SKY_BLUE), FOXGLOVE("foxglove", "digitalis", "purpurea", EnumFlowerType.FOXGLOVE, EnumFlowerColor.HOT_PINK), - ZINNIA( - "zinnia", - "zinnia", - "elegans", - EnumFlowerType.ZINNIA, - EnumFlowerColor.MEDIUM_VIOLET_RED, + ZINNIA("zinnia", "zinnia", "elegans", EnumFlowerType.ZINNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, EnumFlowerColor.YELLOW), - CHRYSANTHEMUM( - "chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, EnumFlowerColor.VIOLET), - MARIGOLD( - "marigold", - "calendula", - "officinalis", - EnumFlowerType.MARIGOLD, - EnumFlowerColor.GOLD, + CHRYSANTHEMUM("chrysanthemum", "chrysanthemum", "\u00ef?? grandiflorum", EnumFlowerType.MUMS, + EnumFlowerColor.VIOLET), + MARIGOLD("marigold", "calendula", "officinalis", EnumFlowerType.MARIGOLD, EnumFlowerColor.GOLD, EnumFlowerColor.DARK_ORANGE), GERANIUM("geranium", "geranium", "maderense", EnumFlowerType.GERANIUM, EnumFlowerColor.DEEP_PINK), AZALEA("azalea", "rhododendrons", "aurigeranum", EnumFlowerType.AZALEA, EnumFlowerColor.HOT_PINK), PRIMROSE("primrose", "primula", "vulgaris", EnumFlowerType.PRIMROSE, EnumFlowerColor.RED, EnumFlowerColor.GOLD), ASTER("aster", "aster", "amellus", EnumFlowerType.ASTER, EnumFlowerColor.MEDIUM_PURPLE, EnumFlowerColor.GOLDENROD), - CARNATION( - "carnation", - "dianthus", - "caryophyllus", - EnumFlowerType.CARNATION, - EnumFlowerColor.CRIMSON, + CARNATION("carnation", "dianthus", "caryophyllus", EnumFlowerType.CARNATION, EnumFlowerColor.CRIMSON, EnumFlowerColor.WHITE), LILY("lily", "lilium", "auratum", EnumFlowerType.LILY, EnumFlowerColor.PINK, EnumFlowerColor.GOLD), YARROW("yarrow", "achillea", "millefolium", EnumFlowerType.YARROW, EnumFlowerColor.YELLOW), - PETUNIA( - "petunia", - "petunia", - "\u00ef?? atkinsiana", - EnumFlowerType.PETUNIA, - EnumFlowerColor.MEDIUM_VIOLET_RED, + PETUNIA("petunia", "petunia", "\u00ef?? atkinsiana", EnumFlowerType.PETUNIA, EnumFlowerColor.MEDIUM_VIOLET_RED, EnumFlowerColor.THISTLE), AGAPANTHUS("agapanthus", "agapanthus", "praecox", EnumFlowerType.AGAPANTHUS, EnumFlowerColor.DEEP_SKY_BLUE), - FUCHSIA( - "fuchsia", - "fuchsia", - "magellanica", - EnumFlowerType.FUCHSIA, - EnumFlowerColor.DEEP_PINK, + FUCHSIA("fuchsia", "fuchsia", "magellanica", EnumFlowerType.FUCHSIA, EnumFlowerColor.DEEP_PINK, EnumFlowerColor.MEDIUM_ORCHID), - DIANTHUS( - "dianthus", - "dianthus", - "barbatus", - EnumFlowerType.DIANTHUS, - EnumFlowerColor.CRIMSON, + DIANTHUS("dianthus", "dianthus", "barbatus", EnumFlowerType.DIANTHUS, EnumFlowerColor.CRIMSON, EnumFlowerColor.HOT_PINK), FORGET("forget-me-nots", "myosotis", "arvensis", EnumFlowerType.FORGET, EnumFlowerColor.LIGHT_STEEL_BLUE), ANEMONE("anemone", "anemone", "coronaria", EnumFlowerType.ANEMONE, EnumFlowerColor.RED, EnumFlowerColor.MISTY_ROSE), - AQUILEGIA( - "aquilegia", - "aquilegia", - "vulgaris", - EnumFlowerType.AQUILEGIA, - EnumFlowerColor.SLATE_BLUE, + AQUILEGIA("aquilegia", "aquilegia", "vulgaris", EnumFlowerType.AQUILEGIA, EnumFlowerColor.SLATE_BLUE, EnumFlowerColor.THISTLE), - EDELWEISS( - "edelweiss", - "leontopodium", - "alpinum", - EnumFlowerType.EDELWEISS, - EnumFlowerColor.WHITE, + EDELWEISS("edelweiss", "leontopodium", "alpinum", EnumFlowerType.EDELWEISS, EnumFlowerColor.WHITE, EnumFlowerColor.KHAKI), SCABIOUS("scabious", "scabiosa", "columbaria", EnumFlowerType.SCABIOUS, EnumFlowerColor.ROYAL_BLUE), - CONEFLOWER( - "coneflower", - "echinacea", - "purpurea", - EnumFlowerType.CONEFLOWER, - EnumFlowerColor.VIOLET, + CONEFLOWER("coneflower", "echinacea", "purpurea", EnumFlowerType.CONEFLOWER, EnumFlowerColor.VIOLET, EnumFlowerColor.DARK_ORANGE), - GAILLARDIA( - "gaillardia", - "gaillardia", - "aristata", - EnumFlowerType.GAILLARDIA, - EnumFlowerColor.DARK_ORANGE, + GAILLARDIA("gaillardia", "gaillardia", "aristata", EnumFlowerType.GAILLARDIA, EnumFlowerColor.DARK_ORANGE, EnumFlowerColor.YELLOW), AURICULA("auricula", "primula", "auricula", EnumFlowerType.AURICULA, EnumFlowerColor.RED, EnumFlowerColor.YELLOW), CAMELLIA("camellia", "camellia", "japonica", EnumFlowerType.CAMELLIA, EnumFlowerColor.CRIMSON), GOLDENROD("goldenrod", "solidago", "canadensis", EnumFlowerType.GOLDENROD, EnumFlowerColor.GOLD), - ALTHEA( - "althea", - "althaea", - "officinalis", - EnumFlowerType.ALTHEA, - EnumFlowerColor.THISTLE, + ALTHEA("althea", "althaea", "officinalis", EnumFlowerType.ALTHEA, EnumFlowerColor.THISTLE, EnumFlowerColor.MEDIUM_ORCHID), - PENSTEMON( - "penstemon", - "penstemon", - "digitalis", - EnumFlowerType.PENSTEMON, - EnumFlowerColor.MEDIUM_ORCHID, + PENSTEMON("penstemon", "penstemon", "digitalis", EnumFlowerType.PENSTEMON, EnumFlowerColor.MEDIUM_ORCHID, EnumFlowerColor.THISTLE), DELPHINIUM("delphinium", "delphinium", "staphisagria", EnumFlowerType.DELPHINIUM, EnumFlowerColor.DARK_SLATE_BLUE), HOLLYHOCK("hollyhock", "Alcea", "rosea", EnumFlowerType.HOLLYHOCK, EnumFlowerColor.BLACK, EnumFlowerColor.GOLD); @@ -185,12 +120,7 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { this(name, branch, binomial, type, colour, colour); } - FlowerSpecies( - String name, - String branch, - String binomial, - IFlowerType type, - EnumFlowerColor primaryColor, + FlowerSpecies(String name, String branch, String binomial, IFlowerType type, EnumFlowerColor primaryColor, EnumFlowerColor secondaryColor) { this.name = name; this.binomial = binomial; @@ -211,21 +141,16 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { public static void setupVariants() { FlowerSpecies.DANDELION .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOWER) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1) .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.POPPY .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.GREEN); - FlowerSpecies.ORCHID - .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1) + FlowerSpecies.ORCHID.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) + .setPH(EnumAcidity.ACID, EnumTolerance.NONE).setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1) .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.ALLIUM @@ -233,224 +158,175 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1) .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1); - FlowerSpecies.BLUET - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWER) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE) + FlowerSpecies.BLUET.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWER) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE) .setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.TULIP .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setMoisture(EnumMoisture.NORMAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.OLIVE_DRAB); - FlowerSpecies.DAISY - .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + FlowerSpecies.DAISY.setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.CORNFLOWER .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.TULIP, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.PANSY .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE) - .setMutation(FlowerSpecies.TULIP, FlowerSpecies.VIOLA, 5) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) - .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.SEA_GREEN); + .setMutation(FlowerSpecies.TULIP, FlowerSpecies.VIOLA, 5).setPH(EnumAcidity.ACID, EnumTolerance.NONE) + .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.SEA_GREEN); FlowerSpecies.IRIS .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE) - .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.VIOLA, 10) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) - .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.SEA_GREEN); + .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.VIOLA, 10).setPH(EnumAcidity.ACID, EnumTolerance.NONE) + .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.SEA_GREEN); FlowerSpecies.LAVENDER .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.VIOLA, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setTemperature(EnumTemperature.WARM, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.VIOLA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE) - .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.POPPY, 15) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.POPPY, 15).setPH(EnumAcidity.ACID, EnumTolerance.NONE) + .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.DAFFODIL .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.POPPY, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.ASTER .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER) .setMutation(FlowerSpecies.DAISY, FlowerSpecies.TULIP, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.LILAC .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.AVERAGE) - .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.OLIVE_DRAB); - FlowerSpecies.ROSE - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH) - .setPH(EnumAcidity.ACID, EnumTolerance.UP_1) - .setStemColor(EnumFlowerColor.GREEN); + FlowerSpecies.ROSE.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH) + .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN); - FlowerSpecies.PEONY - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE) - .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + FlowerSpecies.PEONY.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE) + .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.DARK_GREEN); FlowerSpecies.MARIGOLD .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.DAISY, FlowerSpecies.DANDELION, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.HYDRANGEA .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.PEONY, FlowerSpecies.BLUET, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE) .setStemColor(EnumFlowerColor.DARK_GREEN); FlowerSpecies.FOXGLOVE .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.LILAC, FlowerSpecies.ZINNIA, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.DARK_GREEN); FlowerSpecies.DAHLIA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.DAISY, FlowerSpecies.ALLIUM, 15) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.CHRYSANTHEMUM .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.GERANIUM, FlowerSpecies.ROSE, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); FlowerSpecies.CARNATION .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.DIANTHUS, FlowerSpecies.ROSE, 5) - .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.SEA_GREEN); + .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.SEA_GREEN); FlowerSpecies.ZINNIA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.DAHLIA, FlowerSpecies.MARIGOLD, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2) .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); FlowerSpecies.PRIMROSE .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.CHRYSANTHEMUM, FlowerSpecies.AURICULA, 5) - .setPH(EnumAcidity.ACID, EnumTolerance.UP_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.AZALEA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.GERANIUM, 5) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.ACID, EnumTolerance.NONE).setStemColor(EnumFlowerColor.GREEN); - FlowerSpecies.GERANIUM - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) + FlowerSpecies.GERANIUM.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.TULIP, FlowerSpecies.ORCHID, 15) .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1) .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); - FlowerSpecies.LILY - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) + FlowerSpecies.LILY.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.TULIP, FlowerSpecies.CHRYSANTHEMUM, 5) .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.GREEN); + .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.GREEN); - FlowerSpecies.YARROW - .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) + FlowerSpecies.YARROW.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.ORCHID, 10) - .setPH(EnumAcidity.ACID, EnumTolerance.UP_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.PETUNIA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTER, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.TULIP, FlowerSpecies.DAHLIA, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN); FlowerSpecies.AGAPANTHUS .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.GERANIUM, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1) .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.FUCHSIA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.FOXGLOVE, FlowerSpecies.DAHLIA, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.SEA_GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.SEA_GREEN); FlowerSpecies.DIANTHUS .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORT, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.TULIP, FlowerSpecies.POPPY, 15) .setPH(EnumAcidity.ALKALINE, EnumTolerance.DOWN_1) .setMoisture(EnumMoisture.NORMAL, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.FORGET .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORT, EnumAllele.Sappiness.LOWER) - .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.BLUET, 10) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) + .setMutation(FlowerSpecies.ORCHID, FlowerSpecies.BLUET, 10).setPH(EnumAcidity.ACID, EnumTolerance.NONE) .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1) - .setStemColor(EnumFlowerColor.GREEN); + .setTemperature(EnumTemperature.NORMAL, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN); - FlowerSpecies.ANEMONE - .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) + FlowerSpecies.ANEMONE.setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.AQUILEGIA, FlowerSpecies.ROSE, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.AQUILEGIA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.AVERAGE) .setMutation(FlowerSpecies.IRIS, FlowerSpecies.POPPY, 5) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) - .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); + .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); FlowerSpecies.EDELWEISS .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.LOWEST) @@ -464,34 +340,28 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.SHORTENED, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.ALLIUM, FlowerSpecies.CORNFLOWER, 5) .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.CONEFLOWER .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER) .setMutation(FlowerSpecies.TULIP, FlowerSpecies.CORNFLOWER, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.GAILLARDIA .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGHER) .setMutation(FlowerSpecies.DANDELION, FlowerSpecies.MARIGOLD, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setMoisture(EnumMoisture.DAMP, EnumTolerance.DOWN_1) + .setTemperature(EnumTemperature.NORMAL, EnumTolerance.BOTH_2).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.AURICULA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.POPPY, FlowerSpecies.GERANIUM, 10) - .setPH(EnumAcidity.ACID, EnumTolerance.UP_1) - .setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) + .setPH(EnumAcidity.ACID, EnumTolerance.UP_1).setMoisture(EnumMoisture.NORMAL, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); FlowerSpecies.CAMELLIA .setTraits(EnumAllele.Fertility.NORMAL, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGH) - .setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.ROSE, 5) - .setPH(EnumAcidity.ACID, EnumTolerance.NONE) + .setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.ROSE, 5).setPH(EnumAcidity.ACID, EnumTolerance.NONE) .setMoisture(EnumMoisture.DAMP, EnumTolerance.NONE) .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1) .setStemColor(EnumFlowerColor.DARK_OLIVE_GREEN); @@ -499,22 +369,18 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { FlowerSpecies.GOLDENROD .setTraits(EnumAllele.Fertility.HIGH, EnumAllele.Lifespan.NORMAL, EnumAllele.Sappiness.HIGHER) .setMutation(FlowerSpecies.LILAC, FlowerSpecies.MARIGOLD, 10) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.MEDIUM_SEA_GREEN); FlowerSpecies.ALTHEA .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.ELONGATED, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.HYDRANGEA, FlowerSpecies.IRIS, 5) .setPH(EnumAcidity.NEUTRAL, EnumTolerance.DOWN_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1) - .setStemColor(EnumFlowerColor.DARK_GREEN); + .setTemperature(EnumTemperature.WARM, EnumTolerance.BOTH_1).setStemColor(EnumFlowerColor.DARK_GREEN); - FlowerSpecies.PENSTEMON - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) + FlowerSpecies.PENSTEMON.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.LOW) .setMutation(FlowerSpecies.PEONY, FlowerSpecies.LILAC, 5) .setMoisture(EnumMoisture.DRY, EnumTolerance.UP_1) - .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1) - .setStemColor(EnumFlowerColor.OLIVE_DRAB); + .setTemperature(EnumTemperature.WARM, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.OLIVE_DRAB); FlowerSpecies.DELPHINIUM .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONGER, EnumAllele.Sappiness.LOW) @@ -523,11 +389,9 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { .setTemperature(EnumTemperature.NORMAL, EnumTolerance.DOWN_1) .setStemColor(EnumFlowerColor.DARK_SEA_GREEN); - FlowerSpecies.HOLLYHOCK - .setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH) + FlowerSpecies.HOLLYHOCK.setTraits(EnumAllele.Fertility.LOW, EnumAllele.Lifespan.LONG, EnumAllele.Sappiness.HIGH) .setMutation(FlowerSpecies.DELPHINIUM, FlowerSpecies.LAVENDER, 5) - .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1) - .setStemColor(EnumFlowerColor.GREEN); + .setPH(EnumAcidity.NEUTRAL, EnumTolerance.UP_1).setStemColor(EnumFlowerColor.GREEN); IFlowerRoot flowerRoot = BotanyCore.getFlowerRoot(); flowerRoot.addConversion(new ItemStack(Blocks.yellow_flower, 1, 0), FlowerSpecies.DANDELION.getTemplate()); @@ -541,11 +405,14 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 4), FlowerSpecies.ROSE.getTemplate()); flowerRoot.addConversion(new ItemStack(Blocks.double_plant, 1, 5), FlowerSpecies.PEONY.getTemplate()); flowerRoot.addConversion( - new ItemStack(Blocks.red_flower, 1, 6), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.WHITE)); + new ItemStack(Blocks.red_flower, 1, 6), + FlowerSpecies.TULIP.addVariant(EnumFlowerColor.WHITE)); flowerRoot.addConversion( - new ItemStack(Blocks.red_flower, 1, 4), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.CRIMSON)); + new ItemStack(Blocks.red_flower, 1, 4), + FlowerSpecies.TULIP.addVariant(EnumFlowerColor.CRIMSON)); flowerRoot.addConversion( - new ItemStack(Blocks.red_flower, 1, 5), FlowerSpecies.TULIP.addVariant(EnumFlowerColor.DARK_ORANGE)); + new ItemStack(Blocks.red_flower, 1, 5), + FlowerSpecies.TULIP.addVariant(EnumFlowerColor.DARK_ORANGE)); for (FlowerSpecies species : values()) { String scientific = species.branchName.substring(0, 1).toUpperCase() @@ -553,8 +420,8 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { String uid = "flowers." + species.branchName.toLowerCase(); IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); if (branch == null) { - branch = AlleleManager.alleleRegistry.createAndRegisterClassification( - IClassification.EnumClassLevel.GENUS, uid, scientific); + branch = AlleleManager.alleleRegistry + .createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } species.branch = branch; @@ -567,8 +434,8 @@ public enum FlowerSpecies implements IAlleleFlowerSpecies { return this; } - private FlowerSpecies setTraits( - EnumAllele.Fertility fertility, EnumAllele.Lifespan shortened, EnumAllele.Sappiness lower) { + private FlowerSpecies setTraits(EnumAllele.Fertility fertility, EnumAllele.Lifespan shortened, + EnumAllele.Sappiness lower) { fert = fertility; life = shortened; sap = lower; diff --git a/src/main/java/binnie/botany/genetics/FlowerTemplates.java b/src/main/java/binnie/botany/genetics/FlowerTemplates.java index 07d926ac..4caed2fb 100644 --- a/src/main/java/binnie/botany/genetics/FlowerTemplates.java +++ b/src/main/java/binnie/botany/genetics/FlowerTemplates.java @@ -7,6 +7,7 @@ import forestry.api.genetics.IAllele; import forestry.core.genetics.alleles.EnumAllele; public class FlowerTemplates { + public static IAllele[] getDefaultTemplate() { IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length]; alleles[EnumFlowerChromosome.SPECIES.ordinal()] = FlowerSpecies.POPPY; diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 4b69d207..8bba44b2 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -1,12 +1,7 @@ package binnie.botany.genetics; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.core.BotanyGUI; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.core.BotanyGUI; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemDictionary extends Item { + protected IIcon iconMaster; public ItemDictionary() { @@ -59,8 +62,7 @@ public class ItemDictionary extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) - ? I18N.localise("botany.item.database.0.name") + return (stack.getItemDamage() == 0) ? I18N.localise("botany.item.database.0.name") : I18N.localise("botany.item.database.1.name"); } } diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index f4420e02..c220169a 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -1,5 +1,9 @@ package binnie.botany.genetics; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.core.BotanyCore; @@ -17,11 +21,9 @@ import forestry.api.apiculture.FlowerManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ModuleGenetics implements IInitializable { + static AlleleEffectNone alleleEffectNone = new AlleleEffectNone(); @Override diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index 24a9e8ea..0d4fdb8d 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -1,14 +1,17 @@ package binnie.botany.items; -import binnie.botany.Botany; -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.botany.Botany; +import binnie.core.item.IItemMisc; +import binnie.core.util.I18N; + public enum BotanyItems implements IItemMisc { + AshPowder("powderAsh"), PulpPowder("powderPulp"), MulchPowder("powderMulch"), diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index 079de92d..525c1f49 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -1,12 +1,7 @@ package binnie.botany.items; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +9,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemClay extends Item { + public ItemClay() { setUnlocalizedName("clay"); setHasSubtypes(true); @@ -24,8 +27,7 @@ public class ItemClay extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); - tooltip.add(EnumChatFormatting.GRAY - + EnumFlowerColor.get(stack.getItemDamage()).getName()); + tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); } @Override diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index c860b652..8c46a219 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -1,12 +1,7 @@ package binnie.botany.items; -import binnie.botany.Botany; -import binnie.botany.CreativeTabBotany; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +9,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import binnie.botany.Botany; +import binnie.botany.CreativeTabBotany; +import binnie.botany.genetics.EnumFlowerColor; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemPigment extends Item { + public ItemPigment() { setUnlocalizedName("pigment"); setHasSubtypes(true); @@ -24,8 +27,7 @@ public class ItemPigment extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); - tooltip.add(EnumChatFormatting.GRAY - + EnumFlowerColor.get(stack.getItemDamage()).getName()); + tooltip.add(EnumChatFormatting.GRAY + EnumFlowerColor.get(stack.getItemDamage()).getName()); } @Override diff --git a/src/main/java/binnie/botany/network/MessageFlowerUpdate.java b/src/main/java/binnie/botany/network/MessageFlowerUpdate.java index 62337391..e1dd9de9 100644 --- a/src/main/java/binnie/botany/network/MessageFlowerUpdate.java +++ b/src/main/java/binnie/botany/network/MessageFlowerUpdate.java @@ -1,14 +1,16 @@ package binnie.botany.network; +import java.io.IOException; + import binnie.botany.flower.TileEntityFlower; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.genetics.EnumFlowerType; import binnie.core.network.packet.MessageBinnie; import binnie.core.network.packet.MessageCoordinates; import io.netty.buffer.ByteBuf; -import java.io.IOException; public class MessageFlowerUpdate extends MessageCoordinates { + public TileEntityFlower.RenderInfo render; public MessageFlowerUpdate(int posX, int posY, int posZ, TileEntityFlower.RenderInfo render) { diff --git a/src/main/java/binnie/botany/network/PacketID.java b/src/main/java/binnie/botany/network/PacketID.java index 17460563..acd0bcc7 100644 --- a/src/main/java/binnie/botany/network/PacketID.java +++ b/src/main/java/binnie/botany/network/PacketID.java @@ -1,5 +1,11 @@ package binnie.botany.network; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; + import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.flower.TileEntityFlower; import binnie.botany.genetics.EnumFlowerColor; @@ -10,13 +16,9 @@ import binnie.core.network.packet.MessageNBT; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import forestry.api.genetics.AlleleManager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; public enum PacketID implements IPacketID { + FieldKit, FlowerUpdate; @@ -45,10 +47,10 @@ public enum PacketID implements IPacketID { if (data.hasNoTags()) { info += "Flower has not been discovered by you. Breed this flower yourself to discover."; } else { - IAlleleFlowerSpecies primary = - (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species")); - IAlleleFlowerSpecies secondary = - (IAlleleFlowerSpecies) AlleleManager.alleleRegistry.getAllele(data.getString("Species2")); + IAlleleFlowerSpecies primary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry + .getAllele(data.getString("Species")); + IAlleleFlowerSpecies secondary = (IAlleleFlowerSpecies) AlleleManager.alleleRegistry + .getAllele(data.getString("Species2")); float age = data.getFloat("Age"); EnumFlowerColor color1 = EnumFlowerColor.get(data.getShort("Colour")); EnumFlowerColor color2 = EnumFlowerColor.get(data.getShort("Colour2")); diff --git a/src/main/java/binnie/botany/proxy/IBotanyProxy.java b/src/main/java/binnie/botany/proxy/IBotanyProxy.java index 30e0d89f..97b6e4ec 100644 --- a/src/main/java/binnie/botany/proxy/IBotanyProxy.java +++ b/src/main/java/binnie/botany/proxy/IBotanyProxy.java @@ -2,4 +2,5 @@ package binnie.botany.proxy; import binnie.core.proxy.IProxyCore; -public interface IBotanyProxy extends IProxyCore {} +public interface IBotanyProxy extends IProxyCore { +} diff --git a/src/main/java/binnie/botany/proxy/Proxy.java b/src/main/java/binnie/botany/proxy/Proxy.java index 6de8dd66..8a282414 100644 --- a/src/main/java/binnie/botany/proxy/Proxy.java +++ b/src/main/java/binnie/botany/proxy/Proxy.java @@ -4,6 +4,7 @@ import binnie.botany.Botany; import binnie.core.proxy.BinnieModProxy; public class Proxy extends BinnieModProxy implements IBotanyProxy { + public Proxy() { super(Botany.instance); } diff --git a/src/main/java/binnie/botany/proxy/ProxyClient.java b/src/main/java/binnie/botany/proxy/ProxyClient.java index fa2382c1..34fbba75 100644 --- a/src/main/java/binnie/botany/proxy/ProxyClient.java +++ b/src/main/java/binnie/botany/proxy/ProxyClient.java @@ -1,3 +1,4 @@ package binnie.botany.proxy; -public class ProxyClient extends Proxy implements IBotanyProxy {} +public class ProxyClient extends Proxy implements IBotanyProxy { +} diff --git a/src/main/java/binnie/botany/proxy/ProxyServer.java b/src/main/java/binnie/botany/proxy/ProxyServer.java index f4809475..6dc31b56 100644 --- a/src/main/java/binnie/botany/proxy/ProxyServer.java +++ b/src/main/java/binnie/botany/proxy/ProxyServer.java @@ -1,3 +1,4 @@ package binnie.botany.proxy; -public class ProxyServer extends Proxy implements IBotanyProxy {} +public class ProxyServer extends Proxy implements IBotanyProxy { +} diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index 43919073..f364c4e2 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,5 +1,13 @@ package binnie.core; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; + +import net.minecraftforge.common.MinecraftForge; + import binnie.Binnie; import binnie.core.gui.IBinnieGUID; import binnie.core.mod.parser.FieldParser; @@ -11,14 +19,9 @@ import binnie.core.proxy.IProxyCore; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import net.minecraftforge.common.MinecraftForge; public abstract class AbstractMod implements IPacketProvider, IInitializable { + private SimpleNetworkWrapper wrapper; private final LinkedHashSet fields; protected final List modules; diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 4aaece36..7637a55f 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,5 +1,14 @@ package binnie.core; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.client.event.TextureStitchEvent; + import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; @@ -38,13 +47,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.ForestryEvent; import forestry.plugins.PluginManager; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraftforge.client.event.TextureStitchEvent; @Mod( modid = "BinnieCore", @@ -53,6 +55,7 @@ import net.minecraftforge.client.event.TextureStitchEvent; useMetadata = true, dependencies = "after:Forestry@[4.2,),required-after:gtnhlib@[0.0.10,)") public class BinnieCore extends AbstractMod { + @Mod.Instance("BinnieCore") public static BinnieCore instance; @@ -171,8 +174,8 @@ public class BinnieCore extends AbstractMod { @SideOnly(Side.CLIENT) public void handleSpeciesDiscovered(ForestryEvent.SpeciesDiscovered event) { try { - EntityPlayerMP player = - MinecraftServer.getServer().getConfigurationManager().func_152612_a(event.username.getName()); + EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager() + .func_152612_a(event.username.getName()); if (player == null) { return; } @@ -215,7 +218,7 @@ public class BinnieCore extends AbstractMod { @Override public Class[] getConfigs() { - return new Class[] {ConfigurationMain.class}; + return new Class[] { ConfigurationMain.class }; } @Override @@ -229,6 +232,7 @@ public class BinnieCore extends AbstractMod { } public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { super(instance); } diff --git a/src/main/java/binnie/core/IInitializable.java b/src/main/java/binnie/core/IInitializable.java index 25d68268..03e7b013 100644 --- a/src/main/java/binnie/core/IInitializable.java +++ b/src/main/java/binnie/core/IInitializable.java @@ -1,6 +1,7 @@ package binnie.core; public interface IInitializable { + void preInit(); void init(); diff --git a/src/main/java/binnie/core/ManagerBase.java b/src/main/java/binnie/core/ManagerBase.java index 565c391f..9a598b9f 100644 --- a/src/main/java/binnie/core/ManagerBase.java +++ b/src/main/java/binnie/core/ManagerBase.java @@ -3,6 +3,7 @@ package binnie.core; import binnie.Binnie; public abstract class ManagerBase implements IInitializable { + public ManagerBase() { Binnie.Managers.add(this); } diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index 34f0ae79..22dae080 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -1,12 +1,14 @@ package binnie.core; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; + public class Mods { + public static Mod forestry; public static Mod ic2; public static Mod botania; @@ -42,6 +44,7 @@ public class Mods { } public static class Mod { + private String id; private Mod(String id) { diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 9ae5e110..cb46b44c 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -1,8 +1,8 @@ package binnie.core.block; -import binnie.core.BinnieCore; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -15,7 +15,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.BinnieCore; + public class BlockMetadata extends BlockContainer implements IBlockMetadata { + public BlockMetadata(Material material) { super(material); } @@ -73,8 +76,8 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { return blockMeta; } - public static ArrayList getBlockDropped( - IBlockMetadata block, World world, int x, int y, int z, int blockMeta) { + public static ArrayList getBlockDropped(IBlockMetadata block, World world, int x, int y, int z, + int blockMeta) { ArrayList array = new ArrayList<>(); TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); if (tile != null && !tile.hasDroppedBlock()) { @@ -93,8 +96,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { } boolean hasBeenBroken = world.setBlockToAir(i, j, k); - if (hasBeenBroken - && BinnieCore.proxy.isSimulating(world) + if (hasBeenBroken && BinnieCore.proxy.isSimulating(world) && drops.size() > 0 && (player == null || !player.capabilities.isCreativeMode)) { for (ItemStack drop : drops) { diff --git a/src/main/java/binnie/core/block/IBlockMetadata.java b/src/main/java/binnie/core/block/IBlockMetadata.java index f27f6d0c..fd983da2 100644 --- a/src/main/java/binnie/core/block/IBlockMetadata.java +++ b/src/main/java/binnie/core/block/IBlockMetadata.java @@ -1,12 +1,14 @@ package binnie.core.block; import java.util.List; + import net.minecraft.block.ITileEntityProvider; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public interface IBlockMetadata extends ITileEntityProvider { + int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection direction); int getDroppedMeta(int blockMeta, int tileMeta); diff --git a/src/main/java/binnie/core/block/IMultipassBlock.java b/src/main/java/binnie/core/block/IMultipassBlock.java index 20f86eeb..29b72524 100644 --- a/src/main/java/binnie/core/block/IMultipassBlock.java +++ b/src/main/java/binnie/core/block/IMultipassBlock.java @@ -1,6 +1,7 @@ package binnie.core.block; public interface IMultipassBlock { + int getNumberOfPasses(); int colorMultiplier(int meta); diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index 10bdf222..408643d4 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -1,8 +1,7 @@ package binnie.core.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -11,7 +10,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemMetadata extends ItemBlock { + public ItemMetadata(Block block) { super(block); } @@ -22,18 +25,8 @@ public class ItemMetadata extends ItemBlock { } @Override - public boolean placeBlockAt( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ, - int metadata) { + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ, int metadata) { Block block = field_150939_a; if (!(block instanceof IBlockMetadata)) { return false; diff --git a/src/main/java/binnie/core/block/ItemMetadataRenderer.java b/src/main/java/binnie/core/block/ItemMetadataRenderer.java index 424eb8a9..aeaaa464 100644 --- a/src/main/java/binnie/core/block/ItemMetadataRenderer.java +++ b/src/main/java/binnie/core/block/ItemMetadataRenderer.java @@ -5,20 +5,21 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; public class ItemMetadataRenderer implements IItemRenderer { + @Override public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) { - return type == IItemRenderer.ItemRenderType.INVENTORY - || type == IItemRenderer.ItemRenderType.ENTITY + return type == IItemRenderer.ItemRenderType.INVENTORY || type == IItemRenderer.ItemRenderType.ENTITY || type == IItemRenderer.ItemRenderType.EQUIPPED || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON; } @Override - public boolean shouldUseRenderHelper( - IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, + IItemRenderer.ItemRendererHelper helper) { if (type == IItemRenderer.ItemRenderType.INVENTORY) { return helper == IItemRenderer.ItemRendererHelper.INVENTORY_BLOCK; } @@ -27,7 +28,7 @@ public class ItemMetadataRenderer implements IItemRenderer { || helper == IItemRenderer.ItemRendererHelper.ENTITY_ROTATION; } return (type == IItemRenderer.ItemRenderType.EQUIPPED - || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) + || type == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON) && helper == IItemRenderer.ItemRendererHelper.EQUIPPED_BLOCK; } diff --git a/src/main/java/binnie/core/block/MultipassBlockRenderer.java b/src/main/java/binnie/core/block/MultipassBlockRenderer.java index 09ffe296..26f26f4d 100644 --- a/src/main/java/binnie/core/block/MultipassBlockRenderer.java +++ b/src/main/java/binnie/core/block/MultipassBlockRenderer.java @@ -1,14 +1,17 @@ package binnie.core.block; -import binnie.core.BinnieCore; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import binnie.core.BinnieCore; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler { + public static MultipassBlockRenderer instance; private static int layer = 0; @@ -35,8 +38,8 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { boolean r = true; MultipassBlockRenderer.layer = 0; while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) { diff --git a/src/main/java/binnie/core/block/MultipassItemRenderer.java b/src/main/java/binnie/core/block/MultipassItemRenderer.java index 987ddfba..5f9ffcda 100644 --- a/src/main/java/binnie/core/block/MultipassItemRenderer.java +++ b/src/main/java/binnie/core/block/MultipassItemRenderer.java @@ -6,9 +6,11 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; public class MultipassItemRenderer implements IItemRenderer { + private void render(RenderBlocks renderer, ItemStack item, float f, float g, float h) { GL11.glTranslatef(f, g, h); Block block = ((ItemBlock) item.getItem()).field_150939_a; @@ -22,8 +24,8 @@ public class MultipassItemRenderer implements IItemRenderer { GL11.glDisable(GL11.GL_BLEND); } - MultipassBlockRenderer.instance.renderInventoryBlock( - block, TileEntityMetadata.getItemDamage(item), 0, renderer); + MultipassBlockRenderer.instance + .renderInventoryBlock(block, TileEntityMetadata.getItemDamage(item), 0, renderer); if (block.getRenderBlockPass() == 0) { GL11.glAlphaFunc(516, 0.1f); } @@ -43,8 +45,8 @@ public class MultipassItemRenderer implements IItemRenderer { } @Override - public boolean shouldUseRenderHelper( - IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, + IItemRenderer.ItemRendererHelper helper) { return true; } diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index e88b7a77..ea511f02 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -1,7 +1,5 @@ package binnie.core.block; -import binnie.core.BinnieCore; -import binnie.core.network.packet.MessageMetadata; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,7 +7,11 @@ import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; +import binnie.core.BinnieCore; +import binnie.core.network.packet.MessageMetadata; + public class TileEntityMetadata extends TileEntity { + private int meta; private boolean droppedBlock; diff --git a/src/main/java/binnie/core/circuits/BinnieCircuit.java b/src/main/java/binnie/core/circuits/BinnieCircuit.java index 622d87c8..64ff5597 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuit.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuit.java @@ -1,14 +1,17 @@ package binnie.core.circuits; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitLayout; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class BinnieCircuit implements ICircuit { + private String uid; private int limit; private List tooltips; diff --git a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java index 5bfe28e6..ffadbfc6 100644 --- a/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java +++ b/src/main/java/binnie/core/circuits/BinnieCircuitLayout.java @@ -8,6 +8,7 @@ import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; public class BinnieCircuitLayout implements ICircuitLayout { + private String uid; private AbstractMod mod; diff --git a/src/main/java/binnie/core/craftgui/CraftGUI.java b/src/main/java/binnie/core/craftgui/CraftGUI.java index 20d65028..923ec698 100644 --- a/src/main/java/binnie/core/craftgui/CraftGUI.java +++ b/src/main/java/binnie/core/craftgui/CraftGUI.java @@ -4,6 +4,7 @@ import binnie.core.craftgui.renderer.Renderer; import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; public class CraftGUI { + public static CraftGUIResourceManager resourceManager; public static Renderer render; } diff --git a/src/main/java/binnie/core/craftgui/ITooltip.java b/src/main/java/binnie/core/craftgui/ITooltip.java index 1be020a9..92966019 100644 --- a/src/main/java/binnie/core/craftgui/ITooltip.java +++ b/src/main/java/binnie/core/craftgui/ITooltip.java @@ -1,5 +1,6 @@ package binnie.core.craftgui; public interface ITooltip { + void getTooltip(Tooltip tooltip); } diff --git a/src/main/java/binnie/core/craftgui/ITooltipHelp.java b/src/main/java/binnie/core/craftgui/ITooltipHelp.java index 38723e88..b3699c68 100644 --- a/src/main/java/binnie/core/craftgui/ITooltipHelp.java +++ b/src/main/java/binnie/core/craftgui/ITooltipHelp.java @@ -1,5 +1,6 @@ package binnie.core.craftgui; public interface ITooltipHelp { + void getHelpTooltip(Tooltip tooltip); } diff --git a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java index 9e94ffa3..60ac3f86 100644 --- a/src/main/java/binnie/core/craftgui/ITopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/ITopLevelWidget.java @@ -3,6 +3,7 @@ package binnie.core.craftgui; import binnie.core.craftgui.geometry.IPoint; public interface ITopLevelWidget extends IWidget { + void setMousePosition(int x, int y); IPoint getAbsoluteMousePosition(); diff --git a/src/main/java/binnie/core/craftgui/IWidget.java b/src/main/java/binnie/core/craftgui/IWidget.java index 61f9aa9c..1ce382a0 100644 --- a/src/main/java/binnie/core/craftgui/IWidget.java +++ b/src/main/java/binnie/core/craftgui/IWidget.java @@ -1,12 +1,14 @@ package binnie.core.craftgui; +import java.util.List; + import binnie.core.craftgui.events.Event; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; -import java.util.List; public interface IWidget { + IWidget getParent(); void deleteChild(IWidget child); diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java index c8528171..84bc66dd 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -2,11 +2,13 @@ package binnie.core.craftgui; import java.util.ArrayList; import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; public class Tooltip { + public int maxWidth; protected List tooltip; @@ -70,5 +72,6 @@ public class Tooltip { POWER } - public interface ITooltipType {} + public interface ITooltipType { + } } diff --git a/src/main/java/binnie/core/craftgui/TopLevelWidget.java b/src/main/java/binnie/core/craftgui/TopLevelWidget.java index ab671f6b..8573f0e6 100644 --- a/src/main/java/binnie/core/craftgui/TopLevelWidget.java +++ b/src/main/java/binnie/core/craftgui/TopLevelWidget.java @@ -1,17 +1,20 @@ package binnie.core.craftgui; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.events.EventWidget; -import binnie.core.craftgui.geometry.IPoint; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; import java.util.Deque; import java.util.List; import java.util.ListIterator; + import org.lwjgl.input.Mouse; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.events.EventWidget; +import binnie.core.craftgui.geometry.IPoint; + public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { + protected IWidget mousedOverWidget; protected IWidget draggedWidget; protected IWidget focusedWidget; @@ -24,6 +27,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { dragStart = IPoint.ZERO; addEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { setDraggedWidget(mousedOverWidget, event.getButton()); @@ -32,6 +36,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { }); addEventHandler(new EventMouse.Up.Handler() { + @Override public void onEvent(EventMouse.Up event) { setDraggedWidget(null); @@ -39,6 +44,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { }); addEventHandler(new EventWidget.StartDrag.Handler() { + @Override public void onEvent(EventWidget.StartDrag event) { dragStart = getRelativeMousePosition(); @@ -132,8 +138,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { @Override public void updateTopLevel() { setMousedOverWidget(calculateMousedOverWidget()); - if (getFocusedWidget() != null - && (!getFocusedWidget().isVisible() || !getFocusedWidget().isEnabled())) { + if (getFocusedWidget() != null && (!getFocusedWidget().isVisible() || !getFocusedWidget().isEnabled())) { setFocusedWidget(null); } @@ -152,8 +157,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { if (!widget.canMouseOver()) { continue; } - if (widget.isEnabled() - && widget.isVisible() + if (widget.isEnabled() && widget.isVisible() && widget.canMouseOver() && widget.calculateIsMouseOver()) { return widget; @@ -177,13 +181,11 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { List widgets = new ArrayList<>(); boolean addChildren = true; if (widget.isCroppedWidget()) { - addChildren = - widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition()); + addChildren = widget.getCroppedZone().contains(widget.getCropWidget().getRelativeMousePosition()); } if (addChildren) { - ListIterator li = - widget.getWidgets().listIterator(widget.getWidgets().size()); + ListIterator li = widget.getWidgets().listIterator(widget.getWidgets().size()); while (li.hasPrevious()) { IWidget child = li.previous(); widgets.addAll(getQueuedWidgets(child)); diff --git a/src/main/java/binnie/core/craftgui/Widget.java b/src/main/java/binnie/core/craftgui/Widget.java index 11c1c574..b7a7eb4f 100644 --- a/src/main/java/binnie/core/craftgui/Widget.java +++ b/src/main/java/binnie/core/craftgui/Widget.java @@ -1,16 +1,18 @@ package binnie.core.craftgui; +import java.util.ArrayList; +import java.util.Collection; +import java.util.ConcurrentModificationException; +import java.util.List; + import binnie.core.craftgui.events.Event; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; -import java.util.ArrayList; -import java.util.Collection; -import java.util.ConcurrentModificationException; -import java.util.List; public class Widget implements IWidget { + protected IArea cropArea; protected IWidget cropWidget; protected boolean cropped; @@ -162,9 +164,7 @@ public class Widget implements IWidget { @Override public IPoint getOriginalAbsolutePosition() { - return isTopLevel() - ? getOriginalPosition() - : getParent().getOriginalPosition().sub(getOriginalPosition()); + return isTopLevel() ? getOriginalPosition() : getParent().getOriginalPosition().sub(getOriginalPosition()); } @Override @@ -263,9 +263,7 @@ public class Widget implements IWidget { @Override public IPoint getRelativeMousePosition() { - return isTopLevel() - ? getMousePosition() - : getParent().getRelativeMousePosition().sub(getPosition()); + return isTopLevel() ? getMousePosition() : getParent().getRelativeMousePosition().sub(getPosition()); } @Override @@ -333,8 +331,7 @@ public class Widget implements IWidget { IWidget cropRelative = (cropWidget != null) ? cropWidget : this; IPoint pos = IPoint.sub(cropRelative.getAbsolutePosition(), getAbsolutePosition()); IPoint size = new IPoint(cropArea.size().x(), cropArea.size().y()); - return mouse.x() > pos.x() - && mouse.y() > pos.y() + return mouse.x() > pos.x() && mouse.y() > pos.y() && mouse.x() < pos.x() + size.x() && mouse.y() < pos.y() + size.y() && isMouseOverWidget(mouse); diff --git a/src/main/java/binnie/core/craftgui/WindowFieldKit.java b/src/main/java/binnie/core/craftgui/WindowFieldKit.java index 48dee866..15fa07dc 100644 --- a/src/main/java/binnie/core/craftgui/WindowFieldKit.java +++ b/src/main/java/binnie/core/craftgui/WindowFieldKit.java @@ -1,5 +1,18 @@ package binnie.core.craftgui; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -31,19 +44,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class WindowFieldKit extends Window { + private float glassOffsetX; private float glassOffsetY; private float glassVX; @@ -80,6 +83,7 @@ public class WindowFieldKit extends Window { private void setupValidators() { getWindowInventory().setValidator(0, new SlotValidator(null) { + @Override public boolean isValid(ItemStack object) { return AlleleManager.alleleRegistry.isIndividual(object) @@ -93,6 +97,7 @@ public class WindowFieldKit extends Window { }); getWindowInventory().setValidator(1, new SlotValidator(null) { + @Override public boolean isValid(ItemStack object) { return object.getItem() == Items.paper; @@ -116,7 +121,10 @@ public class WindowFieldKit extends Window { new ControlPlayerInventory(this); IPoint handGlass = new IPoint(16.0f, 32.0f); GlassControl = new ControlImage( - this, handGlass.x(), handGlass.y(), new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett)); + this, + handGlass.x(), + handGlass.y(), + new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett)); new ControlSlot(this, handGlass.x() + 54.0f, handGlass.y() + 26.0f).assign(InventoryType.Window, 0); new ControlSlot(this, 208.0f, 8.0f).assign(InventoryType.Window, 1); (text = new ControlText(this, new IPoint(232.0f, 13.0f), I18N.localise("binniecore.gui.tooltip.paper"))) @@ -125,19 +133,19 @@ public class WindowFieldKit extends Window { .setColor(0x222222); chromo = new ControlChromosome(this, 150.0f, 24.0f); - addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - IChromosomeType type = (IChromosomeType) event.getValue(); - if (type != null && info.containsKey(type)) { - String t = info.get(type); - text.setValue(t); - } else { - text.setValue(""); - } - } - }.setOrigin(EventHandler.Origin.DirectChild, chromo)); + addEventHandler(new EventValueChanged.Handler() { + + @Override + public void onEvent(EventValueChanged event) { + IChromosomeType type = (IChromosomeType) event.getValue(); + if (type != null && info.containsKey(type)) { + String t = info.get(type); + text.setValue(t); + } else { + text.setValue(""); + } + } + }.setOrigin(EventHandler.Origin.DirectChild, chromo)); } @Override @@ -196,9 +204,8 @@ public class WindowFieldKit extends Window { List infos = new ArrayList<>(); int i = 0; - for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; - I18N.canLocalise(pref + i); - ++i) { + for (String pref = root.getUID() + ".fieldkit." + type.getName().toLowerCase() + "."; I18N + .canLocalise(pref + i); ++i) { infos.add(I18N.localise(pref + i)); } @@ -223,8 +230,7 @@ public class WindowFieldKit extends Window { } int sheets = 64 - kit.getItemDamage(); - int size = (getWindowInventory().getStackInSlot(1) == null) - ? 0 + int size = (getWindowInventory().getStackInSlot(1) == null) ? 0 : getWindowInventory().getStackInSlot(1).stackSize; if (sheets != size) { kit.setItemDamage(64 - size); @@ -295,20 +301,24 @@ public class WindowFieldKit extends Window { } static class StyleSheetPunnett extends StyleSheet { + public StyleSheetPunnett() { textures.put( CraftGUITexture.Window, new PaddedTexture(0, 0, 160, 160, 0, ExtraBeeTexture.GUIPunnett, 32, 32, 32, 32)); textures.put(CraftGUITexture.Slot, new StandardTexture(160, 0, 18, 18, 0, ExtraBeeTexture.GUIPunnett)); textures.put( - ExtraBeeGUITexture.Chromosome, new StandardTexture(160, 36, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); + ExtraBeeGUITexture.Chromosome, + new StandardTexture(160, 36, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); textures.put( ExtraBeeGUITexture.Chromosome2, new StandardTexture(160, 52, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); textures.put( - CraftGUITexture.HelpButton, new StandardTexture(178, 0, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); + CraftGUITexture.HelpButton, + new StandardTexture(178, 0, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); textures.put( - CraftGUITexture.InfoButton, new StandardTexture(178, 16, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); + CraftGUITexture.InfoButton, + new StandardTexture(178, 16, 16, 16, 0, ExtraBeeTexture.GUIPunnett)); } } } diff --git a/src/main/java/binnie/core/craftgui/WindowGenesis.java b/src/main/java/binnie/core/craftgui/WindowGenesis.java index e434e3cf..e4991772 100644 --- a/src/main/java/binnie/core/craftgui/WindowGenesis.java +++ b/src/main/java/binnie/core/craftgui/WindowGenesis.java @@ -1,5 +1,16 @@ package binnie.core.craftgui; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -27,17 +38,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class WindowGenesis extends Window { + private ISpeciesRoot root; private IAllele[] template; private ControlListBox geneList; @@ -73,6 +76,7 @@ public class WindowGenesis extends Window { new Panel(this, two.outset(1), MinecraftGUI.PanelType.Black); geneList = new ControlListBox(this, one.x(), one.y(), one.w(), one.h(), 10.0f) { + @Override public IWidget createOption(Gene value, int y) { return new ControlGenesisOption(getContent(), value, y); @@ -80,65 +84,63 @@ public class WindowGenesis extends Window { }; geneOptions = new ControlListBox(this, two.x(), two.y(), two.w(), two.h(), 10.0f) { + @Override public IWidget createOption(Gene value, int y) { return new ControlTextOption<>(getContent(), value, y); } }; - tabSystems.addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - root = ((BreedingSystem) event.getValue()).getSpeciesRoot(); - template = root.getDefaultTemplate(); - refreshTemplate(null); - } - }.setOrigin(EventHandler.Origin.Self, tabSystems)); + tabSystems.addEventHandler(new EventValueChanged.Handler() { - geneList.addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - Map> map = Binnie.Genetics.getChromosomeMap(root); - List opts = new ArrayList<>(); - IChromosomeType chromo = event.value != null ? ((Gene) event.value).getChromosome() : null; - if (chromo != null) { // fix NPE - for (IAllele allele : map.get(chromo)) { - opts.add(new Gene(allele, chromo, root)); - } - } - geneOptions.setOptions(opts); - } - }.setOrigin(EventHandler.Origin.Self, geneList)); + @Override + public void onEvent(EventValueChanged event) { + root = ((BreedingSystem) event.getValue()).getSpeciesRoot(); + template = root.getDefaultTemplate(); + refreshTemplate(null); + } + }.setOrigin(EventHandler.Origin.Self, tabSystems)); - geneOptions.addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - if (event.value == null) { - return; - } + geneList.addEventHandler(new EventValueChanged.Handler() { - IChromosomeType chromo = ((Gene) event.value).getChromosome(); - template[chromo.ordinal()] = ((Gene) event.value).getAllele(); - if (chromo == ((Gene) event.value).getSpeciesRoot().getKaryotypeKey()) { - template = ((Gene) event.value) - .getSpeciesRoot() - .getTemplate( - ((Gene) event.value).getAllele().getUID()); - } - refreshTemplate(chromo); + @Override + public void onEvent(EventValueChanged event) { + Map> map = Binnie.Genetics.getChromosomeMap(root); + List opts = new ArrayList<>(); + IChromosomeType chromo = event.value != null ? ((Gene) event.value).getChromosome() : null; + if (chromo != null) { // fix NPE + for (IAllele allele : map.get(chromo)) { + opts.add(new Gene(allele, chromo, root)); } - }.setOrigin(EventHandler.Origin.Self, geneOptions)); + } + geneOptions.setOptions(opts); + } + }.setOrigin(EventHandler.Origin.Self, geneList)); + + geneOptions.addEventHandler(new EventValueChanged.Handler() { + + @Override + public void onEvent(EventValueChanged event) { + if (event.value == null) { + return; + } + + IChromosomeType chromo = ((Gene) event.value).getChromosome(); + template[chromo.ordinal()] = ((Gene) event.value).getAllele(); + if (chromo == ((Gene) event.value).getSpeciesRoot().getKaryotypeKey()) { + template = ((Gene) event.value).getSpeciesRoot() + .getTemplate(((Gene) event.value).getAllele().getUID()); + } + refreshTemplate(chromo); + } + }.setOrigin(EventHandler.Origin.Self, geneOptions)); panelPickup = new Panel(this, 16.0f, 140.0f, 60.0f, 42.0f, MinecraftGUI.PanelType.Black); refreshTemplate(null); } private void refreshTemplate(IChromosomeType selection) { List genes = new ArrayList<>(); - IChromosomeType[] chromos = - Binnie.Genetics.getChromosomeMap(root).keySet().toArray(new IChromosomeType[0]); + IChromosomeType[] chromos = Binnie.Genetics.getChromosomeMap(root).keySet().toArray(new IChromosomeType[0]); for (IChromosomeType type : chromos) { IAllele allele = template[type.ordinal()]; @@ -186,14 +188,14 @@ public class WindowGenesis extends Window { playerInv.setItemStack(stack); } else if (playerInv.getItemStack().isItemEqual(stack) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), stack)) { - int fit = stack.getMaxStackSize() - (stack.stackSize + playerInv.getItemStack().stackSize); - if (fit >= 0) { - ItemStack itemStack; - ItemStack rec = itemStack = stack; - itemStack.stackSize += playerInv.getItemStack().stackSize; - playerInv.setItemStack(rec); - } - } + int fit = stack.getMaxStackSize() - (stack.stackSize + playerInv.getItemStack().stackSize); + if (fit >= 0) { + ItemStack itemStack; + ItemStack rec = itemStack = stack; + itemStack.stackSize += playerInv.getItemStack().stackSize; + playerInv.setItemStack(rec); + } + } player.openContainer.detectAndSendChanges(); if (player instanceof EntityPlayerMP) { @@ -203,6 +205,7 @@ public class WindowGenesis extends Window { } private static class MouseDownHandler extends EventMouse.Down.Handler { + private final ItemStack stack; public MouseDownHandler(ItemStack stack) { @@ -218,6 +221,7 @@ public class WindowGenesis extends Window { } private class BreedingSystemControlTabBar extends ControlTabBar { + public BreedingSystemControlTabBar() { super(WindowGenesis.this, 8.0f, 28.0f, 23.0f, 100.0f, Position.LEFT); } @@ -225,6 +229,7 @@ public class WindowGenesis extends Window { @Override public ControlTab createTab(float x, float y, float w, float h, BreedingSystem value) { return new ControlTabIcon(this, x, y, w, h, value) { + @Override public ItemStack getItemStack() { int type = value.getDefaultType(); diff --git a/src/main/java/binnie/core/craftgui/controls/ControlButton.java b/src/main/java/binnie/core/craftgui/controls/ControlButton.java index 8c77f021..070aa501 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlButton.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlButton.java @@ -11,6 +11,7 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class ControlButton extends Control { + private ControlText textWidget; private String text; @@ -28,6 +29,7 @@ public class ControlButton extends Control { } private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { callEvent(new EventButtonClicked(getWidget())); diff --git a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java index 076960f6..ad53b181 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlCheckbox.java @@ -14,6 +14,7 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class ControlCheckbox extends Control implements IControlValue { + boolean value; String text; @@ -31,13 +32,13 @@ public class ControlCheckbox extends Control implements IControlValue { } addAttribute(WidgetAttribute.MOUSE_OVER); - addEventHandler( - new EventMouse.Down.Handler() { - @Override - public void onEvent(EventMouse.Down event) { - toggleValue(); - } - }.setOrigin(EventHandler.Origin.Self, this)); + addEventHandler(new EventMouse.Down.Handler() { + + @Override + public void onEvent(EventMouse.Down event) { + toggleValue(); + } + }.setOrigin(EventHandler.Origin.Self, this)); } @Override diff --git a/src/main/java/binnie/core/craftgui/controls/ControlText.java b/src/main/java/binnie/core/craftgui/controls/ControlText.java index 396fb428..683879ba 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlText.java @@ -9,6 +9,7 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; public class ControlText extends Control implements IControlValue { + private String text; private TextJustification align; @@ -21,12 +22,7 @@ public class ControlText extends Control implements IControlValue { } public ControlText(IWidget parent, IArea area, String text, TextJustification align) { - super( - parent, - area.pos().x(), - area.pos().y(), - area.size().x(), - area.size().y()); + super(parent, area.pos().x(), area.pos().y(), area.size().x(), area.size().y()); setValue(text); this.align = align; } diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java b/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java index a8470819..02f4a599 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextCentered.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; public class ControlTextCentered extends ControlText { + public ControlTextCentered(IWidget parent, float y, String text) { super( parent, diff --git a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java index e2aaf8c1..d9ddcfa4 100644 --- a/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/core/craftgui/controls/ControlTextEdit.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.controls; +import net.minecraft.client.gui.GuiTextField; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.WidgetAttribute; @@ -11,9 +13,9 @@ import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.events.EventTextEdit; import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraft.client.gui.GuiTextField; public class ControlTextEdit extends Control implements IControlValue { + GuiTextField field; private String cachedValue; @@ -25,46 +27,46 @@ public class ControlTextEdit extends Control implements IControlValue { addAttribute(WidgetAttribute.MOUSE_OVER); field.setEnableBackgroundDrawing(false); - addEventHandler( - new EventKey.Down.Handler() { - @Override - public void onEvent(EventKey.Down event) { - field.textboxKeyTyped(event.getCharacter(), event.getKey()); - String text = getValue(); - if (!text.equals(cachedValue)) { - cachedValue = text; - callEvent(new EventTextEdit(ControlTextEdit.this, cachedValue)); - onTextEdit(cachedValue); - } - } - }.setOrigin(EventHandler.Origin.Self, this)); + addEventHandler(new EventKey.Down.Handler() { - addEventHandler( - new EventMouse.Down.Handler() { - @Override - public void onEvent(EventMouse.Down event) { - field.mouseClicked( - (int) getRelativeMousePosition().x(), - (int) getRelativeMousePosition().y(), - event.getButton()); - } - }.setOrigin(EventHandler.Origin.Self, this)); + @Override + public void onEvent(EventKey.Down event) { + field.textboxKeyTyped(event.getCharacter(), event.getKey()); + String text = getValue(); + if (!text.equals(cachedValue)) { + cachedValue = text; + callEvent(new EventTextEdit(ControlTextEdit.this, cachedValue)); + onTextEdit(cachedValue); + } + } + }.setOrigin(EventHandler.Origin.Self, this)); - addEventHandler( - new EventWidget.GainFocus.Handler() { - @Override - public void onEvent(EventWidget.GainFocus event) { - field.setFocused(true); - } - }.setOrigin(EventHandler.Origin.Self, this)); + addEventHandler(new EventMouse.Down.Handler() { - addEventHandler( - new EventWidget.LoseFocus.Handler() { - @Override - public void onEvent(EventWidget.LoseFocus event) { - field.setFocused(false); - } - }.setOrigin(EventHandler.Origin.Self, this)); + @Override + public void onEvent(EventMouse.Down event) { + field.mouseClicked( + (int) getRelativeMousePosition().x(), + (int) getRelativeMousePosition().y(), + event.getButton()); + } + }.setOrigin(EventHandler.Origin.Self, this)); + + addEventHandler(new EventWidget.GainFocus.Handler() { + + @Override + public void onEvent(EventWidget.GainFocus event) { + field.setFocused(true); + } + }.setOrigin(EventHandler.Origin.Self, this)); + + addEventHandler(new EventWidget.LoseFocus.Handler() { + + @Override + public void onEvent(EventWidget.LoseFocus event) { + field.setFocused(false); + } + }.setOrigin(EventHandler.Origin.Self, this)); } @Override diff --git a/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java b/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java index 43a2ff91..0f3a2c40 100644 --- a/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java +++ b/src/main/java/binnie/core/craftgui/controls/IControlSelectionOption.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.controls; public interface IControlSelectionOption { + T getValue(); } diff --git a/src/main/java/binnie/core/craftgui/controls/core/Control.java b/src/main/java/binnie/core/craftgui/controls/core/Control.java index 21d7cb1b..529b18a8 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/core/craftgui/controls/core/Control.java @@ -1,5 +1,8 @@ package binnie.core.craftgui.controls.core; +import java.util.ArrayList; +import java.util.List; + import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.ITooltipHelp; import binnie.core.craftgui.IWidget; @@ -9,10 +12,9 @@ import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; -import java.util.ArrayList; -import java.util.List; public class Control extends Widget implements ITooltipHelp, ITooltip { + public int extraLevel; protected List helpStrings; diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java index c8025ede..fd584779 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlValue.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.controls.core; import binnie.core.craftgui.IWidget; public interface IControlValue extends IWidget { + T getValue(); void setValue(T value); diff --git a/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java b/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java index 4d0a8a1e..6d08159a 100644 --- a/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java +++ b/src/main/java/binnie/core/craftgui/controls/core/IControlValues.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.controls.core; import java.util.Collection; public interface IControlValues extends IControlValue { + Collection getValues(); void setValues(Collection values); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java index 0195a07f..4adeb098 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlList.java @@ -1,16 +1,18 @@ package binnie.core.craftgui.controls.listbox; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventValueChanged; import binnie.core.craftgui.geometry.IPoint; import binnie.core.util.IValidator; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; public class ControlList extends Control implements IControlValue { + protected ControlListBox parent; protected T value; protected Map allOptions = new LinkedHashMap<>(); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java index cc3a3fc5..773a4b90 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlListBox.java @@ -1,13 +1,15 @@ package binnie.core.craftgui.controls.listbox; +import java.util.Collection; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.controls.scroll.ControlScrollableContent; import binnie.core.craftgui.events.EventKey; import binnie.core.util.IValidator; -import java.util.Collection; public class ControlListBox extends ControlScrollableContent> implements IControlValue { + public ControlListBox(IWidget parent, float x, float y, float w, float h, float scrollBarSize) { super(parent, x, y, w, h, scrollBarSize); } @@ -16,6 +18,7 @@ public class ControlListBox extends ControlScrollableContent> public void initialise() { setScrollableContent(new ControlList<>(this, 1.0f, 1.0f, w() - 2.0f - scrollBarSize, h() - 2.0f)); addEventHandler(new EventKey.Down.Handler() { + @Override public void onEvent(EventKey.Down event) { if (calculateIsMouseOver()) { diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java index e86e2a85..dbdb4fd2 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlOption.java @@ -8,6 +8,7 @@ import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class ControlOption extends Control implements IControlValue { + protected T value; public ControlOption(ControlList controlList, T option) { @@ -37,6 +38,7 @@ public class ControlOption extends Control implements IControlValue { } private EventMouse.Down.Handler mouseHandler = new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { ((IControlValue) getParent()).setValue(getValue()); diff --git a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java index b847e58e..15e854c6 100644 --- a/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java +++ b/src/main/java/binnie/core/craftgui/controls/listbox/ControlTextOption.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.TextJustification; public class ControlTextOption extends ControlOption { + protected ControlText textWidget; public ControlTextOption(ControlList controlList, T option, String optionName, int y) { @@ -22,6 +23,7 @@ public class ControlTextOption extends ControlOption { } private EventWidget.ChangeColour.Handler mouseHandler = new EventWidget.ChangeColour.Handler() { + @Override public void onEvent(EventWidget.ChangeColour event) { textWidget.setColor(getColor()); diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java index 3b30702b..be533005 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPage.java @@ -5,6 +5,7 @@ import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; public class ControlPage extends Control implements IControlValue { + protected T value; public ControlPage(IWidget parent, T value) { diff --git a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java index 1c476932..accc7f2a 100644 --- a/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java +++ b/src/main/java/binnie/core/craftgui/controls/page/ControlPages.java @@ -1,15 +1,17 @@ package binnie.core.craftgui.controls.page; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.controls.core.IControlValues; import binnie.core.craftgui.events.EventValueChanged; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; public class ControlPages extends Control implements IControlValues, IControlValue { + protected T value; public ControlPages(IWidget parent, float x, float y, float w, float h) { diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java index 36e065f1..d00e801c 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScroll.java @@ -4,6 +4,7 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; public class ControlScroll extends Control { + private IControlScrollable scrollWidget; public ControlScroll(IWidget parent, float x, float y, float width, float height, IControlScrollable scrollWidget) { diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index 6d3595a1..add5a18d 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -9,6 +9,7 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class ControlScrollBar extends Control { + protected IControlScrollable scrollable; public ControlScrollBar(ControlScroll parent) { @@ -20,6 +21,7 @@ public class ControlScrollBar extends Control { scrollable = scrollable2; addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Drag.Handler() { + @Override public void onEvent(EventMouse.Drag event) { scrollable.movePercentage(event.getDy() / (h() - getBarHeight())); @@ -29,6 +31,7 @@ public class ControlScrollBar extends Control { } private EventMouse.Down.Handler mouseDownHandler = new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { float shownPercentage = scrollable.getPercentageShown(); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java index c7553e4f..2a52e8e6 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java @@ -8,6 +8,7 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; public class ControlScrollableContent extends Control implements IControlScrollable { + protected T controlChild; protected float scrollBarSize; protected float percentageIndex; @@ -16,13 +17,7 @@ public class ControlScrollableContent extends Control impleme super(parent, x, y, w, h); this.scrollBarSize = scrollBarSize; if (scrollBarSize != 0.0f) { - new ControlScroll( - this, - getSize().x() - scrollBarSize, - 0.0f, - scrollBarSize, - getSize().y(), - this); + new ControlScroll(this, getSize().x() - scrollBarSize, 0.0f, scrollBarSize, getSize().y(), this); } percentageIndex = 0.0f; @@ -35,11 +30,11 @@ public class ControlScrollableContent extends Control impleme } private EventMouse.Wheel.Handler mouseWheelHandler = new EventMouse.Wheel.Handler() { + @Override public void onEvent(EventMouse.Wheel event) { IPoint mousePos = getRelativeMousePosition(); - if (mousePos.x() > 0.0f - && mousePos.y() > 0.0f + if (mousePos.x() > 0.0f && mousePos.y() > 0.0f && mousePos.x() < getSize().x() && mousePos.y() < getSize().y()) { if (getMovementRange() == 0.0f) { @@ -57,14 +52,9 @@ public class ControlScrollableContent extends Control impleme return; } - child.setCroppedZone( - this, - new IArea( - 1.0F, - 1.0F, - getSize().x() - 2.0F - scrollBarSize, - getSize().y() - 2.0F)); + child.setCroppedZone(this, new IArea(1.0F, 1.0F, getSize().x() - 2.0F - scrollBarSize, getSize().y() - 2.0F)); child.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { + @Override public void onEvent(EventWidget.ChangeSize event) { controlChild.setOffset(new IPoint(0.0f, -percentageIndex * getMovementRange())); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java b/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java index ce116667..2132c812 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/IControlScrollable.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.controls.scroll; import binnie.core.craftgui.IWidget; public interface IControlScrollable extends IWidget { + float getPercentageShown(); float getPercentageIndex(); diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java index bf7027a6..d6806310 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTab.java @@ -17,6 +17,7 @@ import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class ControlTab extends Control implements ITooltip, IControlValue { + protected T value; private ControlTabBar tabBar; @@ -27,6 +28,7 @@ public class ControlTab extends Control implements ITooltip, IControlValue tabBar = parent; addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { callEvent(new EventValueChanged(getWidget(), getValue())); diff --git a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java index 38e8c1d2..25b5efc5 100644 --- a/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java +++ b/src/main/java/binnie/core/craftgui/controls/tab/ControlTabBar.java @@ -1,27 +1,29 @@ package binnie.core.craftgui.controls.tab; +import java.util.Collection; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventHandler; import binnie.core.craftgui.events.EventValueChanged; import binnie.core.craftgui.geometry.Position; -import java.util.Collection; public class ControlTabBar extends Control implements IControlValue { + protected T value; protected Position position; public ControlTabBar(IWidget parent, float x, float y, float width, float height, Position position) { super(parent, x, y, width, height); this.position = position; - addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - setValue((T) event.getValue()); - } - }.setOrigin(EventHandler.Origin.DirectChild, this)); + addEventHandler(new EventValueChanged.Handler() { + + @Override + public void onEvent(EventValueChanged event) { + setValue((T) event.getValue()); + } + }.setOrigin(EventHandler.Origin.DirectChild, this)); } public ControlTab createTab(float x, float y, float w, float h, T value) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java index 70f30e5f..00ed5d3c 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBox.java @@ -5,6 +5,7 @@ import binnie.core.craftgui.controls.listbox.ControlListBox; import forestry.api.genetics.IClassification; class ControlBranchBox extends ControlListBox { + @Override public IWidget createOption(IClassification value, int y) { return new ControlBranchBoxOption(getContent(), value, y); diff --git a/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java index 39a5dd99..490c76a8 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBranchBoxOption.java @@ -5,12 +5,12 @@ import binnie.core.craftgui.controls.listbox.ControlTextOption; import forestry.api.genetics.IClassification; class ControlBranchBoxOption extends ControlTextOption { + public ControlBranchBoxOption(ControlList controlList, IClassification option, int y) { super( controlList, option, - (option.getName() == null) - ? option.getScientific() + (option.getName() == null) ? option.getScientific() : (option.getName().contains(".") ? option.getScientific() : option.getName()), y); } diff --git a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java index 85eed185..46ced4b4 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/core/craftgui/database/ControlBreedingProgress.java @@ -12,12 +12,13 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.genetics.BreedingSystem; class ControlBreedingProgress extends Control { + private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); private float percentage; private int colour; - public ControlBreedingProgress( - IWidget parent, int x, int y, int width, int height, BreedingSystem system, float percentage) { + public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system, + float percentage) { super(parent, x, y, width, height); this.percentage = percentage; colour = system.getColor(); diff --git a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java index ae431962..4264d43d 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java +++ b/src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.database; +import net.minecraft.util.IIcon; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -12,13 +14,15 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; import binnie.core.util.I18N; + import com.mojang.authlib.GameProfile; + import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.util.IIcon; public class ControlDatabaseIndividualDisplay extends ControlItemDisplay implements ITooltip { + protected EnumDiscoveryState discovered; private IAlleleSpecies species; @@ -40,8 +44,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme if (window instanceof WindowAbstractDatabase && ((WindowAbstractDatabase) window).isNEI) { state = EnumDiscoveryState.SHOW; } else if (state == EnumDiscoveryState.UNDETERMINED) { - state = system.isSpeciesDiscovered(species, window.getWorld(), username) - ? EnumDiscoveryState.DISCOVERED + state = system.isSpeciesDiscovered(species, window.getWorld(), username) ? EnumDiscoveryState.DISCOVERED : EnumDiscoveryState.UNDISCOVERED; } @@ -105,6 +108,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme } private class MouseDownHandler extends EventMouse.Down.Handler { + @Override public void onEvent(EventMouse.Down event) { if (event.getButton() == 0 && species != null && EnumDiscoveryState.SHOW == discovered) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java index e9dc0f1d..a9d1a1b4 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlItemStackOption.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.database; +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.listbox.ControlList; @@ -7,9 +9,9 @@ import binnie.core.craftgui.controls.listbox.ControlTextOption; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import net.minecraft.item.ItemStack; public class ControlItemStackOption extends ControlTextOption { + private ControlItemDisplay controlBee; public ControlItemStackOption(ControlList controlList, ItemStack option, int y) { @@ -22,8 +24,7 @@ public class ControlItemStackOption extends ControlTextOption { addAttribute(WidgetAttribute.MOUSE_OVER); CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f))); - int th = (int) CraftGUI.render.textHeight( - textWidget.getValue(), textWidget.getSize().x()); + int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x()); int height = Math.max(20, th + 6); setSize(new IPoint(size().x(), height)); textWidget.setSize(new IPoint(textWidget.getSize().x(), height)); diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index a35df30c..25439215 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -1,14 +1,16 @@ package binnie.core.craftgui.database; +import java.util.List; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import java.util.List; class ControlMutationBox extends ControlListBox { + private Type type; private IAlleleSpecies species; @@ -31,8 +33,8 @@ class ControlMutationBox extends ControlListBox { this.species = species; movePercentage(-100.0f); BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); - List discovered = system.getDiscoveredMutations( - Window.get(this).getWorld(), Window.get(this).getUsername()); + List discovered = system + .getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); if (species == null) { return; diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java index 9e5d6d01..fd41cf0b 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationItem.java @@ -8,6 +8,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; class ControlMutationItem extends ControlOption { + public ControlMutationItem(ControlList controlList, IMutation option, IAlleleSpecies species, int y) { super(controlList, option, y); ControlDatabaseIndividualDisplay itemWidget1 = new ControlDatabaseIndividualDisplay(this, 4.0f, 4.0f); @@ -42,10 +43,9 @@ class ControlMutationItem extends ControlOption { arrowSymbol.setValue(getValue()); } - private EnumDiscoveryState getState( - boolean isNEI, boolean isMutationDiscovered, IAlleleSpecies species, IAlleleSpecies allele) { - return (isNEI || isMutationDiscovered || species == allele) - ? EnumDiscoveryState.SHOW + private EnumDiscoveryState getState(boolean isNEI, boolean isMutationDiscovered, IAlleleSpecies species, + IAlleleSpecies allele) { + return (isNEI || isMutationDiscovered || species == allele) ? EnumDiscoveryState.SHOW : EnumDiscoveryState.UNDETERMINED; } } diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java index f95d74d1..caa52333 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationSymbol.java @@ -16,6 +16,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IMutation; class ControlMutationSymbol extends Control implements ITooltip { + private static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); private static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); private IMutation value; @@ -44,8 +45,7 @@ class ControlMutationSymbol extends Control implements ITooltip { boolean isNEI = ((WindowAbstractDatabase) getSuperParent()).isNEI(); BreedingSystem system = ((WindowAbstractDatabase) getSuperParent()).getBreedingSystem(); discovered = (isNEI - || system.isMutationDiscovered( - value, Window.get(this).getWorld(), Window.get(this).getUsername())); + || system.isMutationDiscovered(value, Window.get(this).getWorld(), Window.get(this).getUsername())); if (discovered) { setColor(0xffffff); } else { diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java index dfccaa04..6d9c2134 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java @@ -1,16 +1,20 @@ package binnie.core.craftgui.database; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.listbox.ControlListBox; -import binnie.core.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; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.listbox.ControlListBox; +import binnie.core.craftgui.minecraft.Window; + +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IClassification; + public class ControlSpeciesBox extends ControlListBox { + private IClassification branch; @Override @@ -35,8 +39,7 @@ public class ControlSpeciesBox extends ControlListBox { GameProfile playerName = Window.get(this).getUsername(); WindowAbstractDatabase db = Window.get(this); - Collection speciesList3 = db.isNEI - ? db.getBreedingSystem().getAllSpecies() + Collection speciesList3 = db.isNEI ? db.getBreedingSystem().getAllSpecies() : db.getBreedingSystem().getDiscoveredSpecies(db.getWorld(), playerName); if (branch != null) { for (IAlleleSpecies species : branch.getMemberSpecies()) { diff --git a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java index 92cdd32b..962d2aff 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java +++ b/src/main/java/binnie/core/craftgui/database/ControlSpeciesBoxOption.java @@ -10,6 +10,7 @@ import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; class ControlSpeciesBoxOption extends ControlTextOption { + private ControlDatabaseIndividualDisplay controlBee; public ControlSpeciesBoxOption(ControlList controlList, IAlleleSpecies option, int y) { @@ -30,8 +31,7 @@ class ControlSpeciesBoxOption extends ControlTextOption { CraftGUIUtil.moveWidget(textWidget, new IPoint(22.0f, 0.0f)); textWidget.setSize(textWidget.getSize().sub(new IPoint(24.0f, 0.0f))); - int th = (int) CraftGUI.render.textHeight( - textWidget.getValue(), textWidget.getSize().x()); + int th = (int) CraftGUI.render.textHeight(textWidget.getValue(), textWidget.getSize().x()); int height = Math.max(20, th + 6); setSize(new IPoint(size().x(), height)); textWidget.setSize(new IPoint(textWidget.getSize().x(), height)); diff --git a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java index 7d0a314e..b991b52d 100644 --- a/src/main/java/binnie/core/craftgui/database/DatabaseTab.java +++ b/src/main/java/binnie/core/craftgui/database/DatabaseTab.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.Tooltip; import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { + private String mod; private String unloc; diff --git a/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java b/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java index 8d840c7e..48ee4f5e 100644 --- a/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java +++ b/src/main/java/binnie/core/craftgui/database/IDatabaseMode.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.database; public interface IDatabaseMode { + String getName(); } diff --git a/src/main/java/binnie/core/craftgui/database/PageAbstract.java b/src/main/java/binnie/core/craftgui/database/PageAbstract.java index f3d32be4..d62166bb 100644 --- a/src/main/java/binnie/core/craftgui/database/PageAbstract.java +++ b/src/main/java/binnie/core/craftgui/database/PageAbstract.java @@ -4,6 +4,7 @@ import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.page.ControlPage; public abstract class PageAbstract extends ControlPage { + public PageAbstract(IWidget parent, DatabaseTab tab) { super(parent, 0.0f, 0.0f, parent.getSize().x(), parent.getSize().y(), tab); } diff --git a/src/main/java/binnie/core/craftgui/database/PageBranch.java b/src/main/java/binnie/core/craftgui/database/PageBranch.java index 8a61ae68..0e25e104 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranch.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranch.java @@ -4,6 +4,7 @@ import binnie.core.craftgui.IWidget; import forestry.api.genetics.IClassification; abstract class PageBranch extends PageAbstract { + public PageBranch(IWidget parent, DatabaseTab tab) { super(parent, tab); } diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java index 5a21d5de..9d777442 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchOverview.java @@ -1,16 +1,19 @@ package binnie.core.craftgui.database; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.util.I18N; import forestry.api.genetics.IClassification; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.util.EnumChatFormatting; public class PageBranchOverview extends PageBranch { + private ControlText branchName; private ControlText branchScientific; private ControlText branchAuthority; @@ -27,16 +30,17 @@ public class PageBranchOverview extends PageBranch { @Override public void onValueChanged(IClassification branch) { String name = I18N.localise(branch.getName()); - branchName.setValue(EnumChatFormatting.BOLD - + I18N.localise("binniecore.gui.database.branch.name", name) - + EnumChatFormatting.RESET); - branchScientific.setValue(EnumChatFormatting.ITALIC - + I18N.localise("binniecore.gui.database.branch.apidae", branch.getScientific()) - + EnumChatFormatting.RESET); - branchAuthority.setValue(EnumChatFormatting.BOLD - + I18N.localise( - "binniecore.gui.database.branch.discoveredBy", branch.getMemberSpecies()[0].getAuthority()) - + EnumChatFormatting.RESET); + branchName.setValue( + EnumChatFormatting.BOLD + I18N.localise("binniecore.gui.database.branch.name", name) + + EnumChatFormatting.RESET); + branchScientific.setValue( + EnumChatFormatting.ITALIC + + I18N.localise("binniecore.gui.database.branch.apidae", branch.getScientific()) + + EnumChatFormatting.RESET); + branchAuthority.setValue( + EnumChatFormatting.BOLD + I18N.localise( + "binniecore.gui.database.branch.discoveredBy", + branch.getMemberSpecies()[0].getAuthority()) + EnumChatFormatting.RESET); for (IWidget widget : branchDescription) { deleteChild(widget); diff --git a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java index 294b22d4..4e91525b 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageBranchSpecies.java @@ -9,6 +9,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; public class PageBranchSpecies extends PageBranch { + private ControlSpeciesBox speciesList; @Mod.EventHandler @@ -29,6 +30,7 @@ public class PageBranchSpecies extends PageBranch { } private class ValueHandler extends EventValueChanged.Handler { + @Override public void onEvent(EventValueChanged event) { if (event.isOrigin(speciesList)) { diff --git a/src/main/java/binnie/core/craftgui/database/PageBreeder.java b/src/main/java/binnie/core/craftgui/database/PageBreeder.java index 08a2a99d..2670e404 100644 --- a/src/main/java/binnie/core/craftgui/database/PageBreeder.java +++ b/src/main/java/binnie/core/craftgui/database/PageBreeder.java @@ -1,15 +1,18 @@ package binnie.core.craftgui.database; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.page.ControlPage; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.BreedingSystem; import binnie.core.util.I18N; + import com.mojang.authlib.GameProfile; -import net.minecraft.util.EnumChatFormatting; public class PageBreeder extends ControlPage { + private GameProfile player; public PageBreeder(IWidget parent, GameProfile player, DatabaseTab tab) { @@ -27,8 +30,7 @@ public class PageBreeder extends ControlPage { new ControlTextCentered( this, 8.0f, - EnumChatFormatting.BOLD - + I18N.localise("binniecore.gui.database.descriptor", system.getDescriptor()) + EnumChatFormatting.BOLD + I18N.localise("binniecore.gui.database.descriptor", system.getDescriptor()) + EnumChatFormatting.RESET); new ControlTextCentered( this, @@ -42,7 +44,9 @@ public class PageBreeder extends ControlPage { this, 115.0f, I18N.localise( - "binniecore.gui.database.branch.count", system.discoveredBranchCount, system.totalBranchCount)); + "binniecore.gui.database.branch.count", + system.discoveredBranchCount, + system.totalBranchCount)); new ControlBreedingProgress(this, 20, 127, 102, 14, system, system.discoveredBranchPercentage); if (system.discoveredSecretCount > 0) { @@ -57,6 +61,8 @@ public class PageBreeder extends ControlPage { new ControlTextCentered(this, 32.0f, player.getName()); new ControlTextCentered( - this, 44.0f, EnumChatFormatting.ITALIC + system.getEpitome() + EnumChatFormatting.RESET); + this, + 44.0f, + EnumChatFormatting.ITALIC + system.getEpitome() + EnumChatFormatting.RESET); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpecies.java b/src/main/java/binnie/core/craftgui/database/PageSpecies.java index 73b20e51..b6772d52 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpecies.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpecies.java @@ -4,6 +4,7 @@ import binnie.core.craftgui.IWidget; import forestry.api.genetics.IAlleleSpecies; public abstract class PageSpecies extends PageAbstract { + public PageSpecies(IWidget parent, DatabaseTab tab) { super(parent, tab); } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java index a30a9148..13b6706f 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesClassification.java @@ -1,14 +1,16 @@ package binnie.core.craftgui.database; +import java.util.LinkedHashMap; +import java.util.Map; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import java.util.LinkedHashMap; -import java.util.Map; public class PageSpeciesClassification extends PageSpecies { + private Map levels; private ControlText genus; @@ -38,9 +40,8 @@ public class PageSpeciesClassification extends PageSpecies { } genus.setValue(species.getBinomial()); - for (IClassification classification = species.getBranch(); - classification != null; - classification = classification.getParent()) { + for (IClassification classification = species.getBranch(); classification + != null; classification = classification.getParent()) { IClassification.EnumClassLevel level = classification.getLevel(); String text2 = ""; text2 += classification.getScientific(); diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java index c2816b69..32f55be8 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesMutations.java @@ -6,6 +6,7 @@ import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesMutations extends PageSpecies { + private ControlMutationBox list; public PageSpeciesMutations(IWidget parent, DatabaseTab tab) { diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java index 875ce776..371efa15 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesOverview.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.database; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -9,9 +11,9 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.util.EnumChatFormatting; public class PageSpeciesOverview extends PageSpecies { + private ControlText controlName; private ControlText controlScientific; private ControlText controlAuthority; @@ -30,25 +32,30 @@ public class PageSpeciesOverview extends PageSpecies { controlAuthority = new ControlTextCentered(this, 44.0f, ""); controlComplexity = new ControlTextCentered(this, 56.0f, ""); controlDescription = new ControlText( - this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MIDDLE_CENTER); + this, + new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), + "", + TextJustification.MIDDLE_CENTER); controlSignature = new ControlText( - this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BOTTOM_RIGHT); + this, + new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), + "", + TextJustification.BOTTOM_RIGHT); } @Override public void onValueChanged(IAlleleSpecies species) { controlInd1.setSpecies(species, EnumDiscoveryState.SHOW); controlInd2.setSpecies(species, EnumDiscoveryState.SHOW); - String branchBinomial = (species.getBranch() != null) - ? species.getBranch().getScientific() + String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : I18N.localise("extratrees.genetics.unknown"); controlName.setValue(EnumChatFormatting.BOLD + species.getName() + EnumChatFormatting.RESET); controlScientific.setValue( EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET); - controlAuthority.setValue(EnumChatFormatting.BOLD - + I18N.localise("extratrees.genetics.discoveredBy", species.getAuthority()) - + EnumChatFormatting.RESET); + controlAuthority.setValue( + EnumChatFormatting.BOLD + I18N.localise("extratrees.genetics.discoveredBy", species.getAuthority()) + + EnumChatFormatting.RESET); controlComplexity.setValue(I18N.localise("extratrees.genetics.complexity", species.getComplexity())); String desc = species.getDescription(); String descBody = EnumChatFormatting.ITALIC.toString(); @@ -69,9 +76,8 @@ public class PageSpeciesOverview extends PageSpecies { controlDescription.setValue(descBody + EnumChatFormatting.RESET); controlSignature.setValue(descSig + EnumChatFormatting.RESET); - float descHeight = CraftGUI.render.textHeight( - controlDescription.getValue(), controlDescription.getSize().x()); - controlSignature.setPosition(new IPoint( - controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f)); + float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); + controlSignature.setPosition( + new IPoint(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f)); } } diff --git a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java index 59d524ed..c8308020 100644 --- a/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java +++ b/src/main/java/binnie/core/craftgui/database/PageSpeciesResultant.java @@ -6,6 +6,7 @@ import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesResultant extends PageSpecies { + private ControlMutationBox list; public PageSpeciesResultant(IWidget parent, DatabaseTab tab) { diff --git a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java index 99567be9..c5dd0445 100644 --- a/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java @@ -1,5 +1,11 @@ package binnie.core.craftgui.database; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextEdit; import binnie.core.craftgui.controls.listbox.ControlListBox; @@ -22,17 +28,16 @@ import binnie.core.craftgui.window.Panel; import binnie.core.genetics.BreedingSystem; import binnie.core.util.I18N; import binnie.core.util.IValidator; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.relauncher.Side; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; public abstract class WindowAbstractDatabase extends Window { + protected boolean isNEI; private float selectionBoxWidth; @@ -81,6 +86,7 @@ public abstract class WindowAbstractDatabase extends Window { public void initialiseClient() { setSize(new IPoint(176.0f + selectionBoxWidth + 22.0f + 8.0f, 208.0f)); addEventHandler(new EventValueChanged.Handler() { + @Override public void onEvent(EventValueChanged event) { if (!(event.getOrigin().getParent() instanceof ControlPage)) { @@ -111,40 +117,37 @@ public abstract class WindowAbstractDatabase extends Window { } }); - addEventHandler( - new EventTextEdit.Handler() { - @Override - public void onEvent(EventTextEdit event) { - for (ModeWidgets widgets : modes.values()) { - widgets.listBox.setValidator(new IValidator() { - @Override - public boolean isValid(IWidget object) { - return event.getValue().isEmpty() - || ((ControlTextOption) object) - .getText() - .toLowerCase() - .contains(event.getValue().toLowerCase()); - } - }); + addEventHandler(new EventTextEdit.Handler() { + + @Override + public void onEvent(EventTextEdit event) { + for (ModeWidgets widgets : modes.values()) { + widgets.listBox.setValidator(new IValidator() { + + @Override + public boolean isValid(IWidget object) { + return event.getValue().isEmpty() || ((ControlTextOption) object).getText().toLowerCase() + .contains(event.getValue().toLowerCase()); } - } - }.setOrigin(EventHandler.Origin.DirectChild, this)); + }); + } + } + }.setOrigin(EventHandler.Origin.DirectChild, this)); new ControlHelp(this, 4.0f, 4.0f); (panelInformation = new Panel(this, 24.0f, 24.0f, 144.0f, 176.0f, MinecraftGUI.PanelType.Black)) .setColor(860416); (panelSearch = new Panel(this, 176.0f, 24.0f, selectionBoxWidth, 160.0f, MinecraftGUI.PanelType.Black)) .setColor(860416); - modePages = - new ControlPages<>(this, 0.0f, 0.0f, getSize().x(), getSize().y()); + modePages = new ControlPages<>(this, 0.0f, 0.0f, getSize().x(), getSize().y()); new ControlTextEdit(this, 176.0f, 184.0f, selectionBoxWidth, 16.0f); createMode(Mode.Species, new ModeWidgets(Mode.Species, this) { + @Override public void createListBox(IArea area) { GameProfile playerName = getUsername(); - Collection speciesList = database.isNEI - ? database.system.getAllSpecies() + Collection speciesList = database.isNEI ? database.system.getAllSpecies() : database.system.getDiscoveredSpecies(database.getWorld(), playerName); (listBox = new ControlSpeciesBox(modePage, area.x(), area.y(), area.w(), area.h())) .setOptions(speciesList); @@ -152,11 +155,11 @@ public abstract class WindowAbstractDatabase extends Window { }); createMode(Mode.Branches, new ModeWidgets(Mode.Branches, this) { + @Override public void createListBox(IArea area) { GameProfile playerName = getUsername(); - Collection speciesList = database.isNEI - ? database.system.getAllBranches() + Collection speciesList = database.isNEI ? database.system.getAllBranches() : database.system.getDiscoveredBranches(database.getWorld(), playerName); listBox = new ControlBranchBox(modePage, area.x(), area.y(), area.w(), area.h()); @@ -165,6 +168,7 @@ public abstract class WindowAbstractDatabase extends Window { }); createMode(Mode.Breeder, new ModeWidgets(Mode.Breeder, this) { + @Override public void createListBox(IArea area) { listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f); @@ -172,27 +176,37 @@ public abstract class WindowAbstractDatabase extends Window { }); addTabs(); - ControlTabBar tab = - new ControlTabBar( - this, 176.0f + selectionBoxWidth, 24.0f, 22.0f, 176.0f, Position.RIGHT) { + ControlTabBar tab = new ControlTabBar( + this, + 176.0f + selectionBoxWidth, + 24.0f, + 22.0f, + 176.0f, + Position.RIGHT) { + + @Override + public ControlTab createTab(float x, float y, float w, float h, IDatabaseMode value) { + return new ControlTab(this, x, y, w, h, value) { + @Override - public ControlTab createTab( - float x, float y, float w, float h, IDatabaseMode value) { - return new ControlTab(this, x, y, w, h, value) { - @Override - public String getName() { - return value.getName(); - } - }; + public String getName() { + return value.getName(); } }; + } + }; tab.setValues(modePages.getValues()); CraftGUIUtil.linkWidgets(tab, modePages); changeMode(Mode.Species); for (IDatabaseMode mode : modes.keySet()) { - modes.get(mode).infoTabs = - new ControlTabBar(modes.get(mode).modePage, 8.0f, 24.0f, 16.0f, 176.0f, Position.LEFT); + modes.get(mode).infoTabs = new ControlTabBar( + modes.get(mode).modePage, + 8.0f, + 24.0f, + 16.0f, + 176.0f, + Position.LEFT); modes.get(mode).infoTabs.setValues(modes.get(mode).infoPages.getValues()); CraftGUIUtil.linkWidgets(modes.get(mode).infoTabs, modes.get(mode).infoPages); } @@ -236,6 +250,7 @@ public abstract class WindowAbstractDatabase extends Window { } public enum Mode implements IDatabaseMode { + Species, Branches, Breeder; @@ -247,6 +262,7 @@ public abstract class WindowAbstractDatabase extends Window { } public abstract static class ModeWidgets { + public WindowAbstractDatabase database; public ControlPage modePage; public ControlListBox listBox; @@ -268,7 +284,8 @@ public abstract class WindowAbstractDatabase extends Window { CraftGUIUtil.alignToWidget(listBox, database.panelSearch); CraftGUIUtil.moveWidget(listBox, new IPoint(2.0f, 2.0f)); CraftGUIUtil.alignToWidget( - infoPages = new ControlPages<>(modePage, 0.0f, 0.0f, 144.0f, 176.0f), database.panelInformation); + infoPages = new ControlPages<>(modePage, 0.0f, 0.0f, 144.0f, 176.0f), + database.panelInformation); } public abstract void createListBox(IArea area); diff --git a/src/main/java/binnie/core/craftgui/events/Event.java b/src/main/java/binnie/core/craftgui/events/Event.java index efb9cc6e..990c0906 100644 --- a/src/main/java/binnie/core/craftgui/events/Event.java +++ b/src/main/java/binnie/core/craftgui/events/Event.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class Event { + IWidget origin; public Event(IWidget origin) { diff --git a/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java b/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java index 5c578dc4..0817b88f 100644 --- a/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java +++ b/src/main/java/binnie/core/craftgui/events/EventButtonClicked.java @@ -3,11 +3,13 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventButtonClicked extends Event { + public EventButtonClicked(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(EventButtonClicked.class); } diff --git a/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java b/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java index c53e29a5..08e12d61 100644 --- a/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventCycleChanged.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventCycleChanged extends Event { + public int value; public EventCycleChanged(IWidget origin, int value) { diff --git a/src/main/java/binnie/core/craftgui/events/EventHandler.java b/src/main/java/binnie/core/craftgui/events/EventHandler.java index ae94040c..c9b7aa6b 100644 --- a/src/main/java/binnie/core/craftgui/events/EventHandler.java +++ b/src/main/java/binnie/core/craftgui/events/EventHandler.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public abstract class EventHandler { + Class eventClass; Origin origin; IWidget relative; @@ -25,6 +26,7 @@ public abstract class EventHandler { } public enum Origin { + Any, Self, Parent, diff --git a/src/main/java/binnie/core/craftgui/events/EventKey.java b/src/main/java/binnie/core/craftgui/events/EventKey.java index c1c67f78..34c1cd6e 100644 --- a/src/main/java/binnie/core/craftgui/events/EventKey.java +++ b/src/main/java/binnie/core/craftgui/events/EventKey.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public abstract class EventKey extends Event { + char character; int key; @@ -21,11 +22,13 @@ public abstract class EventKey extends Event { } public static class Down extends EventKey { + public Down(IWidget origin, char character, int key) { super(origin, character, key); } public abstract static class Handler extends EventHandler { + public Handler() { super(Down.class); } diff --git a/src/main/java/binnie/core/craftgui/events/EventMouse.java b/src/main/java/binnie/core/craftgui/events/EventMouse.java index 711707ed..680dd638 100644 --- a/src/main/java/binnie/core/craftgui/events/EventMouse.java +++ b/src/main/java/binnie/core/craftgui/events/EventMouse.java @@ -3,11 +3,13 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public abstract class EventMouse extends Event { + public EventMouse(IWidget origin) { super(origin); } public static class Button extends EventMouse { + protected int x; protected int y; protected int button; @@ -33,11 +35,13 @@ public abstract class EventMouse extends Event { } public static class Down extends Button { + public Down(IWidget currentMousedOverWidget, int x, int y, int button) { super(currentMousedOverWidget, x, y, button); } public abstract static class Handler extends EventHandler { + public Handler() { super(Down.class); } @@ -45,11 +49,13 @@ public abstract class EventMouse extends Event { } public static class Up extends Button { + public Up(IWidget currentMousedOverWidget, int x, int y, int button) { super(currentMousedOverWidget, x, y, button); } public abstract static class Handler extends EventHandler { + public Handler() { super(Up.class); } @@ -57,6 +63,7 @@ public abstract class EventMouse extends Event { } public static class Move extends EventMouse { + protected float dx; protected float dy; @@ -75,6 +82,7 @@ public abstract class EventMouse extends Event { } public abstract static class Handler extends EventHandler { + public Handler() { super(Move.class); } @@ -82,11 +90,13 @@ public abstract class EventMouse extends Event { } public static class Drag extends Move { + public Drag(IWidget draggedWidget, float dx, float dy) { super(draggedWidget, dx, dy); } public abstract static class Handler extends EventHandler { + public Handler() { super(Drag.class); } @@ -94,6 +104,7 @@ public abstract class EventMouse extends Event { } public static class Wheel extends EventMouse { + protected int dWheel; public Wheel(IWidget origin, int dWheel) { @@ -107,6 +118,7 @@ public abstract class EventMouse extends Event { } public abstract static class Handler extends EventHandler { + public Handler() { super(Wheel.class); } diff --git a/src/main/java/binnie/core/craftgui/events/EventTextEdit.java b/src/main/java/binnie/core/craftgui/events/EventTextEdit.java index 35619672..e2bcb5da 100644 --- a/src/main/java/binnie/core/craftgui/events/EventTextEdit.java +++ b/src/main/java/binnie/core/craftgui/events/EventTextEdit.java @@ -3,11 +3,13 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventTextEdit extends EventValueChanged { + public EventTextEdit(IWidget origin, String text) { super(origin, text); } public abstract static class Handler extends EventHandler { + public Handler() { super(EventTextEdit.class); } diff --git a/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java b/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java index a6b67ad7..22a2d344 100644 --- a/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java +++ b/src/main/java/binnie/core/craftgui/events/EventToggleButtonClicked.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventToggleButtonClicked extends Event { + protected boolean toggled; public EventToggleButtonClicked(IWidget origin, boolean toggled) { diff --git a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java index f07edb05..574ec5be 100644 --- a/src/main/java/binnie/core/craftgui/events/EventValueChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventValueChanged.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventValueChanged extends Event { + public T value; public EventValueChanged(IWidget origin, T value) { @@ -15,6 +16,7 @@ public class EventValueChanged extends Event { } public abstract static class Handler extends EventHandler { + public Handler() { super(EventValueChanged.class); } diff --git a/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java b/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java index b5b24718..8944eefc 100644 --- a/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java +++ b/src/main/java/binnie/core/craftgui/events/EventValuesChanged.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventValuesChanged extends Event { + public T[] values; public EventValuesChanged(IWidget origin, T[] values) { diff --git a/src/main/java/binnie/core/craftgui/events/EventWidget.java b/src/main/java/binnie/core/craftgui/events/EventWidget.java index 9a8ad01b..1bea942a 100644 --- a/src/main/java/binnie/core/craftgui/events/EventWidget.java +++ b/src/main/java/binnie/core/craftgui/events/EventWidget.java @@ -3,16 +3,19 @@ package binnie.core.craftgui.events; import binnie.core.craftgui.IWidget; public class EventWidget extends Event { + public EventWidget(IWidget origin) { super(origin); } public static class Enable extends EventWidget { + public Enable(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(Enable.class); } @@ -20,11 +23,13 @@ public class EventWidget extends Event { } public static class Disable extends EventWidget { + public Disable(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(Disable.class); } @@ -32,11 +37,13 @@ public class EventWidget extends Event { } public static class Show extends EventWidget { + public Show(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(Show.class); } @@ -44,11 +51,13 @@ public class EventWidget extends Event { } public static class Hide extends EventWidget { + public Hide(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(Hide.class); } @@ -56,11 +65,13 @@ public class EventWidget extends Event { } public static class ChangePosition extends EventWidget { + public ChangePosition(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(ChangePosition.class); } @@ -68,11 +79,13 @@ public class EventWidget extends Event { } public static class ChangeSize extends EventWidget { + public ChangeSize(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(ChangeSize.class); } @@ -80,11 +93,13 @@ public class EventWidget extends Event { } public static class ChangeOffset extends EventWidget { + public ChangeOffset(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(ChangeOffset.class); } @@ -92,11 +107,13 @@ public class EventWidget extends Event { } public static class ChangeColour extends EventWidget { + public ChangeColour(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(ChangeColour.class); } @@ -104,11 +121,13 @@ public class EventWidget extends Event { } public static class StartMouseOver extends EventWidget { + public StartMouseOver(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(StartMouseOver.class); } @@ -116,11 +135,13 @@ public class EventWidget extends Event { } public static class EndMouseOver extends EventWidget { + public EndMouseOver(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(EndMouseOver.class); } @@ -128,6 +149,7 @@ public class EventWidget extends Event { } public static class StartDrag extends EventWidget { + protected int button; public StartDrag(IWidget origin, int button) { @@ -140,6 +162,7 @@ public class EventWidget extends Event { } public abstract static class Handler extends EventHandler { + public Handler() { super(StartDrag.class); } @@ -147,11 +170,13 @@ public class EventWidget extends Event { } public static class EndDrag extends EventWidget { + public EndDrag(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(EndDrag.class); } @@ -159,11 +184,13 @@ public class EventWidget extends Event { } public static class GainFocus extends EventWidget { + public GainFocus(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(GainFocus.class); } @@ -171,11 +198,13 @@ public class EventWidget extends Event { } public static class LoseFocus extends EventWidget { + public LoseFocus(IWidget origin) { super(origin); } public abstract static class Handler extends EventHandler { + public Handler() { super(LoseFocus.class); } diff --git a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java index 386fbd4b..7401e559 100644 --- a/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java +++ b/src/main/java/binnie/core/craftgui/geometry/CraftGUIUtil.java @@ -5,6 +5,7 @@ import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.events.EventValueChanged; public class CraftGUIUtil { + public static void alignToWidget(IWidget target, IWidget relativeTo) { IPoint startPos = target.getAbsolutePosition(); IPoint endPos = relativeTo.getAbsolutePosition(); @@ -49,6 +50,7 @@ public class CraftGUIUtil { public static void linkWidgets(IControlValue tab, IControlValue target) { tab.addSelfEventHandler(new EventValueChanged.Handler() { + @Override public void onEvent(EventValueChanged event) { target.setValue((T) event.getValue()); @@ -56,6 +58,7 @@ public class CraftGUIUtil { }); target.addSelfEventHandler(new EventValueChanged.Handler() { + @Override public void onEvent(EventValueChanged event) { tab.setValue((T) event.getValue()); diff --git a/src/main/java/binnie/core/craftgui/geometry/IArea.java b/src/main/java/binnie/core/craftgui/geometry/IArea.java index b5527724..75e9fd52 100644 --- a/src/main/java/binnie/core/craftgui/geometry/IArea.java +++ b/src/main/java/binnie/core/craftgui/geometry/IArea.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.geometry; public class IArea { + private IPoint pos; private IPoint size; @@ -54,8 +55,7 @@ public class IArea { } public boolean contains(IPoint position) { - return position.x() >= pos().x() - && position.y() >= pos.y() + return position.x() >= pos().x() && position.y() >= pos.y() && position.x() <= pos().x() + size().x() && position.y() <= pos().y() + size().y(); } @@ -94,7 +94,10 @@ public class IArea { public IArea inset(IBorder border) { return new IArea( - x() + border.l(), y() + border.t(), w() - border.l() - border.r(), h() - border.t() - border.b()); + x() + border.l(), + y() + border.t(), + w() - border.l() - border.r(), + h() - border.t() - border.b()); } public IArea outset(int outset) { @@ -103,7 +106,10 @@ public class IArea { public IArea outset(IBorder border) { return new IArea( - x() - border.l(), y() - border.t(), w() + border.l() + border.r(), h() + border.t() + border.b()); + x() - border.l(), + y() - border.t(), + w() + border.l() + border.r(), + h() + border.t() + border.b()); } public IArea inset(int inset) { diff --git a/src/main/java/binnie/core/craftgui/geometry/IBorder.java b/src/main/java/binnie/core/craftgui/geometry/IBorder.java index 33e20194..5fb13311 100644 --- a/src/main/java/binnie/core/craftgui/geometry/IBorder.java +++ b/src/main/java/binnie/core/craftgui/geometry/IBorder.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.geometry; public class IBorder { + public static IBorder ZERO = new IBorder(0.0f); protected float t; diff --git a/src/main/java/binnie/core/craftgui/geometry/IPoint.java b/src/main/java/binnie/core/craftgui/geometry/IPoint.java index 615d0aee..dba74491 100644 --- a/src/main/java/binnie/core/craftgui/geometry/IPoint.java +++ b/src/main/java/binnie/core/craftgui/geometry/IPoint.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.geometry; public class IPoint { + public static IPoint ZERO = new IPoint(0.0f, 0.0f); protected float x; diff --git a/src/main/java/binnie/core/craftgui/geometry/Position.java b/src/main/java/binnie/core/craftgui/geometry/Position.java index 3340345a..a8a00071 100644 --- a/src/main/java/binnie/core/craftgui/geometry/Position.java +++ b/src/main/java/binnie/core/craftgui/geometry/Position.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.geometry; public enum Position { + TOP(0, -1), BOTTOM(0, 1), LEFT(-1, 0), diff --git a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java index 45fbc62b..a6c37b04 100644 --- a/src/main/java/binnie/core/craftgui/geometry/TextJustification.java +++ b/src/main/java/binnie/core/craftgui/geometry/TextJustification.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.geometry; public enum TextJustification { + TOP_LEFT(0.0f, 0.0f), TOP_CENTER(0.5f, 0.0f), TOP_RIGHT(1.0f, 0.0f), diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index 57c9d3c1..446a0f99 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -1,5 +1,19 @@ package binnie.core.craftgui.minecraft; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.BinnieCore; import binnie.core.craftgui.minecraft.control.ControlSlot; import binnie.core.craftgui.minecraft.control.EnumHighlighting; @@ -16,22 +30,12 @@ import binnie.core.machines.power.ProcessInfo; import binnie.core.machines.power.TankInfo; import binnie.core.machines.transfer.TransferRequest; import binnie.core.network.packet.MessageContainerUpdate; + import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class ContainerCraftGUI extends Container { + private Window window; private Map syncedNBT; private Map sentNBT; @@ -193,8 +197,7 @@ public class ContainerCraftGUI extends Container { if (shiftClickedSlot.inventory == playerInventory) { request = new TransferRequest(itemstack, fromPlayer).setOrigin(shiftClickedSlot.inventory); } else { - request = new TransferRequest(itemstack, playerInventory) - .setOrigin(shiftClickedSlot.inventory) + request = new TransferRequest(itemstack, playerInventory).setOrigin(shiftClickedSlot.inventory) .setTargetSlots(target); } @@ -210,11 +213,8 @@ public class ContainerCraftGUI extends Container { } ItemStack heldItem = player.inventory.getItemStack().copy(); - heldItem = new TransferRequest(heldItem, window.getInventory()) - .setOrigin(player.inventory) - .setTargetSlots(new int[0]) - .setTargetTanks(new int[] {slotID}) - .transfer(true); + heldItem = new TransferRequest(heldItem, window.getInventory()).setOrigin(player.inventory) + .setTargetSlots(new int[0]).setTargetTanks(new int[] { slotID }).transfer(true); player.inventory.setItemStack(heldItem); if (player instanceof EntityPlayerMP) { ((EntityPlayerMP) player).updateHeldItem(); diff --git a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java index 9e836151..ea518eac 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/CustomSlot.java @@ -1,14 +1,16 @@ package binnie.core.craftgui.minecraft; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.IInventorySlots; -import binnie.core.machines.inventory.InventorySlot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.IInventorySlots; +import binnie.core.machines.inventory.InventorySlot; + public class CustomSlot extends Slot { + public CustomSlot(IInventory inventory, int index) { super(inventory, index, 0, 0); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java index 213e4c57..37ce7a6e 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Dialog.java @@ -10,6 +10,7 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public abstract class Dialog extends Control { + public Dialog(IWidget parent, float w, float h) { super(parent, (parent.w() - w) / 2.0f, (parent.h() - h) / 2.0f, w, h); addAttribute(WidgetAttribute.MOUSE_OVER); @@ -37,6 +38,7 @@ public abstract class Dialog extends Control { } private class MouseDownHandler extends EventMouse.Down.Handler { + @Override public void onEvent(EventMouse.Down event) { if (!getArea().contains(getRelativeMousePosition())) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java b/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java index 030b8762..e1d3096b 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java +++ b/src/main/java/binnie/core/craftgui/minecraft/EnumColor.java @@ -2,6 +2,7 @@ package binnie.core.craftgui.minecraft; // TODO replace to EnumChatFormatting? public enum EnumColor { + Black("Black", 0, '0'), DarkBlue("Dark Blue", 170, '1'), DarkGreen("Dark Green", 43520, '2'), diff --git a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java index a70b85b0..505d0b50 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GUIIcon.java @@ -1,11 +1,13 @@ package binnie.core.craftgui.minecraft; +import net.minecraft.util.IIcon; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.resource.BinnieIcon; -import net.minecraft.util.IIcon; public enum GUIIcon { + ArrowUp("arrow-up"), ArrowDown("arrow-down"), ArrowLeft("arrow-left"), diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index bb16a451..f46d6bc3 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -1,17 +1,8 @@ package binnie.core.craftgui.minecraft; -import binnie.core.BinnieCore; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.Tooltip; -import binnie.core.craftgui.events.EventKey; -import binnie.core.craftgui.events.EventMouse; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.geometry.IBorder; -import binnie.core.craftgui.geometry.IPoint; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -26,12 +17,25 @@ import net.minecraft.nbt.NBTException; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import binnie.core.BinnieCore; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.Tooltip; +import binnie.core.craftgui.events.EventKey; +import binnie.core.craftgui.events.EventMouse; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IBorder; +import binnie.core.craftgui.geometry.IPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiCraftGUI extends GuiContainer { + private Window window; private ItemStack draggedItem; @@ -72,9 +76,7 @@ public class GuiCraftGUI extends GuiContainer { @Override public void drawScreen(int mouseX, int mouseY, float par3) { - window.setMousePosition( - mouseX - (int) window.getPosition().x(), - mouseY - (int) window.getPosition().y()); + window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y()); drawDefaultBackground(); GL11.glDisable(32826); // GL_RESCALE_NORMAL_EXT @@ -292,7 +294,12 @@ public class GuiCraftGUI extends GuiContainer { drawTexturedModalRect(posX, posY, u, v, borderLeft, borderTop); drawTexturedModalRect(posX + width - borderRight, posY, u + textWidth - borderRight, v, borderRight, borderTop); drawTexturedModalRect( - posX, posY + height - borderBottom, u, v + textHeight - borderBottom, borderLeft, borderBottom); + posX, + posY + height - borderBottom, + u, + v + textHeight - borderBottom, + borderLeft, + borderBottom); drawTexturedModalRect( posX + width - borderRight, posY + height - borderBottom, diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java index 7920ef16..a81854ec 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMachineInformation.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.minecraft; public interface IMachineInformation { + String getInformation(); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java index 2451b99f..0ac8fbfa 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IMinecraftTooltip.java @@ -3,5 +3,6 @@ package binnie.core.craftgui.minecraft; import binnie.core.craftgui.ITooltip; public interface IMinecraftTooltip extends ITooltip { + void getTooltip(MinecraftTooltip p0); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java index 7ef92184..dc629929 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java +++ b/src/main/java/binnie/core/craftgui/minecraft/IWindowAffectsShiftClick.java @@ -3,5 +3,6 @@ package binnie.core.craftgui.minecraft; import binnie.core.machines.transfer.TransferRequest; public interface IWindowAffectsShiftClick { + void alterRequest(TransferRequest p0); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java index 74433d98..aafdc578 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ListMap.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ListMap.java @@ -8,6 +8,7 @@ import java.util.ListIterator; import java.util.Map; class ListMap implements List { + private LinkedHashMap map; ListMap() { diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java index 6cac6054..aafcf2ed 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.minecraft; import binnie.core.craftgui.window.Panel; public class MinecraftGUI { + public enum PanelType implements Panel.IPanelType { Black, Gray, diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index 716b1602..edbd6740 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -1,9 +1,11 @@ package binnie.core.craftgui.minecraft; -import binnie.core.craftgui.Tooltip; import net.minecraft.util.EnumChatFormatting; +import binnie.core.craftgui.Tooltip; + public class MinecraftTooltip extends Tooltip { + public static int getOutline(ITooltipType type) { return TypeColor.valueOf(type.toString()).getOutline(); } @@ -22,6 +24,7 @@ public class MinecraftTooltip extends Tooltip { } private enum TypeColor { + STANDARD(0x5000ff, EnumChatFormatting.WHITE, EnumChatFormatting.GRAY), HELP(0x4cff00, EnumChatFormatting.GREEN, EnumChatFormatting.DARK_GREEN), INFORMATION(0x00bfff, EnumChatFormatting.AQUA, EnumChatFormatting.DARK_AQUA), diff --git a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java index e99d7fd8..3ed496da 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ModuleCraftGUI.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.minecraft; import binnie.core.IInitializable; public class ModuleCraftGUI implements IInitializable { + @Override public void preInit() {} diff --git a/src/main/java/binnie/core/craftgui/minecraft/Window.java b/src/main/java/binnie/core/craftgui/minecraft/Window.java index 3f67a076..c2463dcb 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/core/craftgui/minecraft/Window.java @@ -1,5 +1,14 @@ package binnie.core.craftgui.minecraft; +import java.util.ArrayList; +import java.util.Deque; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -32,18 +41,14 @@ import binnie.core.machines.power.PowerSystem; import binnie.core.network.packet.MessageCraftGUI; import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.Deque; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT { + protected float titleButtonLeft; protected float titleButtonRight; private GuiCraftGUI gui; @@ -89,6 +94,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } addSelfEventHandler(new EventWidget.ChangeSize.Handler() { + @Override public void onEvent(EventWidget.ChangeSize event) { if (isClient() && getGui() != null) { @@ -161,8 +167,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG public String showInfoButton() { if (Machine.getInterface(IMachineInformation.class, getInventory()) != null) { - return Machine.getInterface(IMachineInformation.class, getInventory()) - .getInformation(); + return Machine.getInterface(IMachineInformation.class, getInventory()).getInformation(); } return null; } diff --git a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java index ddb3e983..36eaec4f 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/WindowInventory.java @@ -1,15 +1,18 @@ package binnie.core.craftgui.minecraft; -import binnie.core.machines.inventory.SlotValidator; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.SlotValidator; + public class WindowInventory implements IInventory { + private Window window; private Map inventory; private Map validators; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 9238bb4c..73f218f1 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,5 +1,9 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.inventory.IInventory; + +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -17,10 +21,9 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import net.minecraft.inventory.IInventory; -import org.lwjgl.opengl.GL11; public class ControlEnergyBar extends Control implements ITooltip { + public static boolean isError; private Position direction; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java index f136086f..46a5357e 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlErrorState.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.entity.player.InventoryPlayer; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -12,9 +14,9 @@ import binnie.core.craftgui.minecraft.MinecraftTooltip; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.power.ErrorState; -import net.minecraft.entity.player.InventoryPlayer; public class ControlErrorState extends Control implements ITooltip { + private ErrorState errorState; private int type; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java index de27018b..8edd4866 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlHelp.java @@ -10,6 +10,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.util.I18N; public class ControlHelp extends Control implements ITooltip { + public ControlHelp(IWidget parent, float x, float y) { super(parent, x, y, 16.0f, 16.0f); addAttribute(WidgetAttribute.MOUSE_OVER); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java index 62cb7dc9..5e2fcac6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlIconDisplay.java @@ -1,12 +1,14 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.util.IIcon; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IPoint; -import net.minecraft.util.IIcon; public class ControlIconDisplay extends Control { + private IIcon icon; public ControlIconDisplay(IWidget parent, float x, float y, IIcon icon) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java index 5fde3056..e79a7179 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlImage.java @@ -7,6 +7,7 @@ import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.resource.Texture; public class ControlImage extends Control { + private Object key; public ControlImage(IWidget parent, float x, float y, Texture text) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java index 9a206965..8bb61e7c 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlInfo.java @@ -10,6 +10,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.util.I18N; public class ControlInfo extends Control implements ITooltip { + private String info; public ControlInfo(IWidget parent, float x, float y, String info) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java index f1caf8c6..0a78049d 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlItemDisplay.java @@ -1,5 +1,10 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -9,11 +14,9 @@ import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; public class ControlItemDisplay extends Control implements ITooltip { + public boolean hastooltip; private ItemStack itemStack; private boolean rotating; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java index f6579187..f2b796d6 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlLiquidTank.java @@ -1,5 +1,15 @@ package binnie.core.craftgui.minecraft.control; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.Fluid; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -19,15 +29,9 @@ import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.TankInfo; import binnie.core.util.I18N; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.Fluid; -import org.lwjgl.opengl.GL11; public class ControlLiquidTank extends Control implements ITooltip { + public static List tankError = new ArrayList<>(); private int tankID; private boolean horizontal; @@ -42,6 +46,7 @@ public class ControlLiquidTank extends Control implements ITooltip { this.horizontal = horizontal; addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { if (event.getButton() == 0) { @@ -71,8 +76,8 @@ public class ControlLiquidTank extends Control implements ITooltip { @Override public void onRenderBackground() { - CraftGUI.render.texture( - horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO); + CraftGUI.render + .texture(horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO); if (isMouseOver() && Window.get(this).getGui().isHelpMode()) { int c = 0xaa000000 + MinecraftTooltip.getOutline(Tooltip.Type.HELP); CraftGUI.render.gradientRect(getArea().inset(1), c, c); @@ -105,8 +110,7 @@ public class ControlLiquidTank extends Control implements ITooltip { limited.setSize(new IPoint(limited.w() - 1.0f, limited.h())); } - CraftGUI.render.limitArea( - new IArea(limited.pos().add(pos).add(offset), limited.size().sub(offset))); + CraftGUI.render.limitArea(new IArea(limited.pos().add(pos).add(offset), limited.size().sub(offset))); GL11.glEnable(GL11.GL_SCISSOR_TEST); BinnieCore.proxy.bindTexture(TextureMap.locationItemsTexture); for (int y = 0; y < height; y += 16) { @@ -161,8 +165,7 @@ public class ControlLiquidTank extends Control implements ITooltip { if (slot.getValidator() == null) { tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.acceptsAny")); } else { - tooltip.add(I18N.localise( - "binniecore.gui.tooltip.tank.accepts", slot.getValidator().getTooltip())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.accepts", slot.getValidator().getTooltip())); } } @@ -176,13 +179,11 @@ public class ControlLiquidTank extends Control implements ITooltip { int percentage = (int) (100.0 * getTank().getAmount() / getTankCapacity()); tooltip.add(getTank().getName()); tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.full", percentage)); - tooltip.add(I18N.localise( - "binniecore.gui.tooltip.tank.amount", (int) getTank().getAmount())); + tooltip.add(I18N.localise("binniecore.gui.tooltip.tank.amount", (int) getTank().getAmount())); } private TankSlot getTankSlot() { - ITankMachine tank = - Machine.getInterface(ITankMachine.class, Window.get(this).getInventory()); + ITankMachine tank = Machine.getInterface(ITankMachine.class, Window.get(this).getInventory()); return (tank != null) ? tank.getTankSlot(tankID) : null; } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java index 6ca9edc0..bcc0b8d9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlMachineProgress.java @@ -5,6 +5,7 @@ import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.resource.Texture; public class ControlMachineProgress extends ControlProgress { + public ControlMachineProgress(IWidget parent, int x, int y, Texture base, Texture progress, Position dir) { super(parent, x, y, base, progress, dir); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java index 49a84be0..b9af74ec 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java @@ -1,12 +1,14 @@ package binnie.core.craftgui.minecraft.control; +import java.util.ArrayList; +import java.util.List; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.minecraft.InventoryType; -import java.util.ArrayList; -import java.util.List; public class ControlPlayerInventory extends Control { + private List slots; public ControlPlayerInventory(IWidget parent, boolean wide) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java index 3b637dda..23204aa7 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPowerSystem.java @@ -11,6 +11,7 @@ import binnie.core.machines.power.PowerSystem; import binnie.core.util.I18N; public class ControlPowerSystem extends Control implements ITooltip { + private PowerSystem system; public ControlPowerSystem(IWidget parent, float x, float y, PowerSystem system) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java index 2c077530..510f47fd 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgress.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.resource.Texture; public class ControlProgress extends ControlProgressBase { + private Texture progressBlank; private Texture progressBar; private Position direction; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java index cfe71dc5..d76b1431 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlProgressBase.java @@ -11,6 +11,7 @@ import binnie.core.machines.power.ProcessInfo; import binnie.core.util.I18N; public class ControlProgressBase extends Control { + protected float progress; public ControlProgressBase(IWidget parent, float x, float y, float w, float h) { @@ -73,8 +74,7 @@ public class ControlProgressBase extends Control { @Override public void getHelpTooltip(Tooltip tooltip) { ProcessInfo process = getProcess(); - IProcess machineProcess = - Machine.getMachine(Window.get(this).getInventory()).getInterface(IProcess.class); + IProcess machineProcess = Machine.getMachine(Window.get(this).getInventory()).getInterface(IProcess.class); if (process == null) { return; } @@ -90,8 +90,10 @@ public class ControlProgressBase extends Control { } if (process.getProcessTime() > 0) { - tooltip.add(I18N.localise("binniecore.gui.database.time.left", convertTime((int) - ((1.0f - progress) * process.getProcessTime())))); + tooltip.add( + I18N.localise( + "binniecore.gui.database.time.left", + convertTime((int) ((1.0f - progress) * process.getProcessTime())))); tooltip.add(I18N.localise("binniecore.gui.database.time.total", convertTime(process.getProcessTime()))); tooltip.add(I18N.localise("binniecore.gui.database.energyCost.0", process.getProcessEnergy() * 10)); } else { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java index 3513acfe..bcef9f2a 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlide.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.minecraft.control; +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.WidgetAttribute; @@ -11,9 +13,9 @@ import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.resource.Texture; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import org.lwjgl.opengl.GL11; public class ControlSlide extends Control { + private IArea expanded; private IArea shrunk; private boolean slideActive; @@ -42,10 +44,13 @@ public class ControlSlide extends Control { boolean hor = anchor.x() != 0; IArea ar = isSlideActive() ? expanded : shrunk; IArea tabArea = new IArea( - hor ? (-lh / 2.0f) : (-lw / 2.0f), hor ? (-lw / 2.0f) : (-lh / 2.0f), hor ? lh : lw, hor ? lw : lh); + hor ? (-lh / 2.0f) : (-lw / 2.0f), + hor ? (-lw / 2.0f) : (-lh / 2.0f), + hor ? lh : lw, + hor ? lw : lh); IPoint shift = new IPoint(ar.w() * (1 - anchor.x()) / 2.0f, ar.h() * (1 - anchor.y()) / 2.0f); - tabArea = tabArea.shift( - shift.x() - (-3.0f + lh / 2.0f) * anchor.x(), shift.y() - (-3.0f + lh / 2.0f) * anchor.y()); + tabArea = tabArea + .shift(shift.x() - (-3.0f + lh / 2.0f) * anchor.x(), shift.y() - (-3.0f + lh / 2.0f) * anchor.y()); Texture texture = CraftGUI.render .getTexture(isSlideActive() ? CraftGUITexture.Tab : CraftGUITexture.TabDisabled) .crop(anchor.opposite(), 8.0f); @@ -65,10 +70,8 @@ public class ControlSlide extends Control { GL11.glPopMatrix(); } CraftGUI.render.texture(CraftGUITexture.Window, getArea()); - Object slideTexture = (anchor == Position.BOTTOM) - ? CraftGUITexture.SlideDown - : ((anchor == Position.TOP) - ? CraftGUITexture.SlideUp + Object slideTexture = (anchor == Position.BOTTOM) ? CraftGUITexture.SlideDown + : ((anchor == Position.TOP) ? CraftGUITexture.SlideUp : ((anchor == Position.LEFT) ? CraftGUITexture.SlideLeft : CraftGUITexture.SlideRight)); CraftGUI.render.texture( slideTexture, @@ -89,9 +92,7 @@ public class ControlSlide extends Control { @Override public boolean isMouseOverWidget(IPoint relativeMouse) { - return getArea() - .outset(isSlideActive() ? 16 : 8) - .outset(new IBorder(anchor.opposite(), 16.0f)) + return getArea().outset(isSlideActive() ? 16 : 8).outset(new IBorder(anchor.opposite(), 16.0f)) .contains(relativeMouse); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index 8a4cebd1..7880fef9 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java @@ -1,5 +1,17 @@ package binnie.core.craftgui.minecraft.control; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.multiplayer.PlayerControllerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.Tooltip; @@ -15,18 +27,9 @@ import binnie.core.machines.inventory.InventorySlot; import binnie.core.machines.inventory.MachineSide; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.multiplayer.PlayerControllerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class ControlSlot extends ControlSlotBase { + public static Map> highlighting = new HashMap<>(); public static boolean shiftClickActive = false; @@ -42,14 +45,15 @@ public class ControlSlot extends ControlSlotBase { super(parent, x, y); slot = null; addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { if (slot == null) { return; } - PlayerControllerMP playerController = - ((Window) getSuperParent()).getGui().getMinecraft().playerController; + PlayerControllerMP playerController = ((Window) getSuperParent()).getGui() + .getMinecraft().playerController; int windowId = ((Window) getSuperParent()).getContainer().windowId; int slotNumber = slot.slotNumber; int button = event.getButton(); @@ -205,8 +209,7 @@ public class ControlSlot extends ControlSlotBase { if (slot.getValidator() == null) { tooltip.add(I18N.localise("binniecore.gui.slot.accepts", I18N.localise("binniecore.gui.slot.anyItem"))); } else { - tooltip.add(I18N.localise( - "binniecore.gui.slot.accepts", slot.getValidator().getTooltip())); + tooltip.add(I18N.localise("binniecore.gui.slot.accepts", slot.getValidator().getTooltip())); } } else if (this.slot.inventory instanceof WindowInventory) { SlotValidator s = ((WindowInventory) this.slot.inventory).getValidator(this.slot.getSlotIndex()); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java index 44374ca6..dc9eccad 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotArray.java @@ -1,13 +1,15 @@ package binnie.core.craftgui.minecraft.control; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.core.Control; -import binnie.core.craftgui.minecraft.InventoryType; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.core.Control; +import binnie.core.craftgui.minecraft.InventoryType; + public class ControlSlotArray extends Control implements Iterable { + private List slots; public ControlSlotArray(IWidget parent, int x, int y, int columns, int rows) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java index bd9b3997..a429ee88 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotBase.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -11,9 +13,9 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraft.item.ItemStack; public abstract class ControlSlotBase extends Control implements ITooltip { + private ControlItemDisplay itemDisplay; public ControlSlotBase(IWidget parent, float x, float y) { @@ -25,6 +27,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { addAttribute(WidgetAttribute.MOUSE_OVER); itemDisplay = new ControlItemDisplay(this, 1.0f, 1.0f, size - 2); addSelfEventHandler(new EventWidget.ChangeSize.Handler() { + @Override public void onEvent(EventWidget.ChangeSize event) { if (itemDisplay != null) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java index e9a140dc..2d86fe2a 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlotCharge.java @@ -11,6 +11,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; public class ControlSlotCharge extends Control { + private int slot; public ControlSlotCharge(IWidget parent, int x, int y, int slot) { @@ -19,8 +20,7 @@ public class ControlSlotCharge extends Control { } float getCharge() { - IChargedSlots slots = - Machine.getInterface(IChargedSlots.class, Window.get(this).getInventory()); + IChargedSlots slots = Machine.getInterface(IChargedSlots.class, Window.get(this).getInventory()); return (slots == null) ? 0.0f : slots.getCharge(slot); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java index 88fb8813..14cd126a 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlTabIcon.java @@ -1,12 +1,14 @@ package binnie.core.craftgui.minecraft.control; +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.controls.tab.ControlTab; import binnie.core.craftgui.controls.tab.ControlTabBar; import binnie.core.craftgui.geometry.IPoint; import binnie.core.genetics.IItemStackRepresentative; -import net.minecraft.item.ItemStack; public class ControlTabIcon extends ControlTab { + private ControlItemDisplay item; public ControlTabIcon(ControlTabBar parent, float x, float y, float w, float h, T value) { diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java index 430be02a..1708ac16 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlUser.java @@ -10,6 +10,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.util.I18N; public class ControlUser extends Control implements ITooltip { + protected String team; private String username; diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java index 7610c2d0..b3d2c22a 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/EnumHighlighting.java @@ -4,6 +4,7 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.minecraft.MinecraftTooltip; public enum EnumHighlighting { + ERROR, WARNING, HELP, diff --git a/src/main/java/binnie/core/craftgui/renderer/Renderer.java b/src/main/java/binnie/core/craftgui/renderer/Renderer.java index 624985f5..400760c9 100644 --- a/src/main/java/binnie/core/craftgui/renderer/Renderer.java +++ b/src/main/java/binnie/core/craftgui/renderer/Renderer.java @@ -1,5 +1,13 @@ package binnie.core.craftgui.renderer; +import java.util.List; + +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.IArea; @@ -9,13 +17,9 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.GuiCraftGUI; import binnie.core.craftgui.resource.IStyleSheet; import binnie.core.craftgui.resource.Texture; -import java.util.List; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import org.lwjgl.opengl.GL11; public class Renderer { + protected GuiCraftGUI gui; protected int currentColor; protected Texture currentTexture; @@ -90,8 +94,7 @@ public class Renderer { } setTexture(texture); - IPoint point = position.sub( - new IPoint(texture.getBorder().l(), texture.getBorder().t())); + IPoint point = position.sub(new IPoint(texture.getBorder().l(), texture.getBorder().t())); IArea textureArea = texture.getArea().outset(texture.getBorder()); gui.renderTexture(point, textureArea); } @@ -137,8 +140,7 @@ public class Renderer { return; } - List wrappedStrings = gui.getFontRenderer() - .listFormattedStringToWidth(text, (int) area.size().x()); + List wrappedStrings = gui.getFontRenderer().listFormattedStringToWidth(text, (int) area.size().x()); float totalHeight = wrappedStrings.size() * textHeight(); float posY = area.pos().y(); if (area.size().y() > totalHeight) { @@ -206,15 +208,11 @@ public class Renderer { } public float textHeight(String text, float width) { - return gui.getFontRenderer() - .listFormattedStringToWidth(text, (int) width) - .size() - * textHeight(); + return gui.getFontRenderer().listFormattedStringToWidth(text, (int) width).size() * textHeight(); } public void texturePercentage(Texture texture, IArea area, Position direction, float percentage) { - float dist = (direction == Position.TOP || direction == Position.BOTTOM) - ? (percentage * texture.h()) + float dist = (direction == Position.TOP || direction == Position.BOTTOM) ? (percentage * texture.h()) : (percentage * texture.w()); float dim = (direction == Position.TOP || direction == Position.BOTTOM) ? texture.h() : texture.w(); float x = area.pos().x(); diff --git a/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java b/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java index 9f162f96..429e0cf6 100644 --- a/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/IStyleSheet.java @@ -1,5 +1,6 @@ package binnie.core.craftgui.resource; public interface IStyleSheet { + Texture getTexture(Object key); } diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheet.java b/src/main/java/binnie/core/craftgui/resource/StyleSheet.java index 5f0ec54a..b75b0337 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheet.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; public class StyleSheet implements IStyleSheet { + protected Map textures; public StyleSheet() { diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java index 980c32bd..03bbd476 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetManager.java @@ -3,6 +3,7 @@ package binnie.core.craftgui.resource; import binnie.core.craftgui.CraftGUI; public class StyleSheetManager { + static IStyleSheet defaultSS = new DefaultStyleSheet(); public static Texture getTexture(Object key) { @@ -14,6 +15,7 @@ public class StyleSheetManager { } private static class DefaultStyleSheet implements IStyleSheet { + @Override public Texture getTexture(Object key) { return CraftGUI.resourceManager.getTexture(key.toString()); diff --git a/src/main/java/binnie/core/craftgui/resource/Texture.java b/src/main/java/binnie/core/craftgui/resource/Texture.java index 7f8f6f11..a75cb8dd 100644 --- a/src/main/java/binnie/core/craftgui/resource/Texture.java +++ b/src/main/java/binnie/core/craftgui/resource/Texture.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.geometry.Position; import binnie.core.resource.BinnieResource; public class Texture { + public static Texture NULL = null; IArea area; IBorder padding; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java index a307e20e..b6d6a370 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -1,17 +1,5 @@ package binnie.core.craftgui.resource.minecraft; -import binnie.core.craftgui.CraftGUI; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.geometry.IBorder; -import binnie.core.craftgui.resource.Texture; -import binnie.core.resource.IBinnieTexture; -import com.google.common.base.Charsets; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.google.gson.JsonParser; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -19,14 +7,32 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.util.ResourceLocation; + import org.apache.commons.io.IOUtils; +import binnie.core.craftgui.CraftGUI; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.geometry.IBorder; +import binnie.core.craftgui.resource.Texture; +import binnie.core.resource.IBinnieTexture; + +import com.google.common.base.Charsets; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonParser; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class CraftGUIResourceManager implements IResourceManagerReloadListener { + private Map textureSheets; private Map textures; @@ -61,8 +67,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { if (el instanceof JsonObject) { JsonObject sheet = (JsonObject) el; String name = sheet.get("name").getAsString(); - IBinnieTexture textureSheet = - getTextureSheet(sheet.get("sheet").getAsString()); + IBinnieTexture textureSheet = getTextureSheet(sheet.get("sheet").getAsString()); IArea uv = getArea(sheet.get("uv").getAsString()); IBorder border = IBorder.ZERO; IBorder padding = IBorder.ZERO; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java index 08d443e4..6cd47aa9 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java @@ -1,6 +1,7 @@ package binnie.core.craftgui.resource.minecraft; public enum CraftGUITexture { + Window("window"), PanelGray("panel.gray"), PanelBlack("panel.black"), diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java index 56e35983..21229934 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITextureSheet.java @@ -6,6 +6,7 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; public enum CraftGUITextureSheet implements IBinnieTexture { + Controls2("controls"), Panel2("panels"), Slots("slots"); diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java index 4ae3a4c1..13b5c57c 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/PaddedTexture.java @@ -7,31 +7,14 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; public class PaddedTexture extends Texture { - public PaddedTexture( - int u, - int v, - int w, - int h, - int offset, - IBinnieTexture textureFile, - int leftPadding, - int rightPadding, - int topPadding, - int bottomPadding) { + + public PaddedTexture(int u, int v, int w, int h, int offset, IBinnieTexture textureFile, int leftPadding, + int rightPadding, int topPadding, int bottomPadding) { this(u, v, w, h, offset, textureFile.getTexture(), leftPadding, rightPadding, topPadding, bottomPadding); } - public PaddedTexture( - int u, - int v, - int w, - int h, - int offset, - BinnieResource textureFile, - int leftPadding, - int rightPadding, - int topPadding, - int bottomPadding) { + public PaddedTexture(int u, int v, int w, int h, int offset, BinnieResource textureFile, int leftPadding, + int rightPadding, int topPadding, int bottomPadding) { super( new IArea(u, v, w, h), new IBorder(topPadding, rightPadding, bottomPadding, leftPadding), diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java index f02af54c..544eaf6b 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/ParsedTextureSheet.java @@ -5,6 +5,7 @@ import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; class ParsedTextureSheet implements IBinnieTexture { + private String name; private String modid; private String path; diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java index b2020828..d8845be9 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java +++ b/src/main/java/binnie/core/craftgui/resource/minecraft/StandardTexture.java @@ -7,6 +7,7 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; public class StandardTexture extends Texture { + public StandardTexture(int u, int v, int w, int h, IBinnieTexture textureFile) { this(u, v, w, h, 0, textureFile.getTexture()); } diff --git a/src/main/java/binnie/core/craftgui/window/Panel.java b/src/main/java/binnie/core/craftgui/window/Panel.java index 92b3be28..163b2d33 100644 --- a/src/main/java/binnie/core/craftgui/window/Panel.java +++ b/src/main/java/binnie/core/craftgui/window/Panel.java @@ -8,6 +8,7 @@ import binnie.core.craftgui.minecraft.MinecraftGUI; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; public class Panel extends Control { + protected IPanelType type; public Panel(IWidget parent, float x, float y, float width, float height, IPanelType type) { @@ -51,5 +52,6 @@ public class Panel extends Control { return type; } - public interface IPanelType {} + public interface IPanelType { + } } diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index c41d0ee9..5f5629c2 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -1,5 +1,10 @@ package binnie.core.genetics; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; @@ -18,11 +23,9 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.alleles.EnumAllele; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; class BeeBreedingSystem extends BreedingSystem { + public BeeBreedingSystem() { iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); @@ -30,15 +33,12 @@ class BeeBreedingSystem extends BreedingSystem { @Override public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) { - return ((IBeeMutation) mutation) - .getChance( - new VirtualBeeHousing(player), - (IAlleleBeeSpecies) species1, - (IAlleleBeeSpecies) species2, - (IBeeGenome) getSpeciesRoot() - .templateAsGenome(getSpeciesRoot().getTemplate(species1.getUID())), - (IBeeGenome) getSpeciesRoot() - .templateAsGenome(getSpeciesRoot().getTemplate(species2.getUID()))); + return ((IBeeMutation) mutation).getChance( + new VirtualBeeHousing(player), + (IAlleleBeeSpecies) species1, + (IAlleleBeeSpecies) species2, + (IBeeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species1.getUID())), + (IBeeGenome) getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species2.getUID()))); } @Override @@ -82,12 +82,8 @@ class BeeBreedingSystem extends BreedingSystem { @Override public int[] getActiveTypes() { - return new int[] { - EnumBeeType.DRONE.ordinal(), - EnumBeeType.PRINCESS.ordinal(), - EnumBeeType.QUEEN.ordinal(), - EnumBeeType.LARVAE.ordinal() - }; + return new int[] { EnumBeeType.DRONE.ordinal(), EnumBeeType.PRINCESS.ordinal(), EnumBeeType.QUEEN.ordinal(), + EnumBeeType.LARVAE.ordinal() }; } @Override diff --git a/src/main/java/binnie/core/genetics/BeeModifierLogic.java b/src/main/java/binnie/core/genetics/BeeModifierLogic.java index 2864cb90..27c884fb 100644 --- a/src/main/java/binnie/core/genetics/BeeModifierLogic.java +++ b/src/main/java/binnie/core/genetics/BeeModifierLogic.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; public class BeeModifierLogic { + private Map modifiers; private List booleanModifiers; @@ -44,6 +45,6 @@ public class BeeModifierLogic { } public void setModifier(EnumBeeModifier modifier, float mult, float max) { - modifiers.put(modifier, new Float[] {mult, max}); + modifiers.put(modifier, new Float[] { mult, max }); } } diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index d82eb3a3..77040607 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -1,10 +1,27 @@ package binnie.core.genetics; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; + import binnie.Binnie; import binnie.core.resource.BinnieIcon; import binnie.core.util.I18N; import binnie.extrabees.genetics.ExtraBeeMutation; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import forestry.api.core.ForestryEvent; import forestry.api.genetics.AlleleManager; @@ -18,21 +35,9 @@ import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; public abstract class BreedingSystem implements IItemStackRepresentative { + public float discoveredSpeciesPercentage; public int totalSpeciesCount; public int discoveredSpeciesCount; @@ -99,8 +104,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { } public void calculateArrays() { - Collection allAlleles = - AlleleManager.alleleRegistry.getRegisteredAlleles().values(); + Collection allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values(); resultantMutations = new HashMap<>(); furtherMutations = new HashMap<>(); allActiveSpecies = new ArrayList<>(); @@ -118,8 +122,8 @@ public abstract class BreedingSystem implements IItemStackRepresentative { } allMutations = new ArrayList<>(); - Collection allRegBranches = - AlleleManager.alleleRegistry.getRegisteredClassifications().values(); + Collection allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications() + .values(); allBranches = new ArrayList<>(); for (IClassification branch : allRegBranches) { if (branch.getMemberSpecies().length > 0 @@ -373,8 +377,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { public String getAlleleName(IChromosomeType chromosome, IAllele allele) { if (allele instanceof IAlleleBoolean) { - return ((IAlleleBoolean) allele).getValue() - ? I18N.localise("binniecore.allele.true") + return ((IAlleleBoolean) allele).getValue() ? I18N.localise("binniecore.allele.true") : I18N.localise("binniecore.allele.false"); } if (allele.getName().equals("for.gui.maximum")) { diff --git a/src/main/java/binnie/core/genetics/EnumBeeModifier.java b/src/main/java/binnie/core/genetics/EnumBeeModifier.java index 49dd0618..d9acf43d 100644 --- a/src/main/java/binnie/core/genetics/EnumBeeModifier.java +++ b/src/main/java/binnie/core/genetics/EnumBeeModifier.java @@ -3,6 +3,7 @@ package binnie.core.genetics; import binnie.core.util.I18N; public enum EnumBeeModifier { + TERRITORY, MUTATION, LIFESPAN, diff --git a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java index 9119de7a..e04cecdd 100644 --- a/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/FlowerBreedingSystem.java @@ -1,5 +1,10 @@ package binnie.core.genetics; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.EnumFlowerStage; @@ -19,11 +24,9 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.alleles.EnumAllele; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; class FlowerBreedingSystem extends BreedingSystem { + public FlowerBreedingSystem() { iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); @@ -80,9 +83,8 @@ class FlowerBreedingSystem extends BreedingSystem { @Override public int[] getActiveTypes() { - return new int[] { - EnumFlowerStage.FLOWER.ordinal(), EnumFlowerStage.POLLEN.ordinal(), EnumFlowerStage.SEED.ordinal() - }; + return new int[] { EnumFlowerStage.FLOWER.ordinal(), EnumFlowerStage.POLLEN.ordinal(), + EnumFlowerStage.SEED.ordinal() }; } @Override diff --git a/src/main/java/binnie/core/genetics/ForestryAllele.java b/src/main/java/binnie/core/genetics/ForestryAllele.java index 95285be9..be59d345 100644 --- a/src/main/java/binnie/core/genetics/ForestryAllele.java +++ b/src/main/java/binnie/core/genetics/ForestryAllele.java @@ -4,7 +4,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; public class ForestryAllele { + public enum Lifespan { + Shortest, Shorter, Short, @@ -21,6 +23,7 @@ public class ForestryAllele { } public enum Speed { + Slowest, Slower, Slow, @@ -35,6 +38,7 @@ public class ForestryAllele { } public enum Fertility { + Low, Normal, High, @@ -46,6 +50,7 @@ public class ForestryAllele { } public enum Territory { + Default, Large, Larger, @@ -57,6 +62,7 @@ public class ForestryAllele { } public enum Size { + Smallest, Smaller, Small, @@ -71,6 +77,7 @@ public class ForestryAllele { } public enum Bool { + True, False; @@ -84,6 +91,7 @@ public class ForestryAllele { } public enum Int { + Int1, Int2, Int3, diff --git a/src/main/java/binnie/core/genetics/Gene.java b/src/main/java/binnie/core/genetics/Gene.java index 962dda8d..4e0617e8 100644 --- a/src/main/java/binnie/core/genetics/Gene.java +++ b/src/main/java/binnie/core/genetics/Gene.java @@ -1,5 +1,7 @@ package binnie.core.genetics; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.genetics.api.IGene; import forestry.api.core.INBTTagable; @@ -7,9 +9,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.nbt.NBTTagCompound; public class Gene implements INBTTagable, IGene { + private IAllele allele; private IChromosomeType chromosome; private ISpeciesRoot root; diff --git a/src/main/java/binnie/core/genetics/IItemStackRepresentative.java b/src/main/java/binnie/core/genetics/IItemStackRepresentative.java index 2fba28f7..d3fc0a25 100644 --- a/src/main/java/binnie/core/genetics/IItemStackRepresentative.java +++ b/src/main/java/binnie/core/genetics/IItemStackRepresentative.java @@ -3,5 +3,6 @@ package binnie.core.genetics; import net.minecraft.item.ItemStack; public interface IItemStackRepresentative { + ItemStack getItemStackRepresentative(); } diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 03bb2227..830d593c 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -1,5 +1,16 @@ package binnie.core.genetics; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeSet; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.world.WorldEvent; + import binnie.Binnie; import binnie.botany.api.IFlowerRoot; import binnie.botany.genetics.AlleleColor; @@ -19,17 +30,9 @@ import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.IButterflyRoot; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.world.WorldEvent; public class ManagerGenetics extends ManagerBase { + public BreedingSystem beeBreedingSystem; public BreedingSystem treeBreedingSystem; public BreedingSystem mothBreedingSystem; @@ -200,6 +203,7 @@ public class ManagerGenetics extends ManagerBase { } static class ComparatorAllele implements Comparator { + @Override public int compare(IAllele o1, IAllele o2) { if (o1 == null || o2 == null) { @@ -211,9 +215,9 @@ public class ManagerGenetics extends ManagerBase { if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) { return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); } - // if (o1.getName() != null && o2.getName() != null) { - // return o1.getName().compareTo(o2.getName()); - // } + // if (o1.getName() != null && o2.getName() != null) { + // return o1.getName().compareTo(o2.getName()); + // } return o1.getUID().compareTo(o2.getUID()); } } diff --git a/src/main/java/binnie/core/genetics/MothBreedingSystem.java b/src/main/java/binnie/core/genetics/MothBreedingSystem.java index 69ce72a1..3a7eca55 100644 --- a/src/main/java/binnie/core/genetics/MothBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/MothBreedingSystem.java @@ -1,5 +1,10 @@ package binnie.core.genetics; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; @@ -13,11 +18,9 @@ import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterflyRoot; import forestry.api.lepidopterology.ILepidopteristTracker; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; class MothBreedingSystem extends BreedingSystem { + public MothBreedingSystem() { iconUndiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/undiscoveredMoth"); iconDiscovered = Binnie.Resource.getItemIcon(ExtraTrees.instance, "icon/discoveredMoth"); @@ -80,9 +83,8 @@ class MothBreedingSystem extends BreedingSystem { @Override public int[] getActiveTypes() { - return new int[] { - EnumFlutterType.BUTTERFLY.ordinal(), EnumFlutterType.CATERPILLAR.ordinal(), EnumFlutterType.SERUM.ordinal() - }; + return new int[] { EnumFlutterType.BUTTERFLY.ordinal(), EnumFlutterType.CATERPILLAR.ordinal(), + EnumFlutterType.SERUM.ordinal() }; } @Override diff --git a/src/main/java/binnie/core/genetics/Tolerance.java b/src/main/java/binnie/core/genetics/Tolerance.java index 57b1d0a5..70c27f0d 100644 --- a/src/main/java/binnie/core/genetics/Tolerance.java +++ b/src/main/java/binnie/core/genetics/Tolerance.java @@ -5,6 +5,7 @@ import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; public enum Tolerance { + None(0, 0), Both1(-1, 1), Both2(-2, 2), @@ -25,7 +26,7 @@ public enum Tolerance { private int[] bounds; Tolerance(int a, int b) { - bounds = new int[] {a, b}; + bounds = new int[] { a, b }; } public String getUID() { diff --git a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java index cca32977..ef9842d3 100644 --- a/src/main/java/binnie/core/genetics/TreeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/TreeBreedingSystem.java @@ -1,5 +1,21 @@ package binnie.core.genetics; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.Binnie; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; @@ -7,7 +23,9 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.FakeWorld; import binnie.extratrees.machines.lumbermill.Lumbermill; import binnie.genetics.genetics.AlleleHelper; + import com.mojang.authlib.GameProfile; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -30,22 +48,9 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.ISpeciesRoot; import forestry.core.genetics.alleles.EnumAllele; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.util.ForgeDirection; public class TreeBreedingSystem extends BreedingSystem { + public UniqueItemStackSet allFruits = new UniqueItemStackSet(); public UniqueItemStackSet allWoods = new UniqueItemStackSet(); private UniqueItemStackSet discoveredFruits = new UniqueItemStackSet(); @@ -61,16 +66,15 @@ public class TreeBreedingSystem extends BreedingSystem { ISpeciesRoot speciesRoot = getSpeciesRoot(); ITreeGenome genome0 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species1.getUID())); ITreeGenome genome2 = (ITreeGenome) speciesRoot.templateAsGenome(speciesRoot.getTemplate(species2.getUID())); - return ((ITreeMutation) mutation) - .getChance( - player.worldObj, - (int) player.posX, - (int) player.posY, - (int) player.posZ, - (IAlleleTreeSpecies) species1, - (IAlleleTreeSpecies) species2, - genome0, - genome2); + return ((ITreeMutation) mutation).getChance( + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ, + (IAlleleTreeSpecies) species1, + (IAlleleTreeSpecies) species2, + genome0, + genome2); } @Override @@ -96,15 +100,12 @@ public class TreeBreedingSystem extends BreedingSystem { if (chromosome == EnumTreeChromosome.PLANT) { EnumSet types = ((IAllelePlantType) allele).getPlantTypes(); - return types.isEmpty() - ? I18N.localise("binniecore.allele.none") - : types.iterator().next().toString(); + return types.isEmpty() ? I18N.localise("binniecore.allele.none") : types.iterator().next().toString(); } if (chromosome == EnumTreeChromosome.FRUITS && allele.getUID().contains(".")) { IFruitProvider provider = ((IAlleleFruit) allele).getProvider(); - return (provider.getProducts().length == 0) - ? I18N.localise("binniecore.allele.none") + return (provider.getProducts().length == 0) ? I18N.localise("binniecore.allele.none") : provider.getProducts()[0].getDisplayName(); } @@ -151,8 +152,8 @@ public class TreeBreedingSystem extends BreedingSystem { super.calculateArrays(); for (IAlleleSpecies species : allActiveSpecies) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = (ITreeGenome) - getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); + ITreeGenome genome = (ITreeGenome) getSpeciesRoot() + .templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); FakeWorld world = FakeWorld.instance; genome.getPrimary().getGenerator().setLogBlock(genome, world, 0, 0, 0, ForgeDirection.UP); @@ -171,14 +172,14 @@ public class TreeBreedingSystem extends BreedingSystem { } } - public Collection getTreesThatBearFruit( - ItemStack fruit, boolean nei, World world, GameProfile player) { + public Collection getTreesThatBearFruit(ItemStack fruit, boolean nei, World world, + GameProfile player) { Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); List found = new ArrayList<>(); for (IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = (ITreeGenome) - getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); + ITreeGenome genome = (ITreeGenome) getSpeciesRoot() + .templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); for (ItemStack fruit2 : genome.getFruitProvider().getProducts()) { if (fruit2.isItemEqual(fruit)) { found.add(species); @@ -188,15 +189,15 @@ public class TreeBreedingSystem extends BreedingSystem { return found; } - public Collection getTreesThatCanBearFruit( - ItemStack fruit, boolean nei, World world, GameProfile player) { + public Collection getTreesThatCanBearFruit(ItemStack fruit, boolean nei, World world, + GameProfile player) { Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); List found = new ArrayList<>(); Set providers = new HashSet<>(); for (IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = (ITreeGenome) - getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); + ITreeGenome genome = (ITreeGenome) getSpeciesRoot() + .templateAsGenome(getSpeciesRoot().getTemplate(tSpecies.getUID())); for (ItemStack fruit2 : genome.getFruitProvider().getProducts()) { if (fruit2.isItemEqual(fruit)) { providers.add(genome.getFruitProvider().getFamily()); @@ -215,14 +216,14 @@ public class TreeBreedingSystem extends BreedingSystem { return found; } - public Collection getTreesThatHaveWood( - ItemStack fruit, boolean nei, World world, GameProfile player) { + public Collection getTreesThatHaveWood(ItemStack fruit, boolean nei, World world, + GameProfile player) { Collection set = nei ? getAllSpecies() : getDiscoveredSpecies(world, player); List found = new ArrayList<>(); for (IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = - TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); + ITreeGenome genome = TreeManager.treeRoot + .templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); // for (ItemStack fruit2 : // tSpecies.getRoot().getMember(fruit).getProduceList()){ tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, 0, 0, 0, ForgeDirection.UP); @@ -235,8 +236,8 @@ public class TreeBreedingSystem extends BreedingSystem { return found; } - public Collection getTreesThatMakePlanks( - ItemStack fruit, boolean nei, World world, GameProfile player) { + public Collection getTreesThatMakePlanks(ItemStack fruit, boolean nei, World world, + GameProfile player) { if (fruit == null) { return new ArrayList<>(); } @@ -244,8 +245,8 @@ public class TreeBreedingSystem extends BreedingSystem { List found = new ArrayList<>(); for (IAlleleSpecies species : set) { IAlleleTreeSpecies tSpecies = (IAlleleTreeSpecies) species; - ITreeGenome genome = - TreeManager.treeRoot.templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); + ITreeGenome genome = TreeManager.treeRoot + .templateAsGenome(TreeManager.treeRoot.getTemplate(tSpecies.getUID())); tSpecies.getGenerator().setLogBlock(genome, FakeWorld.instance, 0, 0, 0, ForgeDirection.UP); ItemStack fruit2 = FakeWorld.instance.getWooLog(); // for (ItemStack fruit2 : @@ -278,7 +279,7 @@ public class TreeBreedingSystem extends BreedingSystem { @Override public int[] getActiveTypes() { - return new int[] {EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal()}; + return new int[] { EnumGermlingType.SAPLING.ordinal(), EnumGermlingType.POLLEN.ordinal() }; } @Override diff --git a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java index 4f5d8f5e..05480187 100644 --- a/src/main/java/binnie/core/genetics/VirtualBeeHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualBeeHousing.java @@ -1,6 +1,14 @@ package binnie.core.genetics; +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; +import net.minecraft.world.biome.BiomeGenBase; + import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -12,13 +20,9 @@ import forestry.api.core.IErrorLogic; import forestry.api.genetics.IIndividual; import forestry.apiculture.InventoryBeeHousing; import forestry.core.access.FakeAccessHandler; -import java.util.ArrayList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Vec3; -import net.minecraft.world.biome.BiomeGenBase; public class VirtualBeeHousing extends VirtualHousing implements IBeeHousing, IBeeModifier { + ArrayList beeModifier = new ArrayList<>(); private InventoryBeeHousing beeInventory; diff --git a/src/main/java/binnie/core/genetics/VirtualHousing.java b/src/main/java/binnie/core/genetics/VirtualHousing.java index 46c7e1ae..4f33d23c 100644 --- a/src/main/java/binnie/core/genetics/VirtualHousing.java +++ b/src/main/java/binnie/core/genetics/VirtualHousing.java @@ -1,18 +1,22 @@ package binnie.core.genetics; -import com.mojang.authlib.GameProfile; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.IErrorState; -import forestry.api.genetics.IHousing; import java.util.Set; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import com.mojang.authlib.GameProfile; + +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IHousing; + class VirtualHousing implements IHousing { + private EntityPlayer player; public VirtualHousing(EntityPlayer player) { diff --git a/src/main/java/binnie/core/gui/BinnieCoreGUI.java b/src/main/java/binnie/core/gui/BinnieCoreGUI.java index 93898bc3..7717e207 100644 --- a/src/main/java/binnie/core/gui/BinnieCoreGUI.java +++ b/src/main/java/binnie/core/gui/BinnieCoreGUI.java @@ -1,16 +1,18 @@ package binnie.core.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.core.craftgui.WindowFieldKit; import binnie.core.craftgui.WindowGenesis; import binnie.core.craftgui.minecraft.Window; import binnie.core.machines.storage.WindowCompartment; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public enum BinnieCoreGUI implements IBinnieGUID { + Compartment, FieldKit, Genesis; diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index e4931008..a674953e 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -1,14 +1,16 @@ package binnie.core.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.craftgui.minecraft.Window; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; public class BinnieGUIHandler implements IGuiHandler { + private AbstractMod mod; public BinnieGUIHandler(AbstractMod mod) { diff --git a/src/main/java/binnie/core/gui/IBinnieGUID.java b/src/main/java/binnie/core/gui/IBinnieGUID.java index a5ae9373..461b1a7e 100644 --- a/src/main/java/binnie/core/gui/IBinnieGUID.java +++ b/src/main/java/binnie/core/gui/IBinnieGUID.java @@ -1,11 +1,13 @@ package binnie.core.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import binnie.core.craftgui.minecraft.Window; import binnie.core.network.IOrdinaled; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; public interface IBinnieGUID extends IOrdinaled { + Window getWindow(EntityPlayer player, World world, int x, int y, int z, Side side); } diff --git a/src/main/java/binnie/core/item/IItemEnum.java b/src/main/java/binnie/core/item/IItemEnum.java index 3bbfbfca..e37446ea 100644 --- a/src/main/java/binnie/core/item/IItemEnum.java +++ b/src/main/java/binnie/core/item/IItemEnum.java @@ -3,6 +3,7 @@ package binnie.core.item; import net.minecraft.item.ItemStack; public interface IItemEnum { + boolean isActive(); String getName(ItemStack itemStack); diff --git a/src/main/java/binnie/core/item/IItemMisc.java b/src/main/java/binnie/core/item/IItemMisc.java index 4e1212fa..2e675f8a 100644 --- a/src/main/java/binnie/core/item/IItemMisc.java +++ b/src/main/java/binnie/core/item/IItemMisc.java @@ -1,13 +1,16 @@ package binnie.core.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public interface IItemMisc extends IItemEnum { + IIcon getIcon(ItemStack itemStack); @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index d3d89242..cb24faef 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -1,18 +1,20 @@ package binnie.core.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import binnie.core.util.I18N; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ItemGenesis extends Item { + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { @@ -27,8 +29,8 @@ public class ItemGenesis extends Item { @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { - BinnieCore.proxy.openGui( - BinnieCoreGUI.Genesis, player, (int) player.posX, (int) player.posY, (int) player.posZ); + BinnieCore.proxy + .openGui(BinnieCoreGUI.Genesis, player, (int) player.posX, (int) player.posY, (int) player.posZ); return itemStack; } diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index fa779a82..edadca2c 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,8 +1,7 @@ package binnie.core.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,7 +9,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemMisc extends Item { + private IItemMisc[] items; protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) { diff --git a/src/main/java/binnie/core/item/ManagerItem.java b/src/main/java/binnie/core/item/ManagerItem.java index e2e951c5..d9b8d5df 100644 --- a/src/main/java/binnie/core/item/ManagerItem.java +++ b/src/main/java/binnie/core/item/ManagerItem.java @@ -3,6 +3,7 @@ package binnie.core.item; import net.minecraft.creativetab.CreativeTabs; public class ManagerItem { + public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) { return new ItemMisc(tab, items); } diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 0876a6db..f4c0aa2d 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -1,5 +1,13 @@ package binnie.core.item; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import binnie.botany.Botany; import binnie.botany.api.IFlower; import binnie.botany.flower.TileEntityFlower; @@ -10,15 +18,9 @@ import binnie.core.network.packet.MessageNBT; import binnie.genetics.item.ItemFieldKit; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; public class ModuleItems implements IInitializable { + @Override public void preInit() { BinnieCore.fieldKit = new ItemFieldKit(); @@ -54,8 +56,7 @@ public class ModuleItems implements IInitializable { } EntityPlayer player = event.entityPlayer; - if (player != null - && player.getHeldItem() != null + if (player != null && player.getHeldItem() != null && player.getHeldItem().getItem() == BinnieCore.fieldKit && player.isSneaking()) { TileEntity tile = event.world.getTileEntity(event.x, event.y, event.z); @@ -74,8 +75,7 @@ public class ModuleItems implements IInitializable { info.setString("Species2", flower.getGenome().getSecondary().getUID()); info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan()); info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID()); - info.setShort( - "Colour2", (short) flower.getGenome().getSecondaryColor().getID()); + info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID()); info.setBoolean("Wilting", flower.isWilted()); info.setBoolean("Flowered", flower.hasFlowered()); Botany.proxy.sendToPlayer(new MessageNBT(PacketID.FieldKit.ordinal(), info), event.entityPlayer); diff --git a/src/main/java/binnie/core/liquid/BinnieFluid.java b/src/main/java/binnie/core/liquid/BinnieFluid.java index dd3725d1..173a4790 100644 --- a/src/main/java/binnie/core/liquid/BinnieFluid.java +++ b/src/main/java/binnie/core/liquid/BinnieFluid.java @@ -4,6 +4,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; class BinnieFluid extends Fluid { + protected IFluidType fluidType; private String name; diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index 369a4ef7..40166fa1 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -1,18 +1,20 @@ package binnie.core.liquid; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidContainerRegistry; + import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidContainerRegistry; public enum FluidContainer { + Bucket, Capsule, Refractory, @@ -96,8 +98,10 @@ public enum FluidContainer { return; } - FluidContainerRegistry.FluidContainerData data = - new FluidContainerRegistry.FluidContainerData(fluid.get(1000), filled, empty); + FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData( + fluid.get(1000), + filled, + empty); FluidContainerRegistry.registerFluidContainer(data); } } diff --git a/src/main/java/binnie/core/liquid/IFluidType.java b/src/main/java/binnie/core/liquid/IFluidType.java index 32c0fc54..913610d5 100644 --- a/src/main/java/binnie/core/liquid/IFluidType.java +++ b/src/main/java/binnie/core/liquid/IFluidType.java @@ -5,6 +5,7 @@ import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; public interface IFluidType { + IIcon getIcon(); void registerIcon(IIconRegister register); diff --git a/src/main/java/binnie/core/liquid/ILiquidType.java b/src/main/java/binnie/core/liquid/ILiquidType.java index c6212c4b..cd7fbc02 100644 --- a/src/main/java/binnie/core/liquid/ILiquidType.java +++ b/src/main/java/binnie/core/liquid/ILiquidType.java @@ -1,5 +1,6 @@ package binnie.core.liquid; public interface ILiquidType extends IFluidType { + int ordinal(); } diff --git a/src/main/java/binnie/core/liquid/ItemFluidContainer.java b/src/main/java/binnie/core/liquid/ItemFluidContainer.java index ce48fbe8..cc8ecab8 100644 --- a/src/main/java/binnie/core/liquid/ItemFluidContainer.java +++ b/src/main/java/binnie/core/liquid/ItemFluidContainer.java @@ -1,12 +1,9 @@ package binnie.core.liquid; -import binnie.Binnie; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.HashMap; import java.util.List; import java.util.Map; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,7 +14,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import binnie.Binnie; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemFluidContainer extends ItemFood { + private FluidContainer container; public static int LiquidExtraBee = 64; public static int LiquidExtraTree = 128; diff --git a/src/main/java/binnie/core/liquid/ManagerLiquid.java b/src/main/java/binnie/core/liquid/ManagerLiquid.java index 84c7a516..4a019f3e 100644 --- a/src/main/java/binnie/core/liquid/ManagerLiquid.java +++ b/src/main/java/binnie/core/liquid/ManagerLiquid.java @@ -1,16 +1,19 @@ package binnie.core.liquid; -import binnie.core.ManagerBase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.LinkedHashMap; import java.util.Map; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import binnie.core.ManagerBase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ManagerLiquid extends ManagerBase { + public Map fluids; public ManagerLiquid() { diff --git a/src/main/java/binnie/core/machines/BlockMachine.java b/src/main/java/binnie/core/machines/BlockMachine.java index 89192105..7760d96e 100644 --- a/src/main/java/binnie/core/machines/BlockMachine.java +++ b/src/main/java/binnie/core/machines/BlockMachine.java @@ -1,13 +1,9 @@ package binnie.core.machines; -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.machines.component.IRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -23,7 +19,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.machines.component.IRender; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + class BlockMachine extends BlockContainer implements IBlockMachine { + private MachineGroup group; public BlockMachine(MachineGroup group, String blockName) { @@ -88,16 +91,8 @@ class BlockMachine extends BlockContainer implements IBlockMachine { } @Override - public boolean onBlockActivated( - World world, - int x, - int y, - int z, - EntityPlayer player, - int side, - float xOffset, - float yOffset, - float zOffset) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, + float yOffset, float zOffset) { if (!BinnieCore.proxy.isSimulating(world) || player.isSneaking()) { return true; } @@ -131,10 +126,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { TileEntity entity = world.getTileEntity(x, y, z); if (entity instanceof TileEntityMachine && ((TileEntityMachine) entity).getMachine().hasInterface(IMachineTexturedFaces.class)) { - return ((TileEntityMachine) entity) - .getMachine() - .getInterface(IMachineTexturedFaces.class) - .getIcon(side); + return ((TileEntityMachine) entity).getMachine().getInterface(IMachineTexturedFaces.class).getIcon(side); } return Blocks.dirt.getIcon(0, 0); } @@ -175,8 +167,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if (BinnieCore.proxy.isSimulating(world) - && canHarvestBlock(player, world.getBlockMetadata(x, y, z)) + if (BinnieCore.proxy.isSimulating(world) && canHarvestBlock(player, world.getBlockMetadata(x, y, z)) && !player.capabilities.isCreativeMode) { int metadata = world.getBlockMetadata(x, y, z); ItemStack stack = new ItemStack(Item.getItemFromBlock(this), 1, damageDropped(metadata)); @@ -186,6 +177,7 @@ class BlockMachine extends BlockContainer implements IBlockMachine { } public interface IMachineTexturedFaces { + IIcon getIcon(int p0); } } diff --git a/src/main/java/binnie/core/machines/IBlockMachine.java b/src/main/java/binnie/core/machines/IBlockMachine.java index 5b68648a..0966d831 100644 --- a/src/main/java/binnie/core/machines/IBlockMachine.java +++ b/src/main/java/binnie/core/machines/IBlockMachine.java @@ -1,6 +1,7 @@ package binnie.core.machines; interface IBlockMachine { + MachinePackage getPackage(int meta); String getMachineName(int meta); diff --git a/src/main/java/binnie/core/machines/IMachine.java b/src/main/java/binnie/core/machines/IMachine.java index 465023ca..232a607f 100644 --- a/src/main/java/binnie/core/machines/IMachine.java +++ b/src/main/java/binnie/core/machines/IMachine.java @@ -1,10 +1,12 @@ package binnie.core.machines; import java.util.Collection; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public interface IMachine extends IOwnable { + void addComponent(MachineComponent component); MachineUtil getMachineUtil(); diff --git a/src/main/java/binnie/core/machines/IMachineType.java b/src/main/java/binnie/core/machines/IMachineType.java index adca35f1..3cb44f9a 100644 --- a/src/main/java/binnie/core/machines/IMachineType.java +++ b/src/main/java/binnie/core/machines/IMachineType.java @@ -3,6 +3,7 @@ package binnie.core.machines; import binnie.core.network.IOrdinaled; public interface IMachineType extends IOrdinaled { + Class getPackageClass(); boolean isActive(); diff --git a/src/main/java/binnie/core/machines/IOwnable.java b/src/main/java/binnie/core/machines/IOwnable.java index 4ae01f59..3ea3eb86 100644 --- a/src/main/java/binnie/core/machines/IOwnable.java +++ b/src/main/java/binnie/core/machines/IOwnable.java @@ -3,6 +3,7 @@ package binnie.core.machines; import com.mojang.authlib.GameProfile; interface IOwnable { + GameProfile getOwner(); void setOwner(GameProfile owner); diff --git a/src/main/java/binnie/core/machines/ItemMachine.java b/src/main/java/binnie/core/machines/ItemMachine.java index 673fce09..c71ecd8c 100644 --- a/src/main/java/binnie/core/machines/ItemMachine.java +++ b/src/main/java/binnie/core/machines/ItemMachine.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class ItemMachine extends ItemBlock { + private IBlockMachine associatedBlock; public ItemMachine(Block block) { diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index 93fb6c71..ba3bb7a7 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -1,5 +1,19 @@ package binnie.core.machines; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.machines.component.IInteraction; import binnie.core.machines.component.IRender; @@ -8,23 +22,14 @@ import binnie.core.network.BinnieCorePacketID; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.MessageTileNBT; import binnie.core.network.packet.PacketPayload; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.relauncher.Side; import forestry.api.core.INBTTagable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePacketSync, IMachine, INetwork.GuiNBT { + private MachinePackage machinePackage; private Map> componentInterfaceMap; private Map, MachineComponent> componentMap; @@ -154,7 +159,11 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack for (IRender.DisplayTick renders : getInterfaces(IRender.DisplayTick.class)) { TileEntity tileEntity = getTileEntity(); renders.onDisplayTick( - getWorld(), tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, getWorld().rand); + getWorld(), + tileEntity.xCoord, + tileEntity.yCoord, + tileEntity.zCoord, + getWorld().rand); } } @@ -256,8 +265,10 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack if (nbt.hasNoTags()) { return null; } - MessageTileNBT tileNbt = - new MessageTileNBT(BinnieCorePacketID.TileDescriptionSync.ordinal(), getTileEntity(), nbt); + MessageTileNBT tileNbt = new MessageTileNBT( + BinnieCorePacketID.TileDescriptionSync.ordinal(), + getTileEntity(), + nbt); return BinnieCore.instance.getNetworkWrapper().getPacketFrom(tileNbt.getMessage()); } diff --git a/src/main/java/binnie/core/machines/MachineComponent.java b/src/main/java/binnie/core/machines/MachineComponent.java index 0b646ce3..d18346a3 100644 --- a/src/main/java/binnie/core/machines/MachineComponent.java +++ b/src/main/java/binnie/core/machines/MachineComponent.java @@ -1,12 +1,14 @@ package binnie.core.machines; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.core.network.packet.MachinePayload; import forestry.api.core.INBTTagable; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; public class MachineComponent implements INBTTagable { + private IMachine machine; public MachineComponent(IMachine machine) { diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index b78c7ede..d8c84ae8 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -1,14 +1,17 @@ package binnie.core.machines; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.creativetab.CreativeTabs; + import binnie.Binnie; import binnie.core.AbstractMod; import cpw.mods.fml.common.registry.GameRegistry; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import net.minecraft.creativetab.CreativeTabs; public class MachineGroup { + private AbstractMod mod; private String blockName; private String uid; diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index d67fb35d..5b7bbd1b 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -1,10 +1,12 @@ package binnie.core.machines; -import binnie.core.util.I18N; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; +import binnie.core.util.I18N; + public abstract class MachinePackage { + private String uid; private boolean active; boolean powered; @@ -46,8 +48,8 @@ public abstract class MachinePackage { this.group = group; } - public abstract void renderMachine( - Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer); + public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick, + RenderBlocks renderer); public boolean isActive() { return active; diff --git a/src/main/java/binnie/core/machines/MachineRendererBlock.java b/src/main/java/binnie/core/machines/MachineRendererBlock.java index a5863f41..702be8a7 100644 --- a/src/main/java/binnie/core/machines/MachineRendererBlock.java +++ b/src/main/java/binnie/core/machines/MachineRendererBlock.java @@ -1,13 +1,15 @@ package binnie.core.machines; +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.resource.BinnieResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class MachineRendererBlock { + public static MachineRendererBlock instance = new MachineRendererBlock(); private BinnieResource texture; private ModelBlock model; diff --git a/src/main/java/binnie/core/machines/MachineUtil.java b/src/main/java/binnie/core/machines/MachineUtil.java index a635ea7d..d45d0476 100644 --- a/src/main/java/binnie/core/machines/MachineUtil.java +++ b/src/main/java/binnie/core/machines/MachineUtil.java @@ -1,5 +1,16 @@ package binnie.core.machines; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidTank; + import binnie.core.BinnieCore; import binnie.core.machines.inventory.IChargedSlots; import binnie.core.machines.power.IPoweredMachine; @@ -7,17 +18,9 @@ import binnie.core.machines.power.IProcess; import binnie.core.machines.power.ITankMachine; import binnie.core.machines.power.PowerSystem; import binnie.core.util.ItemStackSet; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; public class MachineUtil { + private IMachine machine; public MachineUtil(IMachine machine) { diff --git a/src/main/java/binnie/core/machines/ManagerMachine.java b/src/main/java/binnie/core/machines/ManagerMachine.java index 9cee08c6..7dfcaf11 100644 --- a/src/main/java/binnie/core/machines/ManagerMachine.java +++ b/src/main/java/binnie/core/machines/ManagerMachine.java @@ -1,17 +1,19 @@ package binnie.core.machines; -import binnie.core.BinnieCore; -import binnie.core.ManagerBase; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.ValidatorIcon; -import forestry.api.core.INBTTagable; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import binnie.core.BinnieCore; +import binnie.core.ManagerBase; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.ValidatorIcon; +import forestry.api.core.INBTTagable; + public class ManagerMachine extends ManagerBase { + private Map, Class[]> componentInterfaceMap; private Map machineGroups; private Map> networkIDToComponent; @@ -74,8 +76,10 @@ public class ManagerMachine extends ManagerBase { machineRenderID = BinnieCore.proxy.getUniqueRenderID(); SlotValidator.IconBee = new ValidatorIcon(BinnieCore.instance, "validator/bee.0", "validator/bee.1"); SlotValidator.IconFrame = new ValidatorIcon(BinnieCore.instance, "validator/frame.0", "validator/frame.1"); - SlotValidator.IconCircuit = - new ValidatorIcon(BinnieCore.instance, "validator/circuit.0", "validator/circuit.1"); + SlotValidator.IconCircuit = new ValidatorIcon( + BinnieCore.instance, + "validator/circuit.0", + "validator/circuit.1"); SlotValidator.IconBlock = new ValidatorIcon(BinnieCore.instance, "validator/block.0", "validator/block.1"); } diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java index 283fc3ba..5ad96687 100644 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ b/src/main/java/binnie/core/machines/ModelBlock.java @@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; class ModelBlock extends ModelBase { + private ModelRenderer block; public ModelBlock() { diff --git a/src/main/java/binnie/core/machines/RendererMachine.java b/src/main/java/binnie/core/machines/RendererMachine.java index 4c0f0873..141dc2bc 100644 --- a/src/main/java/binnie/core/machines/RendererMachine.java +++ b/src/main/java/binnie/core/machines/RendererMachine.java @@ -1,7 +1,5 @@ package binnie.core.machines; -import binnie.Binnie; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -9,8 +7,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.Binnie; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + // Hmm. It's used class public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { + RenderBlocks blockRenderer; @Override @@ -18,8 +20,8 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer); } - public void renderTileEntity( - TileEntityMachine entity, double x, double y, double z, float partialTick, RenderBlocks renderer) { + public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick, + RenderBlocks renderer) { if (entity != null && entity.getMachine() != null) { MachinePackage machinePackage = entity.getMachine().getPackage(); machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer); @@ -39,11 +41,10 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { TileEntityMachine tile = (TileEntityMachine) world.getTileEntity(x, y, z); - if (tile != null - && tile.getMachine() != null + if (tile != null && tile.getMachine() != null && tile.getMachine().getPackage() != null && tile.getMachine().getPackage().getGroup() != null && !tile.getMachine().getPackage().getGroup().customRenderer) { diff --git a/src/main/java/binnie/core/machines/TileEntityMachine.java b/src/main/java/binnie/core/machines/TileEntityMachine.java index 9621e257..7f41f9f9 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachine.java +++ b/src/main/java/binnie/core/machines/TileEntityMachine.java @@ -1,14 +1,16 @@ package binnie.core.machines; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; + import binnie.Binnie; import binnie.core.machines.base.TileEntityMachineBase; import binnie.core.machines.component.IInteraction; import binnie.core.network.INetworkedEntity; import binnie.core.network.packet.PacketPayload; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; public class TileEntityMachine extends TileEntityMachineBase implements INetworkedEntity { + private Machine machine; @Override diff --git a/src/main/java/binnie/core/machines/base/DefaultInventory.java b/src/main/java/binnie/core/machines/base/DefaultInventory.java index dcf008b2..96910632 100644 --- a/src/main/java/binnie/core/machines/base/DefaultInventory.java +++ b/src/main/java/binnie/core/machines/base/DefaultInventory.java @@ -1,10 +1,12 @@ package binnie.core.machines.base; -import binnie.core.machines.inventory.IInventoryMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import binnie.core.machines.inventory.IInventoryMachine; + class DefaultInventory implements IInventoryMachine { + @Override public int getSizeInventory() { return 0; diff --git a/src/main/java/binnie/core/machines/base/DefaultPower.java b/src/main/java/binnie/core/machines/base/DefaultPower.java index f0ce9fda..9d0d330e 100644 --- a/src/main/java/binnie/core/machines/base/DefaultPower.java +++ b/src/main/java/binnie/core/machines/base/DefaultPower.java @@ -1,13 +1,15 @@ package binnie.core.machines.base; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.machines.power.IPoweredMachine; import binnie.core.machines.power.PowerInfo; import binnie.core.machines.power.PowerInterface; import cpw.mods.fml.common.Optional; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; class DefaultPower implements IPoweredMachine { + @Override public PowerInfo getPowerInfo() { return new PowerInfo(this, 0.0f); diff --git a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java index 33f3634a..f1618717 100644 --- a/src/main/java/binnie/core/machines/base/DefaultTankContainer.java +++ b/src/main/java/binnie/core/machines/base/DefaultTankContainer.java @@ -1,15 +1,17 @@ package binnie.core.machines.base; -import binnie.core.machines.inventory.TankSlot; -import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.power.TankInfo; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import binnie.core.machines.inventory.TankSlot; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.TankInfo; + class DefaultTankContainer implements ITankMachine { + @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return 0; diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 9d8c42ae..18eb8c67 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -1,5 +1,14 @@ package binnie.core.machines.base; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; + import binnie.core.machines.Machine; import binnie.core.machines.inventory.IInventoryMachine; import binnie.core.machines.inventory.TankSlot; @@ -9,16 +18,9 @@ import binnie.core.machines.power.PowerInfo; import binnie.core.machines.power.PowerInterface; import binnie.core.machines.power.TankInfo; import cpw.mods.fml.common.Optional; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidTank; public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine { + public IInventoryMachine getInventory() { IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this); return (inv == null || inv == this) ? new DefaultInventory() : inv; @@ -71,8 +73,7 @@ public class TileEntityMachineBase extends TileEntity implements IInventoryMachi @Override public boolean isUseableByPlayer(EntityPlayer player) { - return !isInvalid() - && getWorldObj().getTileEntity(xCoord, yCoord, zCoord) == this + return !isInvalid() && getWorldObj().getTileEntity(xCoord, yCoord, zCoord) == this && player.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) <= 64.0 && getInventory().isUseableByPlayer(player); } diff --git a/src/main/java/binnie/core/machines/component/ComponentRecipe.java b/src/main/java/binnie/core/machines/component/ComponentRecipe.java index b7faaa06..7bae67e5 100644 --- a/src/main/java/binnie/core/machines/component/ComponentRecipe.java +++ b/src/main/java/binnie/core/machines/component/ComponentRecipe.java @@ -4,6 +4,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; public abstract class ComponentRecipe extends MachineComponent implements IComponentRecipe { + public ComponentRecipe(Machine machine) { super(machine); } diff --git a/src/main/java/binnie/core/machines/component/IBuildcraft.java b/src/main/java/binnie/core/machines/component/IBuildcraft.java index 8f8ee5f2..0bb8188e 100644 --- a/src/main/java/binnie/core/machines/component/IBuildcraft.java +++ b/src/main/java/binnie/core/machines/component/IBuildcraft.java @@ -1,16 +1,20 @@ package binnie.core.machines.component; +import java.util.List; + import binnie.core.triggers.TriggerData; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionReceptor; -import java.util.List; public interface IBuildcraft { + interface TriggerProvider { + void getTriggers(List p0); } interface ActionProvider extends IActionReceptor { + void getActions(List p0); } } diff --git a/src/main/java/binnie/core/machines/component/IComponentRecipe.java b/src/main/java/binnie/core/machines/component/IComponentRecipe.java index 5f5d059b..bffa1199 100644 --- a/src/main/java/binnie/core/machines/component/IComponentRecipe.java +++ b/src/main/java/binnie/core/machines/component/IComponentRecipe.java @@ -3,6 +3,7 @@ package binnie.core.machines.component; import net.minecraft.item.ItemStack; public interface IComponentRecipe { + boolean isRecipe(); ItemStack doRecipe(boolean p0); diff --git a/src/main/java/binnie/core/machines/component/IInteraction.java b/src/main/java/binnie/core/machines/component/IInteraction.java index 39b37396..c6706a83 100644 --- a/src/main/java/binnie/core/machines/component/IInteraction.java +++ b/src/main/java/binnie/core/machines/component/IInteraction.java @@ -4,15 +4,19 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; public interface IInteraction { + interface ChunkUnload { + void onChunkUnload(); } interface Invalidation { + void onInvalidation(); } interface RightClick { + void onRightClick(World world, EntityPlayer player, int x, int y, int z); } } diff --git a/src/main/java/binnie/core/machines/component/IRender.java b/src/main/java/binnie/core/machines/component/IRender.java index 17adfa77..f4183757 100644 --- a/src/main/java/binnie/core/machines/component/IRender.java +++ b/src/main/java/binnie/core/machines/component/IRender.java @@ -1,23 +1,29 @@ package binnie.core.machines.component; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public interface IRender { + interface DisplayTick { + @SideOnly(Side.CLIENT) void onDisplayTick(World world, int x, int y, int z, Random rand); } interface RandomDisplayTick { + @SideOnly(Side.CLIENT) void onRandomDisplayTick(World world, int x, int y, int p3, Random rand); } interface Render { + @SideOnly(Side.CLIENT) void renderInWorld(RenderItem renderItem, double x, double y, double z); } diff --git a/src/main/java/binnie/core/machines/inventory/AccessDirection.java b/src/main/java/binnie/core/machines/inventory/AccessDirection.java index 5d76f6f8..20d84626 100644 --- a/src/main/java/binnie/core/machines/inventory/AccessDirection.java +++ b/src/main/java/binnie/core/machines/inventory/AccessDirection.java @@ -1,6 +1,7 @@ package binnie.core.machines.inventory; enum AccessDirection { + Both, In, Out, diff --git a/src/main/java/binnie/core/machines/inventory/BaseSlot.java b/src/main/java/binnie/core/machines/inventory/BaseSlot.java index c8b2b516..e3d8326e 100644 --- a/src/main/java/binnie/core/machines/inventory/BaseSlot.java +++ b/src/main/java/binnie/core/machines/inventory/BaseSlot.java @@ -1,12 +1,15 @@ package binnie.core.machines.inventory; +import java.util.Collection; +import java.util.EnumSet; + +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.util.IValidator; import forestry.api.core.INBTTagable; -import java.util.Collection; -import java.util.EnumSet; -import net.minecraftforge.common.util.ForgeDirection; public abstract class BaseSlot implements INBTTagable, IValidator { + protected Validator validator; protected String unlocName; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index 152695c4..c187b38e 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -1,16 +1,19 @@ package binnie.core.machines.inventory; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.network.INetwork; import cpw.mods.fml.relauncher.Side; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class ComponentChargedSlots extends MachineComponent implements INetwork.GuiNBT, IChargedSlots { + private Map charges = new HashMap<>(); public ComponentChargedSlots(Machine machine) { diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java b/src/main/java/binnie/core/machines/inventory/ComponentInventory.java index ee713930..8f3e7d41 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventory.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventory.java @@ -1,10 +1,12 @@ package binnie.core.machines.inventory; +import net.minecraft.inventory.IInventory; + import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; -import net.minecraft.inventory.IInventory; public abstract class ComponentInventory extends MachineComponent implements IInventory { + public ComponentInventory(IMachine machine) { super(machine); } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index f572e5ce..50aa1f04 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -1,11 +1,11 @@ package binnie.core.machines.inventory; -import binnie.core.machines.IMachine; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Random; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,7 +15,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.machines.IMachine; + public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots { + private Map inventory = new LinkedHashMap<>(); public ComponentInventorySlots(IMachine machine) { @@ -56,8 +59,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve @Override public void setInventorySlotContents(int index, ItemStack itemStack) { - if (inventory.containsKey(index) - && (itemStack == null || inventory.get(index).isValid(itemStack))) { + if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) { inventory.get(index).setContent(itemStack); } markDirty(); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java index 006b8d12..0964623f 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventoryTransfer.java @@ -1,14 +1,17 @@ package binnie.core.machines.inventory; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.transfer.TransferRequest; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class ComponentInventoryTransfer extends MachineComponent { + private List transfers = new ArrayList<>(); private ITransferRestockListener transferListener; @@ -44,6 +47,7 @@ public class ComponentInventoryTransfer extends MachineComponent { } public abstract class Transfer { + protected Condition condition; protected IMachine machine; @@ -74,6 +78,7 @@ public class ComponentInventoryTransfer extends MachineComponent { } private class Restock extends Transfer { + private int[] buffer; private int destination; private int limit; @@ -113,6 +118,7 @@ public class ComponentInventoryTransfer extends MachineComponent { } private class Storage extends Transfer { + private int source; private int[] destination; @@ -126,8 +132,7 @@ public class ComponentInventoryTransfer extends MachineComponent { protected void doTransfer(IInventory inv) { if (inv.getStackInSlot(source) != null) { TransferRequest request = new TransferRequest(inv.getStackInSlot(source), inv); - ItemStack itemStack = - request.setTargetSlots(destination).ignoreValidation().transfer(true); + ItemStack itemStack = request.setTargetSlots(destination).ignoreValidation().transfer(true); inv.setInventorySlotContents(source, itemStack); } } @@ -140,12 +145,14 @@ public class ComponentInventoryTransfer extends MachineComponent { } public abstract static class Condition { + public Transfer transfer; public abstract boolean fufilled(ItemStack p0); } public interface ITransferRestockListener { + void onRestock(int target); } } diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 330902ff..ac1f25e3 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -1,13 +1,10 @@ package binnie.core.machines.inventory; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.power.ITankMachine; -import binnie.core.machines.power.TankInfo; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; @@ -16,7 +13,13 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.power.ITankMachine; +import binnie.core.machines.power.TankInfo; + public class ComponentTankContainer extends MachineComponent implements ITankMachine { + private Map tanks = new LinkedHashMap<>(); public ComponentTankContainer(IMachine machine) { @@ -76,8 +79,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac private int getTankIndexToFill(ForgeDirection from, FluidStack resource) { for (TankSlot tank : tanks.values()) { - if (tank.isValid(resource) - && tank.canInsert(from) + if (tank.isValid(resource) && tank.canInsert(from) && (tank.getContent() == null || tank.getContent().isFluidEqual(resource))) { return tank.getIndex(); } @@ -87,8 +89,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac private int getTankIndexToDrain(ForgeDirection from, FluidStack resource) { for (TankSlot tank : tanks.values()) { - if (tank.getContent() != null - && tank.canExtract(from) + if (tank.getContent() != null && tank.canExtract(from) && (resource == null || resource.isFluidEqual(tank.getContent()))) { return tank.getIndex(); } diff --git a/src/main/java/binnie/core/machines/inventory/IChargedSlots.java b/src/main/java/binnie/core/machines/inventory/IChargedSlots.java index 44a60e07..1c0715c9 100644 --- a/src/main/java/binnie/core/machines/inventory/IChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/IChargedSlots.java @@ -1,6 +1,7 @@ package binnie.core.machines.inventory; public interface IChargedSlots { + float getCharge(int slot); void setCharge(int slot, float value); diff --git a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java index 5733b98b..752a3115 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java +++ b/src/main/java/binnie/core/machines/inventory/IInventoryMachine.java @@ -3,4 +3,5 @@ package binnie.core.machines.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; -public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory {} +public interface IInventoryMachine extends IInventory, ISidedInventory, IValidatedInventory { +} diff --git a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java b/src/main/java/binnie/core/machines/inventory/IInventorySlots.java index 2de2899f..edb18246 100644 --- a/src/main/java/binnie/core/machines/inventory/IInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/IInventorySlots.java @@ -1,6 +1,7 @@ package binnie.core.machines.inventory; public interface IInventorySlots { + InventorySlot addSlot(int index, String unlocalizedName); InventorySlot[] addSlotArray(int[] indexes, String unlocalizedName); diff --git a/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java b/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java index 8ca83634..82dd6cbd 100644 --- a/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java +++ b/src/main/java/binnie/core/machines/inventory/IValidatedInventory.java @@ -3,5 +3,6 @@ package binnie.core.machines.inventory; import net.minecraft.inventory.IInventory; interface IValidatedInventory extends IInventory { + boolean isReadOnly(int slot); } diff --git a/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java b/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java index 286ce38c..423076bb 100644 --- a/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/IValidatedTankContainer.java @@ -3,6 +3,7 @@ package binnie.core.machines.inventory; import net.minecraftforge.fluids.FluidStack; public interface IValidatedTankContainer { + boolean isTankReadOnly(int tank); boolean isLiquidValidForTank(FluidStack liquid, int tank); diff --git a/src/main/java/binnie/core/machines/inventory/InventorySlot.java b/src/main/java/binnie/core/machines/inventory/InventorySlot.java index 3fc7a5c8..b34cd0db 100644 --- a/src/main/java/binnie/core/machines/inventory/InventorySlot.java +++ b/src/main/java/binnie/core/machines/inventory/InventorySlot.java @@ -1,10 +1,12 @@ package binnie.core.machines.inventory; -import binnie.core.util.I18N; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import binnie.core.util.I18N; + public class InventorySlot extends BaseSlot { + private ItemStack itemStack; private Type type; diff --git a/src/main/java/binnie/core/machines/inventory/MachineSide.java b/src/main/java/binnie/core/machines/inventory/MachineSide.java index 064ba55d..48762a22 100644 --- a/src/main/java/binnie/core/machines/inventory/MachineSide.java +++ b/src/main/java/binnie/core/machines/inventory/MachineSide.java @@ -1,15 +1,18 @@ package binnie.core.machines.inventory; -import binnie.core.util.I18N; import java.util.Collection; import java.util.EnumSet; + import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.util.I18N; + public class MachineSide { + public static final EnumSet TOP_AND_BOTTOM = EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN); public static final EnumSet NONE = EnumSet.noneOf(ForgeDirection.class); - public static final EnumSet SIDES = - EnumSet.of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); + public static final EnumSet SIDES = EnumSet + .of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST); private static final EnumSet ALL = EnumSet.of( ForgeDirection.UP, diff --git a/src/main/java/binnie/core/machines/inventory/SetList.java b/src/main/java/binnie/core/machines/inventory/SetList.java index 2e6a747f..41295504 100644 --- a/src/main/java/binnie/core/machines/inventory/SetList.java +++ b/src/main/java/binnie/core/machines/inventory/SetList.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.Set; public class SetList extends ArrayList implements Set { + private static long serialVersionUID = 1277112003159980135L; @Override diff --git a/src/main/java/binnie/core/machines/inventory/SidedAccess.java b/src/main/java/binnie/core/machines/inventory/SidedAccess.java index d92586f1..c6fd6479 100644 --- a/src/main/java/binnie/core/machines/inventory/SidedAccess.java +++ b/src/main/java/binnie/core/machines/inventory/SidedAccess.java @@ -5,9 +5,11 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; + import net.minecraftforge.common.util.ForgeDirection; class SidedAccess { + private Map accesses = new HashMap<>(); private AccessDirection base = AccessDirection.Both; private boolean insertLocked; diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 5f2a3b60..906543df 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -1,11 +1,13 @@ package binnie.core.machines.inventory; -import binnie.core.util.I18N; -import forestry.api.genetics.AlleleManager; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.util.I18N; +import forestry.api.genetics.AlleleManager; + public abstract class SlotValidator extends Validator { + public static ValidatorIcon IconBee; public static ValidatorIcon IconFrame; public static ValidatorIcon IconCircuit; @@ -24,6 +26,7 @@ public abstract class SlotValidator extends Validator { } public static class Item extends SlotValidator { + private ItemStack target; public Item(ItemStack target, ValidatorIcon icon) { @@ -43,6 +46,7 @@ public abstract class SlotValidator extends Validator { } public static class Individual extends SlotValidator { + public Individual() { super(null); } diff --git a/src/main/java/binnie/core/machines/inventory/TankSlot.java b/src/main/java/binnie/core/machines/inventory/TankSlot.java index 25822c81..a0e212df 100644 --- a/src/main/java/binnie/core/machines/inventory/TankSlot.java +++ b/src/main/java/binnie/core/machines/inventory/TankSlot.java @@ -1,12 +1,14 @@ package binnie.core.machines.inventory; -import binnie.core.util.I18N; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidTank; +import binnie.core.util.I18N; + public class TankSlot extends BaseSlot { + public static final String NAME_JUICE = "Juice Tank"; public static final String NAME_WATER = "Water Tank"; public static final String NAME_CUPBOARD = "Cupboard Slot"; diff --git a/src/main/java/binnie/core/machines/inventory/TankValidator.java b/src/main/java/binnie/core/machines/inventory/TankValidator.java index d2b98a89..77956803 100644 --- a/src/main/java/binnie/core/machines/inventory/TankValidator.java +++ b/src/main/java/binnie/core/machines/inventory/TankValidator.java @@ -1,14 +1,17 @@ package binnie.core.machines.inventory; -import binnie.Binnie; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import binnie.Binnie; + public abstract class TankValidator extends Validator { + @Override public abstract boolean isValid(FluidStack liquid); public static class Basic extends TankValidator { + private Fluid fluid; public Basic(String name) { diff --git a/src/main/java/binnie/core/machines/inventory/TransferHandler.java b/src/main/java/binnie/core/machines/inventory/TransferHandler.java index 920caf62..9c325dd2 100644 --- a/src/main/java/binnie/core/machines/inventory/TransferHandler.java +++ b/src/main/java/binnie/core/machines/inventory/TransferHandler.java @@ -1,15 +1,17 @@ package binnie.core.machines.inventory; -import binnie.core.machines.Machine; -import binnie.core.machines.power.ITankMachine; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; +import binnie.core.machines.Machine; +import binnie.core.machines.power.ITankMachine; + // TODO unused class? public class TransferHandler { + public static ItemStack transfer(ItemStack item, IInventory origin, IInventory destination, boolean doAdd) { ItemStack ret = transferItemToInventory(item, destination, doAdd); if (destination instanceof ITankMachine) { @@ -26,7 +28,7 @@ public class TransferHandler { ItemStack addition = item.copy(); for (int i = 0; i < destination.getSizeInventory(); ++i) { - addition = transferToInventory(addition, destination, new int[] {i}, doAdd, false); + addition = transferToInventory(addition, destination, new int[] { i }, doAdd, false); if (addition == null) { return null; } @@ -34,8 +36,8 @@ public class TransferHandler { return addition; } - public static ItemStack transferToInventory( - ItemStack item, IInventory destination, int[] targetSlots, boolean doAdd, boolean ignoreValidation) { + public static ItemStack transferToInventory(ItemStack item, IInventory destination, int[] targetSlots, + boolean doAdd, boolean ignoreValidation) { for (int i : targetSlots) { if (destination.isItemValidForSlot(i, item) || ignoreValidation) { if (destination.getStackInSlot(i) == null) { @@ -74,11 +76,11 @@ public class TransferHandler { } } } - return new ItemStack[] {itemstack, merged}; + return new ItemStack[] { itemstack, merged }; } - public static ItemStack transferContainerIntoTank( - ItemStack item, IInventory origin, ITankMachine destination, boolean doAdd) { + public static ItemStack transferContainerIntoTank(ItemStack item, IInventory origin, ITankMachine destination, + boolean doAdd) { if (item == null) { return null; } @@ -91,8 +93,8 @@ public class TransferHandler { return stack; } - public static ItemStack transferTankIntoContainer( - ItemStack item, IInventory origin, ITankMachine destination, boolean doAdd) { + public static ItemStack transferTankIntoContainer(ItemStack item, IInventory origin, ITankMachine destination, + boolean doAdd) { if (item == null) { return null; } @@ -105,16 +107,16 @@ public class TransferHandler { return stack; } - public static ItemStack transferToTank( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + public static ItemStack transferToTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, + boolean doAdd) { if (item == null) { return item; } FluidStack containerLiquid = null; FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.filledContainer.isItemEqual(item)) { containerLiquidData = data; containerLiquid = data.fluid.copy(); @@ -170,8 +172,8 @@ public class TransferHandler { return leftOverContainers; } - public static ItemStack transferFromTank( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + public static ItemStack transferFromTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, + boolean doAdd) { if (item == null) { return item; } @@ -183,8 +185,8 @@ public class TransferHandler { } FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.emptyContainer.isItemEqual(item) && liquidInTank.isFluidEqual(data.fluid)) { containerLiquidData = data; break; diff --git a/src/main/java/binnie/core/machines/inventory/Validator.java b/src/main/java/binnie/core/machines/inventory/Validator.java index 78af0387..11732b80 100644 --- a/src/main/java/binnie/core/machines/inventory/Validator.java +++ b/src/main/java/binnie/core/machines/inventory/Validator.java @@ -3,5 +3,6 @@ package binnie.core.machines.inventory; import binnie.core.util.IValidator; public abstract class Validator implements IValidator { + public abstract String getTooltip(); } diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java index e721eaf7..80ee3b80 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorIcon.java @@ -1,12 +1,14 @@ package binnie.core.machines.inventory; +import java.util.ArrayList; +import java.util.List; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.resource.BinnieIcon; -import java.util.ArrayList; -import java.util.List; public class ValidatorIcon { + private List iconsInput; private List iconsOutput; diff --git a/src/main/java/binnie/core/machines/network/INetwork.java b/src/main/java/binnie/core/machines/network/INetwork.java index de92c46c..74cfc119 100644 --- a/src/main/java/binnie/core/machines/network/INetwork.java +++ b/src/main/java/binnie/core/machines/network/INetwork.java @@ -1,24 +1,31 @@ package binnie.core.machines.network; -import cpw.mods.fml.relauncher.Side; import java.util.Map; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.relauncher.Side; + public interface INetwork { + interface SendGuiNBT { + void sendGuiNBT(Map nbts); } interface TilePacketSync { + void syncToNBT(NBTTagCompound nbt); void syncFromNBT(NBTTagCompound nbt); } interface RecieveGuiNBT { + void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt); } - interface GuiNBT extends RecieveGuiNBT, SendGuiNBT {} + interface GuiNBT extends RecieveGuiNBT, SendGuiNBT { + } } diff --git a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java index 4a484839..7a7072b8 100644 --- a/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java +++ b/src/main/java/binnie/core/machines/power/ComponentPowerReceptor.java @@ -1,5 +1,13 @@ package binnie.core.machines.power; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.Mods; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; @@ -11,16 +19,11 @@ import cpw.mods.fml.common.Optional; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergyTile; -import java.util.LinkedList; -import java.util.List; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; @Optional.Interface(iface = "binnie.core.machines.component.IBuildcraft.TriggerProvider", modid = "BuildCraft|Silicon") public class ComponentPowerReceptor extends MachineComponent implements IPoweredMachine, IBuildcraft.TriggerProvider, IInteraction.ChunkUnload, IInteraction.Invalidation { + public float previousPower; public LinkedList inputs; @@ -168,15 +171,13 @@ public class ComponentPowerReceptor extends MachineComponent @Optional.Method(modid = "IC2") private void do_addToEnergyNet() { - MinecraftForge.EVENT_BUS.post( - new EnergyTileLoadEvent((IEnergyTile) getMachine().getTileEntity())); + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) getMachine().getTileEntity())); registeredToIC2EnergyNet = true; } @Optional.Method(modid = "IC2") private void do_removeFromEnergyNet() { - MinecraftForge.EVENT_BUS.post( - new EnergyTileUnloadEvent((IEnergyTile) getMachine().getTileEntity())); + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) getMachine().getTileEntity())); registeredToIC2EnergyNet = false; } } diff --git a/src/main/java/binnie/core/machines/power/ComponentProcess.java b/src/main/java/binnie/core/machines/power/ComponentProcess.java index ccb572ff..4d8da371 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcess.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcess.java @@ -1,9 +1,11 @@ package binnie.core.machines.power; -import binnie.core.machines.IMachine; import net.minecraft.nbt.NBTTagCompound; +import binnie.core.machines.IMachine; + public abstract class ComponentProcess extends ComponentProcessIndefinate implements IProcessTimed { + private float progressAmount; public ComponentProcess(IMachine machine) { diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java index 48e35374..063e2e29 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessIndefinate.java @@ -1,12 +1,14 @@ package binnie.core.machines.power; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.network.INetwork; import binnie.core.util.I18N; -import net.minecraft.nbt.NBTTagCompound; public abstract class ComponentProcessIndefinate extends MachineComponent implements IProcess, INetwork.TilePacketSync { + private float energyPerTick; private boolean inProgress; private float actionPauseProcess; diff --git a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java b/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java index 41052671..c89e8f1a 100644 --- a/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java +++ b/src/main/java/binnie/core/machines/power/ComponentProcessSetCost.java @@ -3,6 +3,7 @@ package binnie.core.machines.power; import binnie.core.machines.IMachine; public class ComponentProcessSetCost extends ComponentProcess { + private int processLength; private int processEnergy; diff --git a/src/main/java/binnie/core/machines/power/ErrorState.java b/src/main/java/binnie/core/machines/power/ErrorState.java index 1406f80d..5e9ab54c 100644 --- a/src/main/java/binnie/core/machines/power/ErrorState.java +++ b/src/main/java/binnie/core/machines/power/ErrorState.java @@ -1,10 +1,12 @@ package binnie.core.machines.power; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.util.I18N; import forestry.api.core.INBTTagable; -import net.minecraft.nbt.NBTTagCompound; public class ErrorState implements INBTTagable { + private String name; private String desc; private int[] data; @@ -89,20 +91,23 @@ public class ErrorState implements INBTTagable { } public static class Item extends ErrorState { + public Item(String name, String desc, int[] slots) { super(name, desc, slots); } } public static class Tank extends ErrorState { + public Tank(String name, String desc, int[] slots) { super(name, desc, slots); } } public static class NoItem extends Item { + public NoItem(String desc, int slot) { - this(desc, new int[] {slot}); + this(desc, new int[] { slot }); } public NoItem(String desc, int[] slots) { @@ -111,18 +116,20 @@ public class ErrorState implements INBTTagable { } public static class InvalidItem extends Item { + public InvalidItem(String desc, int slot) { this(I18N.localise("binniecore.machine.error.invalidItem"), desc, slot); } public InvalidItem(String name, String desc, int slot) { - super(name, desc, new int[] {slot}); + super(name, desc, new int[] { slot }); } } public static class NoSpace extends Item { + public NoSpace(String desc, int slot) { - super(I18N.localise("binniecore.machine.error.noSpace"), desc, new int[] {slot}); + super(I18N.localise("binniecore.machine.error.noSpace"), desc, new int[] { slot }); } public NoSpace(String desc, int[] slots) { @@ -131,6 +138,7 @@ public class ErrorState implements INBTTagable { } public static class InsufficientPower extends ErrorState { + public InsufficientPower() { super( I18N.localise("binniecore.machine.error.insufficientPower.title"), @@ -139,14 +147,16 @@ public class ErrorState implements INBTTagable { } public static class TankSpace extends Tank { + public TankSpace(String desc, int tank) { - super(I18N.localise("binniecore.machine.error.tankFull"), desc, new int[] {tank}); + super(I18N.localise("binniecore.machine.error.tankFull"), desc, new int[] { tank }); } } public static class InsufficientLiquid extends Tank { + public InsufficientLiquid(String desc, int tank) { - super(I18N.localise("binniecore.machine.error.insufficientLiquid"), desc, new int[] {tank}); + super(I18N.localise("binniecore.machine.error.insufficientLiquid"), desc, new int[] { tank }); } } } diff --git a/src/main/java/binnie/core/machines/power/IErrorStateSource.java b/src/main/java/binnie/core/machines/power/IErrorStateSource.java index 4924ad1f..44b55895 100644 --- a/src/main/java/binnie/core/machines/power/IErrorStateSource.java +++ b/src/main/java/binnie/core/machines/power/IErrorStateSource.java @@ -1,6 +1,7 @@ package binnie.core.machines.power; public interface IErrorStateSource { + ErrorState canWork(); ErrorState canProgress(); diff --git a/src/main/java/binnie/core/machines/power/IPoweredMachine.java b/src/main/java/binnie/core/machines/power/IPoweredMachine.java index 1672ed94..14106a9b 100644 --- a/src/main/java/binnie/core/machines/power/IPoweredMachine.java +++ b/src/main/java/binnie/core/machines/power/IPoweredMachine.java @@ -6,6 +6,7 @@ import ic2.api.energy.tile.IEnergySink; @Optional.Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2") public interface IPoweredMachine extends IEnergySink, IEnergyHandler { + PowerInfo getPowerInfo(); PowerInterface getInterface(); diff --git a/src/main/java/binnie/core/machines/power/IProcess.java b/src/main/java/binnie/core/machines/power/IProcess.java index 0286026a..ba70a6ad 100644 --- a/src/main/java/binnie/core/machines/power/IProcess.java +++ b/src/main/java/binnie/core/machines/power/IProcess.java @@ -1,6 +1,7 @@ package binnie.core.machines.power; public interface IProcess extends IErrorStateSource { + float getEnergyPerTick(); String getTooltip(); diff --git a/src/main/java/binnie/core/machines/power/IProcessTimed.java b/src/main/java/binnie/core/machines/power/IProcessTimed.java index 5500698f..4183db17 100644 --- a/src/main/java/binnie/core/machines/power/IProcessTimed.java +++ b/src/main/java/binnie/core/machines/power/IProcessTimed.java @@ -1,6 +1,7 @@ package binnie.core.machines.power; interface IProcessTimed extends IProcess, IErrorStateSource { + int getProcessLength(); int getProcessEnergy(); diff --git a/src/main/java/binnie/core/machines/power/ITankMachine.java b/src/main/java/binnie/core/machines/power/ITankMachine.java index 5ece7ca6..7aee1482 100644 --- a/src/main/java/binnie/core/machines/power/ITankMachine.java +++ b/src/main/java/binnie/core/machines/power/ITankMachine.java @@ -1,11 +1,13 @@ package binnie.core.machines.power; -import binnie.core.machines.inventory.IValidatedTankContainer; -import binnie.core.machines.inventory.TankSlot; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; +import binnie.core.machines.inventory.IValidatedTankContainer; +import binnie.core.machines.inventory.TankSlot; + public interface ITankMachine extends IFluidHandler, IValidatedTankContainer { + TankInfo[] getTankInfos(); IFluidTank[] getTanks(); diff --git a/src/main/java/binnie/core/machines/power/PowerInfo.java b/src/main/java/binnie/core/machines/power/PowerInfo.java index 42290332..d8005d0a 100644 --- a/src/main/java/binnie/core/machines/power/PowerInfo.java +++ b/src/main/java/binnie/core/machines/power/PowerInfo.java @@ -1,9 +1,11 @@ package binnie.core.machines.power; -import forestry.api.core.INBTTagable; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.core.INBTTagable; + public class PowerInfo implements INBTTagable { + private float currentEnergy; private float maxEnergy; diff --git a/src/main/java/binnie/core/machines/power/PowerInterface.java b/src/main/java/binnie/core/machines/power/PowerInterface.java index 6815c895..4f95c051 100644 --- a/src/main/java/binnie/core/machines/power/PowerInterface.java +++ b/src/main/java/binnie/core/machines/power/PowerInterface.java @@ -1,9 +1,11 @@ package binnie.core.machines.power; -import forestry.api.core.INBTTagable; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.core.INBTTagable; + public class PowerInterface implements INBTTagable { + private int capacity; private int energy; diff --git a/src/main/java/binnie/core/machines/power/PowerSystem.java b/src/main/java/binnie/core/machines/power/PowerSystem.java index ac62de2c..96333110 100644 --- a/src/main/java/binnie/core/machines/power/PowerSystem.java +++ b/src/main/java/binnie/core/machines/power/PowerSystem.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public enum PowerSystem { + MJ(100.0), RF(10.0), EU(40.0); diff --git a/src/main/java/binnie/core/machines/power/ProcessInfo.java b/src/main/java/binnie/core/machines/power/ProcessInfo.java index 5d722fbc..22f42211 100644 --- a/src/main/java/binnie/core/machines/power/ProcessInfo.java +++ b/src/main/java/binnie/core/machines/power/ProcessInfo.java @@ -1,9 +1,11 @@ package binnie.core.machines.power; -import forestry.api.core.INBTTagable; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.core.INBTTagable; + public class ProcessInfo implements INBTTagable { + private float currentProgress; private int processEnergy; private int processTime; diff --git a/src/main/java/binnie/core/machines/power/TankInfo.java b/src/main/java/binnie/core/machines/power/TankInfo.java index 35179089..63fdea5d 100644 --- a/src/main/java/binnie/core/machines/power/TankInfo.java +++ b/src/main/java/binnie/core/machines/power/TankInfo.java @@ -1,12 +1,14 @@ package binnie.core.machines.power; -import forestry.api.core.INBTTagable; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; +import forestry.api.core.INBTTagable; + public class TankInfo implements INBTTagable { + public FluidStack liquid; private float capacity; diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index b6ee135a..9adc2852 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -1,5 +1,9 @@ package binnie.core.machines.storage; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.BinnieCore; import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; @@ -7,11 +11,9 @@ import binnie.core.machines.MachinePackage; import binnie.core.machines.TileEntityMachine; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; enum Compartment implements IMachineType { + Compartment(StandardCompartment.PackageCompartment.class), CompartmentCopper(StandardCompartment.PackageCompartmentCopper.class), CompartmentBronze(StandardCompartment.PackageCompartmentBronze.class), @@ -40,6 +42,7 @@ enum Compartment implements IMachineType { } public abstract static class PackageCompartment extends MachinePackage { + private BinnieResource renderTexture; protected PackageCompartment(String uid, IBinnieTexture renderTexture) { @@ -53,8 +56,8 @@ enum Compartment implements IMachineType { } @Override - public void renderMachine( - Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, + RenderBlocks renderer) { MachineRendererCompartment.instance.renderMachine(machine, 0xffffff, renderTexture, x, y, z, partialTick); } } diff --git a/src/main/java/binnie/core/machines/storage/CompartmentTab.java b/src/main/java/binnie/core/machines/storage/CompartmentTab.java index 9aaddef6..9e48eb96 100644 --- a/src/main/java/binnie/core/machines/storage/CompartmentTab.java +++ b/src/main/java/binnie/core/machines/storage/CompartmentTab.java @@ -1,12 +1,14 @@ package binnie.core.machines.storage; -import binnie.core.craftgui.minecraft.EnumColor; -import forestry.api.core.INBTTagable; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import binnie.core.craftgui.minecraft.EnumColor; +import forestry.api.core.INBTTagable; + class CompartmentTab implements INBTTagable { + private String name; private ItemStack icon; private EnumColor color; diff --git a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java index 1d2155a0..f479831a 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java +++ b/src/main/java/binnie/core/machines/storage/ComponentBinnieCoreGUI.java @@ -1,14 +1,16 @@ package binnie.core.machines.storage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; class ComponentBinnieCoreGUI extends MachineComponent implements IInteraction.RightClick { + private BinnieCoreGUI id; public ComponentBinnieCoreGUI(Machine machine, BinnieCoreGUI id) { diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index d427db2d..4a1164fe 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -1,16 +1,19 @@ package binnie.core.machines.storage; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import binnie.core.machines.IMachine; import binnie.core.machines.inventory.ComponentInventorySlots; import binnie.core.machines.network.INetwork; import cpw.mods.fml.relauncher.Side; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; class ComponentCompartmentInventory extends ComponentInventorySlots implements INetwork.GuiNBT { + private int numberOfTabs; private int slotsPerPage; private Map tabs; diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 6aa6ed76..b235ce5e 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -10,6 +10,7 @@ import binnie.core.craftgui.controls.core.IControlValue; import binnie.core.craftgui.minecraft.EnumColor; class ControlColourSelector extends Control implements ITooltip, IControlValue { + private EnumColor value; public ControlColourSelector(IWidget parent, float x, float y, float w, float h, EnumColor value) { diff --git a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java index 709b6f8b..84c545c8 100644 --- a/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java +++ b/src/main/java/binnie/core/machines/storage/MachineRendererCompartment.java @@ -1,14 +1,16 @@ package binnie.core.machines.storage; +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.machines.Machine; import binnie.core.resource.BinnieResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) class MachineRendererCompartment { + public static MachineRendererCompartment instance = new MachineRendererCompartment(); private ModelCompartment model; @@ -16,8 +18,8 @@ class MachineRendererCompartment { model = new ModelCompartment(); } - public void renderMachine( - Machine machine, int colour, BinnieResource texture, double x, double y, double z, float var8) { + public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, + float var8) { GL11.glPushMatrix(); int i1 = 0; int ix = machine.getTileEntity().xCoord; diff --git a/src/main/java/binnie/core/machines/storage/ModelCompartment.java b/src/main/java/binnie/core/machines/storage/ModelCompartment.java index f463a3e0..48124a02 100644 --- a/src/main/java/binnie/core/machines/storage/ModelCompartment.java +++ b/src/main/java/binnie/core/machines/storage/ModelCompartment.java @@ -5,6 +5,7 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; class ModelCompartment extends ModelBase { + private ModelRenderer column1; private ModelRenderer column4; private ModelRenderer column2; diff --git a/src/main/java/binnie/core/machines/storage/ModuleStorage.java b/src/main/java/binnie/core/machines/storage/ModuleStorage.java index 3353ed43..e5a13347 100644 --- a/src/main/java/binnie/core/machines/storage/ModuleStorage.java +++ b/src/main/java/binnie/core/machines/storage/ModuleStorage.java @@ -1,20 +1,25 @@ package binnie.core.machines.storage; -import binnie.core.BinnieCore; -import binnie.core.IInitializable; -import binnie.core.machines.MachineGroup; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import binnie.core.BinnieCore; +import binnie.core.IInitializable; +import binnie.core.machines.MachineGroup; +import cpw.mods.fml.common.registry.GameRegistry; + public class ModuleStorage implements IInitializable { + @Override public void preInit() { - BinnieCore.packageCompartment = - new MachineGroup(BinnieCore.instance, "storage", "storage", Compartment.values()); + BinnieCore.packageCompartment = new MachineGroup( + BinnieCore.instance, + "storage", + "storage", + Compartment.values()); BinnieCore.packageCompartment.setCreativeTab(CreativeTabs.tabBlock); } @@ -29,23 +34,35 @@ public class ModuleStorage implements IInitializable { String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "ingotGold" : "gearGold"; String diamondGear = "gemDiamond"; - GameRegistry.addRecipe(new ShapedOreRecipe( - Compartment.Compartment.get(1), - new Object[] {"pcp", "cbc", "pcp", 'b', Items.book, 'c', Blocks.chest, 'p', Blocks.stone_button})); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentCopper.get(1), new Object[] { - "pcp", "cbc", "pcp", 'b', Compartment.Compartment.get(1), 'c', "gearCopper", 'p', Blocks.stone_button - })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentBronze.get(1), new Object[] { - "pcp", "cbc", "pcp", 'b', Compartment.CompartmentCopper.get(1), 'c', "gearBronze", 'p', Items.gold_nugget - })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentIron.get(1), new Object[] { - "pcp", "cbc", "pcp", 'b', Compartment.CompartmentCopper.get(1), 'c', ironGear, 'p', Items.gold_nugget - })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentGold.get(1), new Object[] { - "pcp", "cbc", "pcp", 'b', Compartment.CompartmentIron.get(1), 'c', goldGear, 'p', Items.emerald - })); - GameRegistry.addRecipe(new ShapedOreRecipe(Compartment.CompartmentDiamond.get(1), new Object[] { - "pcp", "cbc", "pcp", 'b', Compartment.CompartmentGold.get(1), 'c', diamondGear, 'p', Items.emerald - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Compartment.Compartment.get(1), + new Object[] { "pcp", "cbc", "pcp", 'b', Items.book, 'c', Blocks.chest, 'p', + Blocks.stone_button })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Compartment.CompartmentCopper.get(1), + new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.Compartment.get(1), 'c', "gearCopper", 'p', + Blocks.stone_button })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Compartment.CompartmentBronze.get(1), + new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentCopper.get(1), 'c', + "gearBronze", 'p', Items.gold_nugget })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Compartment.CompartmentIron.get(1), + new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentCopper.get(1), 'c', ironGear, + 'p', Items.gold_nugget })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Compartment.CompartmentGold.get(1), + new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentIron.get(1), 'c', goldGear, 'p', + Items.emerald })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + Compartment.CompartmentDiamond.get(1), + new Object[] { "pcp", "cbc", "pcp", 'b', Compartment.CompartmentGold.get(1), 'c', diamondGear, + 'p', Items.emerald })); } } diff --git a/src/main/java/binnie/core/machines/storage/StandardCompartment.java b/src/main/java/binnie/core/machines/storage/StandardCompartment.java index d30f69cd..902f1153 100644 --- a/src/main/java/binnie/core/machines/storage/StandardCompartment.java +++ b/src/main/java/binnie/core/machines/storage/StandardCompartment.java @@ -1,13 +1,16 @@ package binnie.core.machines.storage; +import net.minecraft.tileentity.TileEntity; + import binnie.core.gui.BinnieCoreGUI; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.texture.BinnieCoreTexture; -import net.minecraft.tileentity.TileEntity; class StandardCompartment { + public static class PackageCompartment extends Compartment.PackageCompartment { + public PackageCompartment() { super("compartment", BinnieCoreTexture.Compartment); } @@ -25,6 +28,7 @@ class StandardCompartment { } public static class PackageCompartmentCopper extends Compartment.PackageCompartment { + public PackageCompartmentCopper() { super("compartmentCopper", BinnieCoreTexture.CompartmentCopper); } @@ -42,6 +46,7 @@ class StandardCompartment { } public static class PackageCompartmentBronze extends Compartment.PackageCompartment { + public PackageCompartmentBronze() { super("compartmentBronze", BinnieCoreTexture.CompartmentBronze); } @@ -59,6 +64,7 @@ class StandardCompartment { } public static class PackageCompartmentIron extends Compartment.PackageCompartment { + public PackageCompartmentIron() { super("compartmentIron", BinnieCoreTexture.CompartmentIron); } @@ -76,6 +82,7 @@ class StandardCompartment { } public static class PackageCompartmentGold extends Compartment.PackageCompartment { + public PackageCompartmentGold() { super("compartmentGold", BinnieCoreTexture.CompartmentGold); } @@ -93,6 +100,7 @@ class StandardCompartment { } public static class PackageCompartmentDiamond extends Compartment.PackageCompartment { + public PackageCompartmentDiamond() { super("compartmentDiamond", BinnieCoreTexture.CompartmentDiamond); } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index f433442f..39c38632 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -1,5 +1,22 @@ package binnie.core.machines.storage; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.craftgui.CraftGUI; @@ -42,24 +59,10 @@ import binnie.core.machines.transfer.TransferRequest; import binnie.core.util.I18N; import binnie.genetics.craftgui.WindowMachine; import cpw.mods.fml.relauncher.Side; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; @SuppressWarnings("Duplicates") public class WindowCompartment extends WindowMachine implements IWindowAffectsShiftClick { + private Map panels; private ControlTextEdit tabName; private ControlItemDisplay tabIcon; @@ -81,21 +84,21 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); int x = 16; int y = 32; - ComponentCompartmentInventory inv = - Machine.getMachine(getInventory()).getInterface(ComponentCompartmentInventory.class); + ComponentCompartmentInventory inv = Machine.getMachine(getInventory()) + .getInterface(ComponentCompartmentInventory.class); Integer[] tabs1 = new Integer[0]; Integer[] tabs2 = new Integer[0]; if (inv.getTabNumber() == 4) { - tabs1 = new Integer[] {0, 1}; - tabs2 = new Integer[] {2, 3}; + tabs1 = new Integer[] { 0, 1 }; + tabs2 = new Integer[] { 2, 3 }; } if (inv.getTabNumber() == 6) { - tabs1 = new Integer[] {0, 1, 2}; - tabs2 = new Integer[] {3, 4, 5}; + tabs1 = new Integer[] { 0, 1, 2 }; + tabs2 = new Integer[] { 3, 4, 5 }; } if (inv.getTabNumber() == 8) { - tabs1 = new Integer[] {0, 1, 2, 3}; - tabs2 = new Integer[] {4, 5, 6, 7}; + tabs1 = new Integer[] { 0, 1, 2, 3 }; + tabs2 = new Integer[] { 4, 5, 6, 7 }; } boolean doubleTabbed = tabs2.length > 0; int compartmentPageWidth = 16 + 18 * inv.getPageSize() / 5; @@ -103,56 +106,65 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh int compartmentWidth = compartmentPageWidth + (doubleTabbed ? 48 : 24); Control controlCompartment = new Control(this, x, y, compartmentWidth, compartmentPageHeight); - ControlTabBar tab = - new ControlTabBar( - controlCompartment, 0.0f, 0.0f, 24.0f, compartmentPageHeight, Position.LEFT) { + ControlTabBar tab = new ControlTabBar( + controlCompartment, + 0.0f, + 0.0f, + 24.0f, + compartmentPageHeight, + Position.LEFT) { + + @Override + public ControlTab createTab(float x, float y, float w, float h, Integer value) { + return new ControlTabIcon(this, x, y, w, h, value) { + @Override - public ControlTab createTab(float x, float y, float w, float h, Integer value) { - return new ControlTabIcon(this, x, y, w, h, value) { - @Override - public ItemStack getItemStack() { - return getTab(value).getIcon(); - } + public ItemStack getItemStack() { + return getTab(value).getIcon(); + } - @Override - public String getName() { - return getTab(value).getName(); - } + @Override + public String getName() { + return getTab(value).getName(); + } - @Override - public int getOutlineColor() { - return getTab(value).getColor().getColor(); - } + @Override + public int getOutlineColor() { + return getTab(value).getColor().getColor(); + } - @Override - public boolean hasOutline() { - return true; - } - }; + @Override + public boolean hasOutline() { + return true; } }; - - String[] tabHelp = { - I18N.localise("binniecore.machine.storage.tab"), I18N.localise("binniecore.machine.storage.tab.desc") + } }; + + String[] tabHelp = { I18N.localise("binniecore.machine.storage.tab"), + I18N.localise("binniecore.machine.storage.tab.desc") }; tab.addHelp(tabHelp); tab.setValues(Arrays.asList(tabs1)); tab.setValue(0); - tab.addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - NBTTagCompound nbt = new NBTTagCompound(); - int i = (Integer) event.getValue(); - nbt.setByte("i", (byte) i); - Window.get(tab).sendClientAction("tab-change", nbt); - currentTab = i; - } - }.setOrigin(EventHandler.Origin.DirectChild, tab)); + tab.addEventHandler(new EventValueChanged.Handler() { + + @Override + public void onEvent(EventValueChanged event) { + NBTTagCompound nbt = new NBTTagCompound(); + int i = (Integer) event.getValue(); + nbt.setByte("i", (byte) i); + Window.get(tab).sendClientAction("tab-change", nbt); + currentTab = i; + } + }.setOrigin(EventHandler.Origin.DirectChild, tab)); x += 24; - ControlPages compartmentPages = - new ControlPages<>(controlCompartment, 24.0f, 0.0f, compartmentPageWidth, compartmentPageHeight); + ControlPages compartmentPages = new ControlPages<>( + controlCompartment, + 24.0f, + 0.0f, + compartmentPageWidth, + compartmentPageHeight); ControlPage[] page = new ControlPage[inv.getTabNumber()]; for (int p = 0; p < inv.getTabNumber(); ++p) { page[p] = new ControlPage(compartmentPages, p); @@ -162,6 +174,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh for (int p2 = 0; p2 < inv.getTabNumber(); ++p2) { ControlPage thisPage = page[p2]; Panel panel = new Panel(thisPage, 0.0f, 0.0f, thisPage.w(), thisPage.h(), MinecraftGUI.PanelType.Black) { + @Override public void onRenderForeground() { Texture iTexture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline); @@ -179,53 +192,54 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } x += compartmentPageWidth; if (tabs2.length > 0) { - ControlTabBar tab2 = - new ControlTabBar( - controlCompartment, - 24 + compartmentPageWidth, - 0.0f, - 24.0f, - compartmentPageHeight, - Position.RIGHT) { + ControlTabBar tab2 = new ControlTabBar( + controlCompartment, + 24 + compartmentPageWidth, + 0.0f, + 24.0f, + compartmentPageHeight, + Position.RIGHT) { + + @Override + public ControlTab createTab(float x, float y, float w, float h, Integer value) { + return new ControlTabIcon(this, x, y, w, h, value) { + @Override - public ControlTab createTab(float x, float y, float w, float h, Integer value) { - return new ControlTabIcon(this, x, y, w, h, value) { - @Override - public ItemStack getItemStack() { - return getTab(value).getIcon(); - } + public ItemStack getItemStack() { + return getTab(value).getIcon(); + } - @Override - public String getName() { - return getTab(value).getName(); - } + @Override + public String getName() { + return getTab(value).getName(); + } - @Override - public int getOutlineColor() { - return getTab(value).getColor().getColor(); - } + @Override + public int getOutlineColor() { + return getTab(value).getColor().getColor(); + } - @Override - public boolean hasOutline() { - return true; - } - }; + @Override + public boolean hasOutline() { + return true; } }; + } + }; tab2.setValues(Arrays.asList(tabs2)); tab2.setValue(0); tab2.addHelp(tabHelp); - tab2.addEventHandler( - new EventValueChanged.Handler() { - @Override - public void onEvent(EventValueChanged event) { - NBTTagCompound nbt = new NBTTagCompound(); - int i = (Integer) event.getValue(); - nbt.setByte("i", (byte) i); - Window.get(tab).sendClientAction("tab-change", nbt); - currentTab = i; - } - }.setOrigin(EventHandler.Origin.DirectChild, tab2)); + tab2.addEventHandler(new EventValueChanged.Handler() { + + @Override + public void onEvent(EventValueChanged event) { + NBTTagCompound nbt = new NBTTagCompound(); + int i = (Integer) event.getValue(); + nbt.setByte("i", (byte) i); + Window.get(tab).sendClientAction("tab-change", nbt); + currentTab = i; + } + }.setOrigin(EventHandler.Origin.DirectChild, tab2)); CraftGUIUtil.linkWidgets(tab2, compartmentPages); x += 24; } @@ -245,17 +259,17 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh y2 += 12; tabName = new ControlTextEdit(tabPropertyPanel, x2, y2, 104.0f, 12.0f); - tabName.addSelfEventHandler( - new EventTextEdit.Handler() { - @Override - public void onEvent(EventTextEdit event) { - CompartmentTab tab = getCurrentTab(); - tab.setName(event.getValue()); - NBTTagCompound nbt = new NBTTagCompound(); - tab.writeToNBT(nbt); - sendClientAction("comp-change-tab", nbt); - } - }.setOrigin(EventHandler.Origin.Self, tabName)); + tabName.addSelfEventHandler(new EventTextEdit.Handler() { + + @Override + public void onEvent(EventTextEdit event) { + CompartmentTab tab = getCurrentTab(); + tab.setName(event.getValue()); + NBTTagCompound nbt = new NBTTagCompound(); + tab.writeToNBT(nbt); + sendClientAction("comp-change-tab", nbt); + } + }.setOrigin(EventHandler.Origin.Self, tabName)); y2 += 20; new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.icon")); @@ -263,6 +277,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh tabIcon.setItemStack(new ItemStack(Items.paper)); tabIcon.addAttribute(WidgetAttribute.MOUSE_OVER); tabIcon.addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { if (getHeldItemStack() == null) { @@ -285,12 +300,23 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.color")); int cw = 8; - Panel panelColour = - new Panel(tabPropertyPanel, 40.0f, y2 - 4, cw * 8 + 2, cw * 2 + 1, MinecraftGUI.PanelType.Gray); + Panel panelColour = new Panel( + tabPropertyPanel, + 40.0f, + y2 - 4, + cw * 8 + 2, + cw * 2 + 1, + MinecraftGUI.PanelType.Gray); for (int cc = 0; cc < 16; ++cc) { ControlColourSelector color = new ControlColourSelector( - panelColour, 1 + cw * (cc % 8), 1 + cw * (cc / 8), cw, cw, EnumColor.values()[cc]); + panelColour, + 1 + cw * (cc % 8), + 1 + cw * (cc / 8), + cw, + cw, + EnumColor.values()[cc]); color.addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { CompartmentTab tab = getCurrentTab(); @@ -311,6 +337,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh public void createSearchDialog() { new Dialog(this, 252.0f, 192.0f) { + Control slotGrid; String textSearch = ""; boolean sortByName = false; @@ -324,19 +351,26 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @Override public void initialise() { - ControlScrollableContent scroll = - new ControlScrollableContent(this, 124.0f, 16.0f, 116.0f, 92.0f, 6.0f) { - @Override - public void onRenderBackground() { - CraftGUI.render.color(11184810); - CraftGUI.render.texture( - CraftGUITexture.Outline, getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f))); - } - }; + ControlScrollableContent scroll = new ControlScrollableContent( + this, + 124.0f, + 16.0f, + 116.0f, + 92.0f, + 6.0f) { + + @Override + public void onRenderBackground() { + CraftGUI.render.color(11184810); + CraftGUI.render + .texture(CraftGUITexture.Outline, getArea().inset(new IBorder(0.0f, 6.0f, 0.0f, 0.0f))); + } + }; slotGrid = new Control(scroll, 1.0f, 1.0f, 108.0f, 18.0f); scroll.setScrollableContent(slotGrid); new ControlPlayerInventory(this, true); new ControlTextEdit(this, 16.0f, 16.0f, 100.0f, 14.0f).addEventHandler(new EventTextEdit.Handler() { + @Override public void onEvent(EventTextEdit event) { textSearch = event.value; @@ -346,7 +380,13 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh includeItems = true; includeBlocks = true; new ControlCheckbox( - this, 16.0f, 40.0f, 100.0f, I18N.localise("binniecore.machine.storage.sort"), sortByName) { + this, + 16.0f, + 40.0f, + 100.0f, + I18N.localise("binniecore.machine.storage.sort"), + sortByName) { + @Override protected void onValueChanged(boolean value) { sortByName = value; @@ -360,6 +400,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh 100.0f, I18N.localise("binniecore.machine.storage.filterItems"), includeItems) { + @Override protected void onValueChanged(boolean value) { includeItems = value; @@ -373,6 +414,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh 100.0f, I18N.localise("binniecore.machine.storage.filterBlocks"), includeBlocks) { + @Override protected void onValueChanged(boolean value) { includeBlocks = value; @@ -403,6 +445,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh if (sortByName) { List> list = new LinkedList(slotIds.entrySet()); list.sort(new Comparator>() { + @Override public int compare(Entry o1, Entry o2) { return -o2.getValue().compareTo(o1.getValue()); @@ -484,15 +527,14 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh public void alterRequest(TransferRequest request) { IInventory inventory = getInventory(); if (request.getDestination() == inventory) { - ComponentCompartmentInventory inv = - Machine.getMachine(inventory).getInterface(ComponentCompartmentInventory.class); + ComponentCompartmentInventory inv = Machine.getMachine(inventory) + .getInterface(ComponentCompartmentInventory.class); request.setTargetSlots(inv.getSlotsForTab(currentTab)); } } public CompartmentTab getTab(int i) { - return Machine.getInterface(ComponentCompartmentInventory.class, getInventory()) - .getTab(i); + return Machine.getInterface(ComponentCompartmentInventory.class, getInventory()).getTab(i); } public CompartmentTab getCurrentTab() { @@ -500,6 +542,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } private class SearchButton extends ControlButton { + public SearchButton(Control controlCompartment, int compartmentWidth, int compartmentPageHeight) { super( controlCompartment, diff --git a/src/main/java/binnie/core/machines/transfer/TransferHandler.java b/src/main/java/binnie/core/machines/transfer/TransferHandler.java index 7cafe3f1..210f0b2f 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferHandler.java +++ b/src/main/java/binnie/core/machines/transfer/TransferHandler.java @@ -1,4 +1,5 @@ package binnie.core.machines.transfer; // TODO unused class? -public class TransferHandler {} +public class TransferHandler { +} diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index 795d36d4..65a30d66 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -1,11 +1,8 @@ package binnie.core.machines.transfer; -import binnie.core.machines.Machine; -import binnie.core.machines.inventory.IInventorySlots; -import binnie.core.machines.inventory.IValidatedTankContainer; -import binnie.core.machines.power.ITankMachine; import java.util.ArrayList; import java.util.List; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -13,7 +10,13 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidTank; +import binnie.core.machines.Machine; +import binnie.core.machines.inventory.IInventorySlots; +import binnie.core.machines.inventory.IValidatedTankContainer; +import binnie.core.machines.power.ITankMachine; + public class TransferRequest { + private ItemStack itemToTransfer; private ItemStack returnItem; private IInventory origin; @@ -120,8 +123,7 @@ public class TransferRequest { || !((IInventorySlots) destination).getSlot(slot).isRecipe()) { if (destination.getStackInSlot(slot) != null) { if (item.isStackable()) { - ItemStack merged = - destination.getStackInSlot(slot).copy(); + ItemStack merged = destination.getStackInSlot(slot).copy(); ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy()); item = newStacks[0]; if (!areItemsEqual(merged, newStacks[1])) { @@ -178,18 +180,18 @@ public class TransferRequest { } } } - return new ItemStack[] {itemstack, merged}; + return new ItemStack[] { itemstack, merged }; } - private ItemStack transferToTank( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + private ItemStack transferToTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, + boolean doAdd) { item = transferToTankUsingContainerData(item, origin, destination, tankID, doAdd); item = transferToTankUsingFluidContainer(item, origin, destination, tankID, doAdd); return item; } - private ItemStack transferToTankUsingFluidContainer( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + private ItemStack transferToTankUsingFluidContainer(ItemStack item, IInventory origin, ITankMachine destination, + int tankID, boolean doAdd) { if (item == null || !(item.getItem() instanceof IFluidContainerItem)) { return item; } @@ -214,16 +216,16 @@ public class TransferRequest { return item; } - private ItemStack transferToTankUsingContainerData( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + private ItemStack transferToTankUsingContainerData(ItemStack item, IInventory origin, ITankMachine destination, + int tankID, boolean doAdd) { if (item == null) { return item; } FluidStack containerLiquid = null; FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.filledContainer.isItemEqual(item)) { containerLiquidData = data; containerLiquid = data.fluid.copy(); @@ -282,15 +284,15 @@ public class TransferRequest { return leftOverContainers; } - private ItemStack transferFromTank( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + private ItemStack transferFromTank(ItemStack item, IInventory origin, ITankMachine destination, int tankID, + boolean doAdd) { item = transferFromTankUsingContainerData(item, origin, destination, tankID, doAdd); item = transferFromTankUsingFluidContainer(item, origin, destination, tankID, doAdd); return item; } - private ItemStack transferFromTankUsingFluidContainer( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + private ItemStack transferFromTankUsingFluidContainer(ItemStack item, IInventory origin, ITankMachine destination, + int tankID, boolean doAdd) { if (item == null || !(item.getItem() instanceof IFluidContainerItem)) { return item; } @@ -312,8 +314,8 @@ public class TransferRequest { return item; } - private ItemStack transferFromTankUsingContainerData( - ItemStack item, IInventory origin, ITankMachine destination, int tankID, boolean doAdd) { + private ItemStack transferFromTankUsingContainerData(ItemStack item, IInventory origin, ITankMachine destination, + int tankID, boolean doAdd) { if (item == null) { return item; } @@ -325,8 +327,8 @@ public class TransferRequest { } FluidContainerRegistry.FluidContainerData containerLiquidData = null; - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.emptyContainer.isItemEqual(item) && liquidInTank.isFluidEqual(data.fluid)) { containerLiquidData = data; break; @@ -409,6 +411,7 @@ public class TransferRequest { } public static class TransferSlot { + public int id; public IInventory inventory; diff --git a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java index 96b26706..b97eea85 100644 --- a/src/main/java/binnie/core/mod/config/BinnieConfiguration.java +++ b/src/main/java/binnie/core/mod/config/BinnieConfiguration.java @@ -1,11 +1,14 @@ package binnie.core.mod.config; +import java.io.File; + +import net.minecraftforge.common.config.Configuration; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; -import java.io.File; -import net.minecraftforge.common.config.Configuration; class BinnieConfiguration extends Configuration { + public AbstractMod mod; private String filename; diff --git a/src/main/java/binnie/core/mod/config/BinnieItemData.java b/src/main/java/binnie/core/mod/config/BinnieItemData.java index 7e927192..af1ef5f8 100644 --- a/src/main/java/binnie/core/mod/config/BinnieItemData.java +++ b/src/main/java/binnie/core/mod/config/BinnieItemData.java @@ -2,6 +2,7 @@ package binnie.core.mod.config; // TODO Why do we need this class? class BinnieItemData { + private int item; private BinnieConfiguration configFile; private String configKey; diff --git a/src/main/java/binnie/core/mod/config/ConfigFile.java b/src/main/java/binnie/core/mod/config/ConfigFile.java index 6c1ccf88..ad023ff4 100644 --- a/src/main/java/binnie/core/mod/config/ConfigFile.java +++ b/src/main/java/binnie/core/mod/config/ConfigFile.java @@ -5,5 +5,6 @@ import java.lang.annotation.RetentionPolicy; @Retention(RetentionPolicy.RUNTIME) public @interface ConfigFile { + String filename(); } diff --git a/src/main/java/binnie/core/mod/config/ConfigProperty.java b/src/main/java/binnie/core/mod/config/ConfigProperty.java index 1e532cc2..9ad11cb5 100644 --- a/src/main/java/binnie/core/mod/config/ConfigProperty.java +++ b/src/main/java/binnie/core/mod/config/ConfigProperty.java @@ -6,8 +6,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD}) +@Target({ ElementType.FIELD }) public @interface ConfigProperty { + String key(); String category() default ""; @@ -15,8 +16,9 @@ public @interface ConfigProperty { String[] comment() default {}; @Retention(RetentionPolicy.RUNTIME) - @Target({ElementType.ANNOTATION_TYPE}) + @Target({ ElementType.ANNOTATION_TYPE }) @interface Type { + Class propertyClass(); String category() default "general"; diff --git a/src/main/java/binnie/core/mod/config/ConfigurationMain.java b/src/main/java/binnie/core/mod/config/ConfigurationMain.java index 79394329..b4bbc736 100644 --- a/src/main/java/binnie/core/mod/config/ConfigurationMain.java +++ b/src/main/java/binnie/core/mod/config/ConfigurationMain.java @@ -1,4 +1,5 @@ package binnie.core.mod.config; @ConfigFile(filename = "/config/forestry/binniecore/main.conf") -public class ConfigurationMain {} +public class ConfigurationMain { +} diff --git a/src/main/java/binnie/core/mod/config/ConfigurationMods.java b/src/main/java/binnie/core/mod/config/ConfigurationMods.java index 6f3ac59d..7323e84f 100644 --- a/src/main/java/binnie/core/mod/config/ConfigurationMods.java +++ b/src/main/java/binnie/core/mod/config/ConfigurationMods.java @@ -2,27 +2,20 @@ package binnie.core.mod.config; @ConfigFile(filename = "/config/forestry/binnie-mods.conf") public class ConfigurationMods { - @ConfigProperty( - key = "extraBees", - comment = {"Enables the Extra Bees Mod."}) + + @ConfigProperty(key = "extraBees", comment = { "Enables the Extra Bees Mod." }) @PropBoolean public static boolean extraBees = true; - @ConfigProperty( - key = "extraTrees", - comment = {"Enables the Extra Trees Mod."}) + @ConfigProperty(key = "extraTrees", comment = { "Enables the Extra Trees Mod." }) @PropBoolean public static boolean extraTrees = true; - @ConfigProperty( - key = "botany", - comment = {"Enables the Botany Mod."}) + @ConfigProperty(key = "botany", comment = { "Enables the Botany Mod." }) @PropBoolean public static boolean botany = true; - @ConfigProperty( - key = "genetics", - comment = {"Enables the Genetics Mod."}) + @ConfigProperty(key = "genetics", comment = { "Enables the Genetics Mod." }) @PropBoolean public static boolean genetics = true; } diff --git a/src/main/java/binnie/core/mod/config/ManagerConfig.java b/src/main/java/binnie/core/mod/config/ManagerConfig.java index 0134c955..a893f030 100644 --- a/src/main/java/binnie/core/mod/config/ManagerConfig.java +++ b/src/main/java/binnie/core/mod/config/ManagerConfig.java @@ -1,7 +1,5 @@ package binnie.core.mod.config; -import binnie.core.AbstractMod; -import binnie.core.ManagerBase; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.ArrayList; @@ -9,9 +7,14 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; + import net.minecraftforge.common.config.Configuration; +import binnie.core.AbstractMod; +import binnie.core.ManagerBase; + public class ManagerConfig extends ManagerBase { + private Map, Configuration> configurations; private Map> itemIDs; @@ -36,18 +39,14 @@ public class ManagerConfig extends ManagerBase { ConfigProperty propertyAnnot = field.getAnnotation(ConfigProperty.class); for (Annotation annotation : field.getAnnotations()) { if (annotation.annotationType().isAnnotationPresent(ConfigProperty.Type.class)) { - Class propertyClass = annotation - .annotationType() - .getAnnotation(ConfigProperty.Type.class) - .propertyClass(); + Class propertyClass = annotation.annotationType() + .getAnnotation(ConfigProperty.Type.class).propertyClass(); // TODO what for? - PropertyBase property = (PropertyBase) propertyClass - .getConstructor( - Field.class, - BinnieConfiguration.class, - ConfigProperty.class, - annotation.annotationType()) - .newInstance( + PropertyBase property = (PropertyBase) propertyClass.getConstructor( + Field.class, + BinnieConfiguration.class, + ConfigProperty.class, + annotation.annotationType()).newInstance( field, config, propertyAnnot, diff --git a/src/main/java/binnie/core/mod/config/PropBoolean.java b/src/main/java/binnie/core/mod/config/PropBoolean.java index 28a1f4c5..f07c3a9b 100644 --- a/src/main/java/binnie/core/mod/config/PropBoolean.java +++ b/src/main/java/binnie/core/mod/config/PropBoolean.java @@ -3,15 +3,17 @@ package binnie.core.mod.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; + import net.minecraftforge.common.config.Property; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropBoolean.PropertyBoolean.class) public @interface PropBoolean { + class PropertyBoolean extends PropertyBase { - public PropertyBoolean( - Field field, BinnieConfiguration file, ConfigProperty configProperty, PropBoolean annotedProperty) - throws IllegalArgumentException, IllegalAccessException { + + public PropertyBoolean(Field field, BinnieConfiguration file, ConfigProperty configProperty, + PropBoolean annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } diff --git a/src/main/java/binnie/core/mod/config/PropDouble.java b/src/main/java/binnie/core/mod/config/PropDouble.java index 79283418..8f7961d2 100644 --- a/src/main/java/binnie/core/mod/config/PropDouble.java +++ b/src/main/java/binnie/core/mod/config/PropDouble.java @@ -3,15 +3,17 @@ package binnie.core.mod.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; + import net.minecraftforge.common.config.Property; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropDouble.PropertyDouble.class) public @interface PropDouble { + class PropertyDouble extends PropertyBase { - public PropertyDouble( - Field field, BinnieConfiguration file, ConfigProperty configProperty, PropDouble annotedProperty) - throws IllegalArgumentException, IllegalAccessException { + + public PropertyDouble(Field field, BinnieConfiguration file, ConfigProperty configProperty, + PropDouble annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } diff --git a/src/main/java/binnie/core/mod/config/PropInteger.java b/src/main/java/binnie/core/mod/config/PropInteger.java index d66533ea..0db86439 100644 --- a/src/main/java/binnie/core/mod/config/PropInteger.java +++ b/src/main/java/binnie/core/mod/config/PropInteger.java @@ -3,15 +3,17 @@ package binnie.core.mod.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; + import net.minecraftforge.common.config.Property; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropInteger.PropertyInteger.class) public @interface PropInteger { + class PropertyInteger extends PropertyBase { - public PropertyInteger( - Field field, BinnieConfiguration file, ConfigProperty configProperty, PropInteger annotedProperty) - throws IllegalArgumentException, IllegalAccessException { + + public PropertyInteger(Field field, BinnieConfiguration file, ConfigProperty configProperty, + PropInteger annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } diff --git a/src/main/java/binnie/core/mod/config/PropPercentage.java b/src/main/java/binnie/core/mod/config/PropPercentage.java index 4fa3488e..975d6849 100644 --- a/src/main/java/binnie/core/mod/config/PropPercentage.java +++ b/src/main/java/binnie/core/mod/config/PropPercentage.java @@ -3,19 +3,21 @@ package binnie.core.mod.config; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; + import net.minecraftforge.common.config.Property; @Retention(RetentionPolicy.RUNTIME) @ConfigProperty.Type(propertyClass = PropPercentage.PropertyPercentage.class) public @interface PropPercentage { + int upper() default 100; int lower() default 0; class PropertyPercentage extends PropertyBase { - public PropertyPercentage( - Field field, BinnieConfiguration file, ConfigProperty configProperty, PropPercentage annotedProperty) - throws IllegalArgumentException, IllegalAccessException { + + public PropertyPercentage(Field field, BinnieConfiguration file, ConfigProperty configProperty, + PropPercentage annotedProperty) throws IllegalArgumentException, IllegalAccessException { super(field, file, configProperty, annotedProperty); } diff --git a/src/main/java/binnie/core/mod/config/PropertyBase.java b/src/main/java/binnie/core/mod/config/PropertyBase.java index 35960849..89fd23c3 100644 --- a/src/main/java/binnie/core/mod/config/PropertyBase.java +++ b/src/main/java/binnie/core/mod/config/PropertyBase.java @@ -4,10 +4,12 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; abstract class PropertyBase { + protected Configuration file; protected Property property; protected ValueType defaultValue; @@ -17,9 +19,8 @@ abstract class PropertyBase { private List comments; private Field field; - protected PropertyBase( - Field field, BinnieConfiguration file, ConfigProperty configProperty, AnnotationType annotedProperty) - throws IllegalArgumentException, IllegalAccessException { + protected PropertyBase(Field field, BinnieConfiguration file, ConfigProperty configProperty, + AnnotationType annotedProperty) throws IllegalArgumentException, IllegalAccessException { comments = new ArrayList<>(); this.field = field; this.file = file; @@ -44,10 +45,7 @@ abstract class PropertyBase { protected String getCategory() { return configProperty.category().equals("") - ? annotatedProperty - .annotationType() - .getAnnotation(ConfigProperty.Type.class) - .category() + ? annotatedProperty.annotationType().getAnnotation(ConfigProperty.Type.class).category() : configProperty.category(); } diff --git a/src/main/java/binnie/core/mod/parser/FieldParser.java b/src/main/java/binnie/core/mod/parser/FieldParser.java index 3f3ef44c..3e288669 100644 --- a/src/main/java/binnie/core/mod/parser/FieldParser.java +++ b/src/main/java/binnie/core/mod/parser/FieldParser.java @@ -1,11 +1,13 @@ package binnie.core.mod.parser; -import binnie.core.AbstractMod; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; +import binnie.core.AbstractMod; + public abstract class FieldParser { + public static Collection parsers = new ArrayList<>(); public abstract boolean isHandled(Field field, AbstractMod mod); diff --git a/src/main/java/binnie/core/mod/parser/ItemParser.java b/src/main/java/binnie/core/mod/parser/ItemParser.java index b9cec91c..46b7abda 100644 --- a/src/main/java/binnie/core/mod/parser/ItemParser.java +++ b/src/main/java/binnie/core/mod/parser/ItemParser.java @@ -1,11 +1,14 @@ package binnie.core.mod.parser; +import java.lang.reflect.Field; + +import net.minecraft.item.Item; + import binnie.core.AbstractMod; import cpw.mods.fml.common.registry.GameRegistry; -import java.lang.reflect.Field; -import net.minecraft.item.Item; public class ItemParser extends FieldParser { + @Override public boolean isHandled(Field field, AbstractMod mod) { return Item.class.isAssignableFrom(field.getType()); diff --git a/src/main/java/binnie/core/nei/NEIUtils.java b/src/main/java/binnie/core/nei/NEIUtils.java index 8e31e805..9ddd1c3e 100644 --- a/src/main/java/binnie/core/nei/NEIUtils.java +++ b/src/main/java/binnie/core/nei/NEIUtils.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.*; public class NEIUtils { + public static FluidStack getFluidStack(ItemStack stack) { if (stack != null) { FluidStack fluidStack = null; diff --git a/src/main/java/binnie/core/nei/PositionedFluidTank.java b/src/main/java/binnie/core/nei/PositionedFluidTank.java index 41e21d31..c5aa4883 100644 --- a/src/main/java/binnie/core/nei/PositionedFluidTank.java +++ b/src/main/java/binnie/core/nei/PositionedFluidTank.java @@ -1,20 +1,23 @@ package binnie.core.nei; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiUsageRecipe; import java.awt.*; import java.util.Collection; import java.util.Collections; import java.util.List; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; + import org.lwjgl.opengl.GL11; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; + public class PositionedFluidTank { public FluidTank[] tanks; @@ -34,17 +37,13 @@ public class PositionedFluidTank { this.overlayTexturePos = overlayTexturePos; } - public PositionedFluidTank( - Collection fluids, - int capacity, - Rectangle position, - String overlayTexture, + public PositionedFluidTank(Collection fluids, int capacity, Rectangle position, String overlayTexture, Point overlayTexturePos) { this(createFluidTanks(capacity, fluids), position, overlayTexture, overlayTexturePos); } - public PositionedFluidTank( - FluidStack fluid, int capacity, Rectangle position, String overlayTexture, Point overlayTexturePos) { + public PositionedFluidTank(FluidStack fluid, int capacity, Rectangle position, String overlayTexture, + Point overlayTexturePos) { this(createFluidTanks(capacity, Collections.singletonList(fluid)), position, overlayTexture, overlayTexturePos); } @@ -62,17 +61,16 @@ public class PositionedFluidTank { } public List handleTooltip(List currenttip) { - if (this.tank == null - || this.tank.getFluid() == null + if (this.tank == null || this.tank.getFluid() == null || this.tank.getFluid().getFluid() == null || this.tank.getFluid().amount <= 0) { return currenttip; } currenttip.add(this.tank.getFluid().getLocalizedName()); if (this.showAmount) { - currenttip.add(EnumChatFormatting.GRAY.toString() - + this.tank.getFluid().amount - + (this.perTick ? " mB/t" : " mB")); + currenttip.add( + EnumChatFormatting.GRAY.toString() + this.tank.getFluid().amount + + (this.perTick ? " mB/t" : " mB")); } return currenttip; } @@ -89,8 +87,7 @@ public class PositionedFluidTank { } public void draw() { - if (this.tank == null - || this.tank.getFluid() == null + if (this.tank == null || this.tank.getFluid() == null || this.tank.getFluid().getFluid() == null || this.tank.getFluid().amount <= 0) { return; @@ -130,8 +127,8 @@ public class PositionedFluidTank { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV( - drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F); + tessellator + .addVertexWithUV(drawX, drawY + drawHeight, 0, minU, minV + (maxV - minV) * drawHeight / 16F); tessellator.addVertexWithUV( drawX + drawWidth, drawY + drawHeight, diff --git a/src/main/java/binnie/core/nei/PositionedStackAdv.java b/src/main/java/binnie/core/nei/PositionedStackAdv.java index 168ef9c3..fcc592a9 100644 --- a/src/main/java/binnie/core/nei/PositionedStackAdv.java +++ b/src/main/java/binnie/core/nei/PositionedStackAdv.java @@ -1,11 +1,12 @@ package binnie.core.nei; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; import java.awt.*; import java.util.ArrayList; import java.util.List; +import codechicken.nei.PositionedStack; +import codechicken.nei.recipe.GuiRecipe; + public class PositionedStackAdv extends PositionedStack { private final List tooltip = new ArrayList<>(); diff --git a/src/main/java/binnie/core/nei/RecipeHandlerBase.java b/src/main/java/binnie/core/nei/RecipeHandlerBase.java index d2d9e3bb..07f8146d 100644 --- a/src/main/java/binnie/core/nei/RecipeHandlerBase.java +++ b/src/main/java/binnie/core/nei/RecipeHandlerBase.java @@ -1,17 +1,20 @@ package binnie.core.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; public abstract class RecipeHandlerBase extends TemplateRecipeHandler { @@ -35,8 +38,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { @Override public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("liquid") - && results[0] instanceof FluidStack + if (outputId.equals("liquid") && results[0] instanceof FluidStack && ((FluidStack) results[0]).getFluid() != null) { this.loadCraftingRecipes((FluidStack) results[0]); } else if (outputId.equals(this.getOverlayIdentifier())) { @@ -60,8 +62,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { @Override public void loadUsageRecipes(String inputId, Object... ingredients) { - if (inputId.equals("liquid") - && ingredients[0] instanceof FluidStack + if (inputId.equals("liquid") && ingredients[0] instanceof FluidStack && ((FluidStack) ingredients[0]).getFluid() != null) { this.loadUsageRecipes((FluidStack) ingredients[0]); } else { @@ -88,8 +89,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { Point offset = guiRecipe.getRecipePosition(recipe); Point relMouse = new Point( mouse.x - (guiRecipe.width - 176) / 2 - offset.x, - mouse.y - - (guiRecipe.height - Math.min(Math.max(guiRecipe.height - 68, 166), 370)) / 2 + mouse.y - (guiRecipe.height - Math.min(Math.max(guiRecipe.height - 68, 166), 370)) / 2 - 10 - offset.y); currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse); @@ -97,8 +97,8 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { return currenttip; } - public List provideTooltip( - GuiRecipe guiRecipe, List currenttip, CachedBaseRecipe crecipe, Point relMouse) { + public List provideTooltip(GuiRecipe guiRecipe, List currenttip, CachedBaseRecipe crecipe, + Point relMouse) { if (crecipe.getFluidTanks() != null) { for (PositionedFluidTank tank : crecipe.getFluidTanks()) { if (tank.position.contains(relMouse)) { @@ -110,8 +110,8 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { } @Override - public List handleItemTooltip( - GuiRecipe guiRecipe, ItemStack itemStack, List currenttip, int recipe) { + public List handleItemTooltip(GuiRecipe guiRecipe, ItemStack itemStack, List currenttip, + int recipe) { super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe); CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe); Point mouse = GuiDraw.getMousePosition(); @@ -124,27 +124,20 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { return currenttip; } - public List provideItemTooltip( - GuiRecipe guiRecipe, - ItemStack itemStack, - List currenttip, - CachedBaseRecipe crecipe, - Point relMouse) { + public List provideItemTooltip(GuiRecipe guiRecipe, ItemStack itemStack, List currenttip, + CachedBaseRecipe crecipe, Point relMouse) { for (PositionedStack stack : crecipe.getIngredients()) { - if (stack instanceof PositionedStackAdv - && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { + if (stack instanceof PositionedStackAdv && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { currenttip = ((PositionedStackAdv) stack).handleTooltip(guiRecipe, currenttip); } } for (PositionedStack stack : crecipe.getOtherStacks()) { - if (stack instanceof PositionedStackAdv - && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { + if (stack instanceof PositionedStackAdv && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { currenttip = ((PositionedStackAdv) stack).handleTooltip(guiRecipe, currenttip); } } PositionedStack stack = crecipe.getResult(); - if (stack instanceof PositionedStackAdv - && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { + if (stack instanceof PositionedStackAdv && ((PositionedStackAdv) stack).getRect().contains(relMouse)) { currenttip = ((PositionedStackAdv) stack).handleTooltip(guiRecipe, currenttip); } return currenttip; @@ -187,8 +180,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler { Point offset = guiRecipe.getRecipePosition(recipe); Point relMouse = new Point( mouse.x - (guiRecipe.width - 176) / 2 - offset.x, - mouse.y - - (guiRecipe.height - Math.min(Math.max(guiRecipe.height - 68, 166), 370)) / 2 + mouse.y - (guiRecipe.height - Math.min(Math.max(guiRecipe.height - 68, 166), 370)) / 2 - 10 - offset.y); diff --git a/src/main/java/binnie/core/network/BinnieCorePacketID.java b/src/main/java/binnie/core/network/BinnieCorePacketID.java index ce1b9f16..03a75149 100644 --- a/src/main/java/binnie/core/network/BinnieCorePacketID.java +++ b/src/main/java/binnie/core/network/BinnieCorePacketID.java @@ -1,5 +1,9 @@ package binnie.core.network; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; + import binnie.core.BinnieCore; import binnie.core.block.TileEntityMetadata; import binnie.core.craftgui.minecraft.ContainerCraftGUI; @@ -13,11 +17,9 @@ import binnie.core.network.packet.MessageTileNBT; import binnie.core.network.packet.MessageUpdate; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.tileentity.TileEntity; public enum BinnieCorePacketID implements IPacketID { + NetworkEntityUpdate, TileMetadata, CraftGUIAction, diff --git a/src/main/java/binnie/core/network/BinniePacketHandler.java b/src/main/java/binnie/core/network/BinniePacketHandler.java index 8caeafd5..c340aed2 100644 --- a/src/main/java/binnie/core/network/BinniePacketHandler.java +++ b/src/main/java/binnie/core/network/BinniePacketHandler.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; public abstract class BinniePacketHandler implements IMessageHandler { + private IPacketProvider provider; public BinniePacketHandler(AbstractMod mod) { diff --git a/src/main/java/binnie/core/network/INetworkedEntity.java b/src/main/java/binnie/core/network/INetworkedEntity.java index 6bc36865..e5460015 100644 --- a/src/main/java/binnie/core/network/INetworkedEntity.java +++ b/src/main/java/binnie/core/network/INetworkedEntity.java @@ -3,6 +3,7 @@ package binnie.core.network; import binnie.core.network.packet.PacketPayload; public interface INetworkedEntity { + void writeToPacket(PacketPayload payload); void readFromPacket(PacketPayload payload); diff --git a/src/main/java/binnie/core/network/IOrdinaled.java b/src/main/java/binnie/core/network/IOrdinaled.java index 1f6ba519..53a636d1 100644 --- a/src/main/java/binnie/core/network/IOrdinaled.java +++ b/src/main/java/binnie/core/network/IOrdinaled.java @@ -1,5 +1,6 @@ package binnie.core.network; public interface IOrdinaled { + int ordinal(); } diff --git a/src/main/java/binnie/core/network/IPacketID.java b/src/main/java/binnie/core/network/IPacketID.java index 8af02285..dc5d1429 100644 --- a/src/main/java/binnie/core/network/IPacketID.java +++ b/src/main/java/binnie/core/network/IPacketID.java @@ -4,5 +4,6 @@ import binnie.core.network.packet.MessageBinnie; import cpw.mods.fml.common.network.simpleimpl.MessageContext; public interface IPacketID extends IOrdinaled { + void onMessage(MessageBinnie message, MessageContext context); } diff --git a/src/main/java/binnie/core/network/IPacketProvider.java b/src/main/java/binnie/core/network/IPacketProvider.java index a605cda5..2d88e957 100644 --- a/src/main/java/binnie/core/network/IPacketProvider.java +++ b/src/main/java/binnie/core/network/IPacketProvider.java @@ -1,6 +1,7 @@ package binnie.core.network; public interface IPacketProvider { + String getChannel(); IPacketID[] getPacketIDs(); diff --git a/src/main/java/binnie/core/network/packet/IPacket.java b/src/main/java/binnie/core/network/packet/IPacket.java index 4dd26bd2..4e45021e 100644 --- a/src/main/java/binnie/core/network/packet/IPacket.java +++ b/src/main/java/binnie/core/network/packet/IPacket.java @@ -4,5 +4,6 @@ import net.minecraft.network.Packet; // TODO unused interface? public interface IPacket { + Packet getPacket(); } diff --git a/src/main/java/binnie/core/network/packet/IPacketLocation.java b/src/main/java/binnie/core/network/packet/IPacketLocation.java index 8aa2866b..08ff0439 100644 --- a/src/main/java/binnie/core/network/packet/IPacketLocation.java +++ b/src/main/java/binnie/core/network/packet/IPacketLocation.java @@ -4,6 +4,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; interface IPacketLocation { + TileEntity getTarget(World world); int getX(); diff --git a/src/main/java/binnie/core/network/packet/IndexInPayload.java b/src/main/java/binnie/core/network/packet/IndexInPayload.java index 7fc85d72..34085af1 100644 --- a/src/main/java/binnie/core/network/packet/IndexInPayload.java +++ b/src/main/java/binnie/core/network/packet/IndexInPayload.java @@ -2,6 +2,7 @@ package binnie.core.network.packet; // TODO unused class? public class IndexInPayload { + public int intIndex; public int floatIndex; public int stringIndex; diff --git a/src/main/java/binnie/core/network/packet/MachinePayload.java b/src/main/java/binnie/core/network/packet/MachinePayload.java index b3da76c7..108eee4a 100644 --- a/src/main/java/binnie/core/network/packet/MachinePayload.java +++ b/src/main/java/binnie/core/network/packet/MachinePayload.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; public class MachinePayload { + private List intPayload; private List floatPayload; private List stringPayload; diff --git a/src/main/java/binnie/core/network/packet/MessageBase.java b/src/main/java/binnie/core/network/packet/MessageBase.java index 4a7d481b..8b1a31f1 100644 --- a/src/main/java/binnie/core/network/packet/MessageBase.java +++ b/src/main/java/binnie/core/network/packet/MessageBase.java @@ -1,12 +1,15 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; import java.io.ByteArrayInputStream; import java.io.IOException; + import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MessageBase { + private int id; public MessageBase(int id) { diff --git a/src/main/java/binnie/core/network/packet/MessageBinnie.java b/src/main/java/binnie/core/network/packet/MessageBinnie.java index 73e0a90e..cef94192 100644 --- a/src/main/java/binnie/core/network/packet/MessageBinnie.java +++ b/src/main/java/binnie/core/network/packet/MessageBinnie.java @@ -1,10 +1,12 @@ package binnie.core.network.packet; +import java.io.IOException; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; -import java.io.IOException; public class MessageBinnie implements IMessage { + public int id; private MessageBase message; protected ByteBuf data; diff --git a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java index 225e9a81..64dca339 100644 --- a/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageContainerUpdate.java @@ -3,6 +3,7 @@ package binnie.core.network.packet; import net.minecraft.nbt.NBTTagCompound; public class MessageContainerUpdate extends MessageCraftGUI { + public MessageContainerUpdate(NBTTagCompound nbt) { super(nbt); } diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/src/main/java/binnie/core/network/packet/MessageCoordinates.java index cdc9f3f3..c5161f2d 100644 --- a/src/main/java/binnie/core/network/packet/MessageCoordinates.java +++ b/src/main/java/binnie/core/network/packet/MessageCoordinates.java @@ -1,12 +1,15 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; import java.io.IOException; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import io.netty.buffer.ByteBuf; + public class MessageCoordinates extends MessageBase { + public int posX; public int posY; public int posZ; diff --git a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java b/src/main/java/binnie/core/network/packet/MessageCraftGUI.java index 7101bd76..704735b8 100644 --- a/src/main/java/binnie/core/network/packet/MessageCraftGUI.java +++ b/src/main/java/binnie/core/network/packet/MessageCraftGUI.java @@ -1,9 +1,11 @@ package binnie.core.network.packet; -import binnie.core.network.BinnieCorePacketID; import net.minecraft.nbt.NBTTagCompound; +import binnie.core.network.BinnieCorePacketID; + public class MessageCraftGUI extends MessageNBT { + public MessageCraftGUI(MessageBinnie message) { super(message); } diff --git a/src/main/java/binnie/core/network/packet/MessageMetadata.java b/src/main/java/binnie/core/network/packet/MessageMetadata.java index 12d8f4e5..03116399 100644 --- a/src/main/java/binnie/core/network/packet/MessageMetadata.java +++ b/src/main/java/binnie/core/network/packet/MessageMetadata.java @@ -1,10 +1,12 @@ package binnie.core.network.packet; +import java.io.IOException; + import binnie.core.network.BinnieCorePacketID; import io.netty.buffer.ByteBuf; -import java.io.IOException; public class MessageMetadata extends MessageCoordinates { + public int meta; public MessageMetadata(int posX, int posY, int posZ, int meta) { diff --git a/src/main/java/binnie/core/network/packet/MessageNBT.java b/src/main/java/binnie/core/network/packet/MessageNBT.java index 19f9beca..09636f81 100644 --- a/src/main/java/binnie/core/network/packet/MessageNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageNBT.java @@ -1,10 +1,13 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; import java.io.IOException; + import net.minecraft.nbt.NBTTagCompound; +import io.netty.buffer.ByteBuf; + public class MessageNBT extends MessageBase { + protected NBTTagCompound nbt; public NBTTagCompound getTagCompound() { diff --git a/src/main/java/binnie/core/network/packet/MessageTileNBT.java b/src/main/java/binnie/core/network/packet/MessageTileNBT.java index b858556e..02b4cb9a 100644 --- a/src/main/java/binnie/core/network/packet/MessageTileNBT.java +++ b/src/main/java/binnie/core/network/packet/MessageTileNBT.java @@ -1,12 +1,15 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; import java.io.IOException; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import io.netty.buffer.ByteBuf; + public class MessageTileNBT extends MessageNBT implements IPacketLocation { + private int posX; private int posY; private int posZ; diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index 3f24b463..d778e4cc 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -1,12 +1,15 @@ package binnie.core.network.packet; -import binnie.core.network.INetworkedEntity; -import io.netty.buffer.ByteBuf; import java.io.IOException; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import binnie.core.network.INetworkedEntity; +import io.netty.buffer.ByteBuf; + public class MessageUpdate extends MessageCoordinates { + public PacketPayload payload; public MessageUpdate(MessageBinnie message) { diff --git a/src/main/java/binnie/core/network/packet/PacketPayload.java b/src/main/java/binnie/core/network/packet/PacketPayload.java index 3359cbfc..002c2689 100644 --- a/src/main/java/binnie/core/network/packet/PacketPayload.java +++ b/src/main/java/binnie/core/network/packet/PacketPayload.java @@ -1,10 +1,12 @@ package binnie.core.network.packet; -import binnie.core.network.INetworkedEntity; import java.util.ArrayList; import java.util.List; +import binnie.core.network.INetworkedEntity; + public class PacketPayload { + public List intPayload; public List floatPayload; public List stringPayload; diff --git a/src/main/java/binnie/core/proxy/BinnieModProxy.java b/src/main/java/binnie/core/proxy/BinnieModProxy.java index ee319603..e6245886 100644 --- a/src/main/java/binnie/core/proxy/BinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieModProxy.java @@ -1,15 +1,17 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.gui.IBinnieGUID; -import binnie.core.network.packet.MessageBase; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.IIcon; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.gui.IBinnieGUID; +import binnie.core.network.packet.MessageBase; + public class BinnieModProxy implements IBinnieModProxy { + private AbstractMod mod; public BinnieModProxy(AbstractMod mod) { diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index a1f97008..f18cb12f 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,15 +1,7 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.INetworkedEntity; -import binnie.core.network.packet.MessageUpdate; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -21,7 +13,18 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.MessageUpdate; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.registry.GameRegistry; + public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { + private short uniqueTextureUID; public BinnieProxy() { diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 923a65c9..a326878c 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,15 +1,8 @@ package binnie.core.proxy; -import binnie.Binnie; -import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; import java.io.IOException; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.SimpleTexture; @@ -24,10 +17,21 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import binnie.Binnie; +import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { + @Override public void bindTexture(BinnieResource texture) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); diff --git a/src/main/java/binnie/core/proxy/BinnieProxyServer.java b/src/main/java/binnie/core/proxy/BinnieProxyServer.java index 36d9e3bd..0e8959d9 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyServer.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyServer.java @@ -1,3 +1,4 @@ package binnie.core.proxy; -public class BinnieProxyServer extends BinnieProxy implements IBinnieProxy {} +public class BinnieProxyServer extends BinnieProxy implements IBinnieProxy { +} diff --git a/src/main/java/binnie/core/proxy/IBinnieModProxy.java b/src/main/java/binnie/core/proxy/IBinnieModProxy.java index a3cc9276..e4e5e7d6 100644 --- a/src/main/java/binnie/core/proxy/IBinnieModProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieModProxy.java @@ -1,12 +1,14 @@ package binnie.core.proxy; -import binnie.core.gui.IBinnieGUID; -import binnie.core.network.packet.MessageBase; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IIcon; +import binnie.core.gui.IBinnieGUID; +import binnie.core.network.packet.MessageBase; + interface IBinnieModProxy extends IProxyCore { + void openGui(IBinnieGUID mod, EntityPlayer player, int x, int y, int z); void sendToAll(MessageBase p0); diff --git a/src/main/java/binnie/core/proxy/IBinnieProxy.java b/src/main/java/binnie/core/proxy/IBinnieProxy.java index 859fda1c..5097de0c 100644 --- a/src/main/java/binnie/core/proxy/IBinnieProxy.java +++ b/src/main/java/binnie/core/proxy/IBinnieProxy.java @@ -1,8 +1,7 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.resource.BinnieResource; import java.io.File; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -13,7 +12,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; +import binnie.core.AbstractMod; +import binnie.core.resource.BinnieResource; + public interface IBinnieProxy extends IProxyCore { + boolean isClient(); boolean isServer(); diff --git a/src/main/java/binnie/core/proxy/IProxyCore.java b/src/main/java/binnie/core/proxy/IProxyCore.java index a6029e06..14e188c7 100644 --- a/src/main/java/binnie/core/proxy/IProxyCore.java +++ b/src/main/java/binnie/core/proxy/IProxyCore.java @@ -2,4 +2,5 @@ package binnie.core.proxy; import binnie.core.IInitializable; -public interface IProxyCore extends IInitializable {} +public interface IProxyCore extends IInitializable { +} diff --git a/src/main/java/binnie/core/resource/BinnieIcon.java b/src/main/java/binnie/core/resource/BinnieIcon.java index 50a49a98..2feb78cd 100644 --- a/src/main/java/binnie/core/resource/BinnieIcon.java +++ b/src/main/java/binnie/core/resource/BinnieIcon.java @@ -1,14 +1,16 @@ package binnie.core.resource; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public class BinnieIcon extends BinnieResource { + private int textureSheet; private IIcon icon; diff --git a/src/main/java/binnie/core/resource/BinnieResource.java b/src/main/java/binnie/core/resource/BinnieResource.java index e6f9ae2b..bc505c8f 100644 --- a/src/main/java/binnie/core/resource/BinnieResource.java +++ b/src/main/java/binnie/core/resource/BinnieResource.java @@ -1,9 +1,11 @@ package binnie.core.resource; -import binnie.core.AbstractMod; import net.minecraft.util.ResourceLocation; +import binnie.core.AbstractMod; + public class BinnieResource { + String mod; private ResourceType type; String path; diff --git a/src/main/java/binnie/core/resource/IBinnieTexture.java b/src/main/java/binnie/core/resource/IBinnieTexture.java index 793ffc2e..95c0f780 100644 --- a/src/main/java/binnie/core/resource/IBinnieTexture.java +++ b/src/main/java/binnie/core/resource/IBinnieTexture.java @@ -1,5 +1,6 @@ package binnie.core.resource; public interface IBinnieTexture { + BinnieResource getTexture(); } diff --git a/src/main/java/binnie/core/resource/ManagerResource.java b/src/main/java/binnie/core/resource/ManagerResource.java index 89943fcd..45e940cc 100644 --- a/src/main/java/binnie/core/resource/ManagerResource.java +++ b/src/main/java/binnie/core/resource/ManagerResource.java @@ -1,13 +1,16 @@ package binnie.core.resource; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; + import binnie.core.AbstractMod; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; public class ManagerResource { + private List icons; public ManagerResource() { diff --git a/src/main/java/binnie/core/resource/ResourceType.java b/src/main/java/binnie/core/resource/ResourceType.java index 8f0e4a3f..0714b3b5 100644 --- a/src/main/java/binnie/core/resource/ResourceType.java +++ b/src/main/java/binnie/core/resource/ResourceType.java @@ -1,6 +1,7 @@ package binnie.core.resource; public enum ResourceType { + Item("items"), Block("blocks"), Tile("tile"), diff --git a/src/main/java/binnie/core/texture/BinnieCoreTexture.java b/src/main/java/binnie/core/texture/BinnieCoreTexture.java index 1727dce7..108a5b57 100644 --- a/src/main/java/binnie/core/texture/BinnieCoreTexture.java +++ b/src/main/java/binnie/core/texture/BinnieCoreTexture.java @@ -7,6 +7,7 @@ import binnie.core.resource.IBinnieTexture; import binnie.core.resource.ResourceType; public enum BinnieCoreTexture implements IBinnieTexture { + Compartment(ResourceType.Tile, "Compartment"), CompartmentIron(ResourceType.Tile, "CompartmentIron"), CompartmentDiamond(ResourceType.Tile, "CompartmentDiamond"), diff --git a/src/main/java/binnie/core/triggers/ActionProvider.java b/src/main/java/binnie/core/triggers/ActionProvider.java index cf0a9801..0b66afaf 100644 --- a/src/main/java/binnie/core/triggers/ActionProvider.java +++ b/src/main/java/binnie/core/triggers/ActionProvider.java @@ -1,17 +1,20 @@ package binnie.core.triggers; +import java.util.Collection; +import java.util.LinkedList; + +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.machines.component.IBuildcraft; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; import cpw.mods.fml.common.Optional; -import java.util.Collection; -import java.util.LinkedList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; class ActionProvider implements IActionProvider { + @Override @Optional.Method(modid = "BuildCraft|Silicon") public Collection getInternalActions(IStatementContainer container) { diff --git a/src/main/java/binnie/core/triggers/BinnieAction.java b/src/main/java/binnie/core/triggers/BinnieAction.java index ce26e24a..2044fbb3 100644 --- a/src/main/java/binnie/core/triggers/BinnieAction.java +++ b/src/main/java/binnie/core/triggers/BinnieAction.java @@ -1,5 +1,10 @@ package binnie.core.triggers; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -11,12 +16,9 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; class BinnieAction implements IActionExternal { + private static int incrementalID = 800; public static BinnieAction actionPauseProcess; public static BinnieAction actionCancelTask; @@ -81,8 +83,8 @@ class BinnieAction implements IActionExternal { } @Override - public void actionActivate( - TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public void actionActivate(TileEntity target, ForgeDirection side, IStatementContainer source, + IStatementParameter[] parameters) { // ignored } } diff --git a/src/main/java/binnie/core/triggers/BinnieTrigger.java b/src/main/java/binnie/core/triggers/BinnieTrigger.java index 58d3e560..ae13e80c 100644 --- a/src/main/java/binnie/core/triggers/BinnieTrigger.java +++ b/src/main/java/binnie/core/triggers/BinnieTrigger.java @@ -1,5 +1,10 @@ package binnie.core.triggers; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.BinnieCore; @@ -11,12 +16,9 @@ import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.StatementManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; class BinnieTrigger implements ITriggerExternal { + private static int incrementalID = 800; protected static BinnieTrigger triggerNoBlankTemplate; protected static BinnieTrigger triggerNoTemplate; @@ -104,8 +106,8 @@ class BinnieTrigger implements ITriggerExternal { } @Override - public boolean isTriggerActive( - TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { + public boolean isTriggerActive(TileEntity target, ForgeDirection side, IStatementContainer source, + IStatementParameter[] parameters) { return false; } } diff --git a/src/main/java/binnie/core/triggers/ModuleTrigger.java b/src/main/java/binnie/core/triggers/ModuleTrigger.java index 1e6cda08..8e88de70 100644 --- a/src/main/java/binnie/core/triggers/ModuleTrigger.java +++ b/src/main/java/binnie/core/triggers/ModuleTrigger.java @@ -5,6 +5,7 @@ import binnie.extrabees.ExtraBees; import buildcraft.api.statements.StatementManager; public class ModuleTrigger implements IInitializable { + @Override public void preInit() { // ignored @@ -12,37 +13,70 @@ public class ModuleTrigger implements IInitializable { @Override public void init() { - BinnieAction.actionPauseProcess = - new BinnieAction("Pause Process", "binnie.action.pauseProcess", "actions/PauseProcess"); - BinnieAction.actionCancelTask = - new BinnieAction("Cancel Task", "binnie.action.cancelTask", "actions/CancelTask"); + BinnieAction.actionPauseProcess = new BinnieAction( + "Pause Process", + "binnie.action.pauseProcess", + "actions/PauseProcess"); + BinnieAction.actionCancelTask = new BinnieAction( + "Cancel Task", + "binnie.action.cancelTask", + "actions/CancelTask"); StatementManager.registerActionProvider(new ActionProvider()); BinnieTrigger.triggerNoBlankTemplate = new BinnieTrigger( - "No Blank Template", "binnie.trigger.noBlankTemplate", ExtraBees.instance, "triggers/NoBlankTemplate"); + "No Blank Template", + "binnie.trigger.noBlankTemplate", + ExtraBees.instance, + "triggers/NoBlankTemplate"); BinnieTrigger.triggerNoTemplate = new BinnieTrigger( - "No Template", "binnie.trigger.noTemplate", ExtraBees.instance, "triggers/NoTemplate"); - BinnieTrigger.triggerIsWorking = - new BinnieTrigger("Is Working", "binnie.trigger.isWorking", "triggers/IsWorking"); - BinnieTrigger.triggerIsNotWorking = - new BinnieTrigger("Is Not Working", "binnie.trigger.isNotWorking", "triggers/IsNotWorking"); + "No Template", + "binnie.trigger.noTemplate", + ExtraBees.instance, + "triggers/NoTemplate"); + BinnieTrigger.triggerIsWorking = new BinnieTrigger( + "Is Working", + "binnie.trigger.isWorking", + "triggers/IsWorking"); + BinnieTrigger.triggerIsNotWorking = new BinnieTrigger( + "Is Not Working", + "binnie.trigger.isNotWorking", + "triggers/IsNotWorking"); BinnieTrigger.triggerCanWork = new BinnieTrigger("Can Work", "binnie.trigger.canWork", "triggers/CanWork"); - BinnieTrigger.triggerCannotWork = - new BinnieTrigger("Cannot Work", "binnie.trigger.cannotWork", "triggers/CannotWork"); - BinnieTrigger.triggerPowerNone = - new BinnieTrigger("Power None", "binnie.trigger.powerNone", "triggers/PowerNone"); + BinnieTrigger.triggerCannotWork = new BinnieTrigger( + "Cannot Work", + "binnie.trigger.cannotWork", + "triggers/CannotWork"); + BinnieTrigger.triggerPowerNone = new BinnieTrigger( + "Power None", + "binnie.trigger.powerNone", + "triggers/PowerNone"); BinnieTrigger.triggerPowerLow = new BinnieTrigger("Power Low", "binnie.trigger.powerLow", "triggers/PowerLow"); - BinnieTrigger.triggerPowerMedium = - new BinnieTrigger("Power Medium", "binnie.trigger.powerMedium", "triggers/PowerMedium"); - BinnieTrigger.triggerPowerHigh = - new BinnieTrigger("Power High", "binnie.trigger.powerHigh", "triggers/PowerHigh"); - BinnieTrigger.triggerPowerFull = - new BinnieTrigger("Power Full", "binnie.trigger.powerFull", "triggers/PowerFull"); - BinnieTrigger.triggerSerumFull = - new BinnieTrigger("Serum Full", "binnie.trigger.serumFull", ExtraBees.instance, "triggers/SerumFull"); - BinnieTrigger.triggerSerumPure = - new BinnieTrigger("Serum Pure", "binnie.trigger.serumPure", ExtraBees.instance, "triggers/SerumPure"); - BinnieTrigger.triggerSerumEmpty = - new BinnieTrigger("Serum Pure", "binnie.trigger.serumEmpty", ExtraBees.instance, "triggers/SerumEmpty"); + BinnieTrigger.triggerPowerMedium = new BinnieTrigger( + "Power Medium", + "binnie.trigger.powerMedium", + "triggers/PowerMedium"); + BinnieTrigger.triggerPowerHigh = new BinnieTrigger( + "Power High", + "binnie.trigger.powerHigh", + "triggers/PowerHigh"); + BinnieTrigger.triggerPowerFull = new BinnieTrigger( + "Power Full", + "binnie.trigger.powerFull", + "triggers/PowerFull"); + BinnieTrigger.triggerSerumFull = new BinnieTrigger( + "Serum Full", + "binnie.trigger.serumFull", + ExtraBees.instance, + "triggers/SerumFull"); + BinnieTrigger.triggerSerumPure = new BinnieTrigger( + "Serum Pure", + "binnie.trigger.serumPure", + ExtraBees.instance, + "triggers/SerumPure"); + BinnieTrigger.triggerSerumEmpty = new BinnieTrigger( + "Serum Pure", + "binnie.trigger.serumEmpty", + ExtraBees.instance, + "triggers/SerumEmpty"); StatementManager.registerTriggerProvider(new TriggerProvider()); } diff --git a/src/main/java/binnie/core/triggers/TriggerData.java b/src/main/java/binnie/core/triggers/TriggerData.java index 05b68953..cc4bbb58 100644 --- a/src/main/java/binnie/core/triggers/TriggerData.java +++ b/src/main/java/binnie/core/triggers/TriggerData.java @@ -1,9 +1,11 @@ package binnie.core.triggers; -import buildcraft.api.statements.ITriggerExternal; import java.util.Map; +import buildcraft.api.statements.ITriggerExternal; + public class TriggerData implements Map.Entry { + private ITriggerExternal key; private Boolean value; diff --git a/src/main/java/binnie/core/triggers/TriggerPower.java b/src/main/java/binnie/core/triggers/TriggerPower.java index 1c371a32..e3d2394a 100644 --- a/src/main/java/binnie/core/triggers/TriggerPower.java +++ b/src/main/java/binnie/core/triggers/TriggerPower.java @@ -4,6 +4,7 @@ import binnie.core.machines.Machine; import binnie.core.machines.power.IPoweredMachine; public class TriggerPower { + public static TriggerData powerNone(Object tile) { double percent = getPercentage(tile); return new TriggerData(BinnieTrigger.triggerPowerNone, percent < 0.05000000074505806); @@ -17,7 +18,8 @@ public class TriggerPower { public static TriggerData powerMedium(Object tile) { double percent = getPercentage(tile); return new TriggerData( - BinnieTrigger.triggerPowerMedium, percent >= 0.3499999940395355 && percent <= 0.6499999761581421); + BinnieTrigger.triggerPowerMedium, + percent >= 0.3499999940395355 && percent <= 0.6499999761581421); } public static TriggerData powerHigh(Object tile) { @@ -33,8 +35,7 @@ public class TriggerPower { private static double getPercentage(Object tile) { IPoweredMachine process = Machine.getInterface(IPoweredMachine.class, tile); if (process != null) { - return (double) - (process.getInterface().getEnergy() / process.getInterface().getCapacity()); + return (double) (process.getInterface().getEnergy() / process.getInterface().getCapacity()); } return 0.0; } diff --git a/src/main/java/binnie/core/triggers/TriggerProvider.java b/src/main/java/binnie/core/triggers/TriggerProvider.java index 06ae1ceb..5538d969 100644 --- a/src/main/java/binnie/core/triggers/TriggerProvider.java +++ b/src/main/java/binnie/core/triggers/TriggerProvider.java @@ -1,18 +1,21 @@ package binnie.core.triggers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.machines.component.IBuildcraft; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; class TriggerProvider implements ITriggerProvider { + public static List triggers = new ArrayList<>(); @Override diff --git a/src/main/java/binnie/core/util/FluidStackSet.java b/src/main/java/binnie/core/util/FluidStackSet.java index 23372f31..3214140c 100644 --- a/src/main/java/binnie/core/util/FluidStackSet.java +++ b/src/main/java/binnie/core/util/FluidStackSet.java @@ -5,9 +5,11 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; + import net.minecraftforge.fluids.FluidStack; class FluidStackSet implements Set { + protected List itemStacks; FluidStackSet() { diff --git a/src/main/java/binnie/core/util/I18N.java b/src/main/java/binnie/core/util/I18N.java index 8d570f9a..8b7b41c0 100644 --- a/src/main/java/binnie/core/util/I18N.java +++ b/src/main/java/binnie/core/util/I18N.java @@ -3,6 +3,7 @@ package binnie.core.util; import net.minecraft.util.StatCollector; public class I18N { + public static String localise(String key) { return StatCollector.translateToLocal(key); } diff --git a/src/main/java/binnie/core/util/IValidator.java b/src/main/java/binnie/core/util/IValidator.java index b3de26d4..02a801b9 100644 --- a/src/main/java/binnie/core/util/IValidator.java +++ b/src/main/java/binnie/core/util/IValidator.java @@ -1,5 +1,6 @@ package binnie.core.util; public interface IValidator { + boolean isValid(T object); } diff --git a/src/main/java/binnie/core/util/ItemStackSet.java b/src/main/java/binnie/core/util/ItemStackSet.java index fb071308..034217db 100644 --- a/src/main/java/binnie/core/util/ItemStackSet.java +++ b/src/main/java/binnie/core/util/ItemStackSet.java @@ -5,9 +5,11 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Set; + import net.minecraft.item.ItemStack; public class ItemStackSet implements Set { + protected List itemStacks; public ItemStackSet() { diff --git a/src/main/java/binnie/core/util/UniqueFluidStackSet.java b/src/main/java/binnie/core/util/UniqueFluidStackSet.java index 4a14d790..24e1df88 100644 --- a/src/main/java/binnie/core/util/UniqueFluidStackSet.java +++ b/src/main/java/binnie/core/util/UniqueFluidStackSet.java @@ -3,6 +3,7 @@ package binnie.core.util; import net.minecraftforge.fluids.FluidStack; public class UniqueFluidStackSet extends FluidStackSet { + @Override public boolean add(FluidStack fluidStack) { return fluidStack != null && getExisting(fluidStack) == null && itemStacks.add(fluidStack.copy()); diff --git a/src/main/java/binnie/core/util/UniqueItemStackSet.java b/src/main/java/binnie/core/util/UniqueItemStackSet.java index cbd899ef..9ab7c488 100644 --- a/src/main/java/binnie/core/util/UniqueItemStackSet.java +++ b/src/main/java/binnie/core/util/UniqueItemStackSet.java @@ -3,6 +3,7 @@ package binnie.core.util; import net.minecraft.item.ItemStack; public class UniqueItemStackSet extends ItemStackSet { + @Override public boolean add(ItemStack itemStack) { return itemStack != null && getExisting(itemStack) == null && itemStacks.add(itemStack.copy()); diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 5d8bb2fa..a865d61d 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,9 @@ package binnie.extrabees; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -20,9 +24,6 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; @Mod( modid = "ExtraBees", @@ -31,6 +32,7 @@ import net.minecraft.item.Item; useMetadata = true, dependencies = "after:BinnieCore") public class ExtraBees extends AbstractMod { + @Mod.Instance("ExtraBees") public static ExtraBees instance; @@ -80,7 +82,7 @@ public class ExtraBees extends AbstractMod { @Override public Class[] getConfigs() { - return new Class[] {ConfigurationMain.class, ConfigurationMachines.class}; + return new Class[] { ConfigurationMain.class, ConfigurationMachines.class }; } @Override @@ -109,6 +111,7 @@ public class ExtraBees extends AbstractMod { } public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { super(ExtraBees.instance); } diff --git a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java index e368b5ca..cae2187a 100644 --- a/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java +++ b/src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java @@ -1,5 +1,7 @@ package binnie.extrabees.apiary; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import forestry.api.apiculture.IBee; @@ -7,9 +9,9 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; public class ComponentBeeModifier extends MachineComponent implements IBeeModifier, IBeeListener { + public ComponentBeeModifier(Machine machine) { super(machine); } diff --git a/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java b/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java index 1d2e5b8e..120f1320 100644 --- a/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java +++ b/src/main/java/binnie/extrabees/apiary/ComponentExtraBeeGUI.java @@ -1,14 +1,16 @@ package binnie.extrabees.apiary; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeGUID; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; public class ComponentExtraBeeGUI extends MachineComponent implements IInteraction.RightClick { + protected ExtraBeeGUID id; public ComponentExtraBeeGUI(Machine machine, ExtraBeeGUID id) { diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java index 8b63a0c5..316e4240 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java @@ -1,5 +1,10 @@ package binnie.extrabees.apiary; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.core.Mods; import binnie.core.genetics.BeeModifierLogic; import binnie.core.genetics.EnumBeeBooleanModifier; @@ -11,12 +16,9 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { + Cocoa, Cage, Soul, @@ -57,9 +59,13 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { 'c', new ItemStack(Items.dye, 1, 3)); GameRegistry.addShapelessRecipe( - new ItemStack(EnumHiveFrame.Cage.item), Mods.forestry.stack("frameImpregnated"), Blocks.iron_bars); + new ItemStack(EnumHiveFrame.Cage.item), + Mods.forestry.stack("frameImpregnated"), + Blocks.iron_bars); GameRegistry.addShapelessRecipe( - new ItemStack(EnumHiveFrame.Soul.item), Mods.forestry.stack("frameImpregnated"), Blocks.soul_sand); + new ItemStack(EnumHiveFrame.Soul.item), + Mods.forestry.stack("frameImpregnated"), + Blocks.soul_sand); GameRegistry.addRecipe( new ItemStack(EnumHiveFrame.Clay.item), " c ", diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 57582c3a..86d33ffd 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -1,5 +1,9 @@ package binnie.extrabees.apiary; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.extrabees.ExtraBees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -9,11 +13,9 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; import forestry.api.core.Tabs; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier { + protected EnumHiveFrame frame; public ItemHiveFrame(EnumHiveFrame frame) { diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index d0de6c98..0eb70014 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -1,5 +1,11 @@ package binnie.extrabees.apiary; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -11,13 +17,9 @@ import binnie.extrabees.apiary.machine.mutator.AlvearyMutator; import binnie.extrabees.apiary.machine.stimulator.CircuitType; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleApiary implements IInitializable { + public static Block blockComponent; protected BinnieCircuitLayout stimulatorLayout; @@ -43,9 +45,7 @@ public class ModuleApiary implements IInitializable { AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f); for (EnumHiveFrame frame : EnumHiveFrame.values()) { - GameRegistry.registerItem( - frame.item = new ItemHiveFrame(frame), - "hiveFrame." + frame.name().toLowerCase()); + GameRegistry.registerItem(frame.item = new ItemHiveFrame(frame), "hiveFrame." + frame.name().toLowerCase()); } } @@ -126,9 +126,10 @@ public class ModuleApiary implements IInitializable { 't', new ItemStack(Mods.forestry.item("thermionicTubes"), 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe( - AlvearyMachine.Transmission.get(1), - new Object[] {" t ", "tat", " t ", 'a', Mods.forestry.block("alveary"), 't', "gearTin"})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + AlvearyMachine.Transmission.get(1), + new Object[] { " t ", "tat", " t ", 'a', Mods.forestry.block("alveary"), 't', "gearTin" })); for (CircuitType type : CircuitType.values()) { type.createCircuit(stimulatorLayout); diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 7e480de5..66cc4725 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java @@ -1,8 +1,17 @@ package binnie.extrabees.apiary; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChunkCoordinates; + import binnie.core.machines.TileEntityMachine; import binnie.extrabees.apiary.machine.AlvearyMachine; + import com.mojang.authlib.GameProfile; + import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; @@ -12,18 +21,10 @@ import forestry.api.multiblock.IMultiblockComponent; import forestry.api.multiblock.IMultiblockController; import forestry.api.multiblock.IMultiblockLogicAlveary; import forestry.api.multiblock.MultiblockManager; -import java.util.LinkedList; -import java.util.List; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; -public class TileExtraBeeAlveary extends TileEntityMachine - implements IAlvearyComponent.Active, - IAlvearyComponent.BeeModifier, - IAlvearyComponent.BeeListener, - IBeeListener, - IBeeModifier { +public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active, + IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier { + protected IMultiblockLogicAlveary structureLogic; protected ChunkCoordinates min; protected ChunkCoordinates max; diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java index c0dcc913..c1b1e3ae 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java @@ -1,5 +1,9 @@ package binnie.extrabees.apiary.machine; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.machines.IMachineType; import binnie.core.machines.Machine; import binnie.core.machines.MachinePackage; @@ -14,11 +18,9 @@ import binnie.extrabees.apiary.machine.mutator.MutatorAlvearyPackage; import binnie.extrabees.apiary.machine.rainShield.RainShieldAlvearyPackage; import binnie.extrabees.apiary.machine.stimulator.StimulatorAlvearyPackage; import binnie.extrabees.apiary.machine.transmission.TransmissionAlvearyPackage; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public enum AlvearyMachine implements IMachineType { + Mutator(MutatorAlvearyPackage.class), Frame(FrameAlvearyPackage.class), RainShield(RainShieldAlvearyPackage.class), @@ -48,6 +50,7 @@ public enum AlvearyMachine implements IMachineType { } public abstract static class AlvearyPackage extends MachinePackage { + protected BinnieResource machineTexture; public AlvearyPackage(String id, BinnieResource machineTexture, boolean powered) { @@ -66,8 +69,8 @@ public enum AlvearyMachine implements IMachineType { } @Override - public void renderMachine( - Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, + RenderBlocks renderer) { MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java b/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java index 248d83bb..7e51a765 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/AlvearyFrame.java @@ -1,5 +1,6 @@ package binnie.extrabees.apiary.machine.frame; public class AlvearyFrame { + public static final int SLOT_FRAME = 0; } diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java index 3f3d4da4..fbd17d90 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameAlvearyPackage.java @@ -9,6 +9,7 @@ import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; public class FrameAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public FrameAlvearyPackage() { super("frame", ExtraBeeTexture.AlvearyFrame.getTexture(), false); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java index fccd21c7..d0e594e2 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java @@ -1,5 +1,7 @@ package binnie.extrabees.apiary.machine.frame; +import net.minecraft.world.World; + import binnie.Binnie; import binnie.core.machines.Machine; import binnie.extrabees.apiary.ComponentBeeModifier; @@ -8,9 +10,9 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; -import net.minecraft.world.World; public class FrameComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public FrameComponentModifier(Machine machine) { super(machine); } @@ -22,28 +24,21 @@ public class FrameComponentModifier extends ComponentBeeModifier implements IBee } World world = getMachine().getTileEntity().getWorldObj(); - int wear = Math.round(amount - * 5 - * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier()); - getInventory() - .setInventorySlotContents( - AlvearyFrame.SLOT_FRAME, - getHiveFrame() - .frameUsed( - ((TileExtraBeeAlveary) getMachine().getTileEntity()) - .getMultiblockLogic() - .getController(), - getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME), - null, - wear)); + int wear = Math.round(amount * 5 * Binnie.Genetics.getBeeRoot().getBeekeepingMode(world).getWearModifier()); + getInventory().setInventorySlotContents( + AlvearyFrame.SLOT_FRAME, + getHiveFrame().frameUsed( + ((TileExtraBeeAlveary) getMachine().getTileEntity()).getMultiblockLogic().getController(), + getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME), + null, + wear)); } public IHiveFrame getHiveFrame() { if (getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME) == null) { return null; } - return (IHiveFrame) - getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME).getItem(); + return (IHiveFrame) getInventory().getStackInSlot(AlvearyFrame.SLOT_FRAME).getItem(); } @Override diff --git a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java index 23e35946..f8e4f11c 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/frame/FrameSlotValidator.java @@ -1,11 +1,13 @@ package binnie.extrabees.apiary.machine.frame; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import forestry.api.apiculture.IHiveFrame; -import net.minecraft.item.ItemStack; public class FrameSlotValidator extends SlotValidator { + public FrameSlotValidator() { super(SlotValidator.IconFrame); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java index 9d90ef67..32a24b61 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/AlvearyHatchery.java @@ -1,5 +1,6 @@ package binnie.extrabees.apiary.machine.hatchery; public class AlvearyHatchery { - public static final int[] SLOT_LARVAE = new int[] {0, 1, 2, 3, 4}; + + public static final int[] SLOT_LARVAE = new int[] { 0, 1, 2, 3, 4 }; } diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java index b2fd4d30..1ce4575c 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryAlvearyPackage.java @@ -10,6 +10,7 @@ import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; public class HatcheryAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public HatcheryAlvearyPackage() { super("hatchery", ExtraBeeTexture.AlvearyHatchery.getTexture(), false); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java index d220249b..8aee12bb 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/HatcheryComponentModifier.java @@ -1,5 +1,10 @@ package binnie.extrabees.apiary.machine.hatchery; +import java.util.Random; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.transfer.TransferRequest; @@ -11,11 +16,9 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeeRoot; -import java.util.Random; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class HatcheryComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public HatcheryComponentModifier(Machine machine) { super(machine); } @@ -44,7 +47,8 @@ public class HatcheryComponentModifier extends ComponentBeeModifier implements I IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot(); ItemStack larvae = beeRoot.getMemberStack( - beeRoot.getBee(getMachine().getWorld(), queen.getGenome()), EnumBeeType.LARVAE.ordinal()); + beeRoot.getBee(getMachine().getWorld(), queen.getGenome()), + EnumBeeType.LARVAE.ordinal()); new TransferRequest(larvae, getInventory()).transfer(true); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java index 628bbe62..6a660ed0 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/hatchery/LarvaeSlotValidator.java @@ -1,12 +1,14 @@ package binnie.extrabees.apiary.machine.hatchery; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import forestry.api.apiculture.EnumBeeType; -import net.minecraft.item.ItemStack; public class LarvaeSlotValidator extends SlotValidator { + public LarvaeSlotValidator() { super(SlotValidator.IconBee); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java index 0ddb08b1..7205d2ce 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingAlvearyPackage.java @@ -6,6 +6,7 @@ import binnie.extrabees.apiary.machine.AlvearyMachine; import binnie.extrabees.core.ExtraBeeTexture; public class LightingAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public LightingAlvearyPackage() { super("lighting", ExtraBeeTexture.AlvearyLighting.getTexture(), false); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java index 32b6dfa6..90df487a 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java +++ b/src/main/java/binnie/extrabees/apiary/machine/lighting/LightingComponentModifier.java @@ -6,6 +6,7 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; public class LightingComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public LightingComponentModifier(Machine machine) { super(machine); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java index dac0c535..b7f5e70d 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/AlvearyMutator.java @@ -3,9 +3,11 @@ package binnie.extrabees.apiary.machine.mutator; import java.util.Collection; import java.util.HashMap; import java.util.Map; + import net.minecraft.item.ItemStack; public class AlvearyMutator { + public static final int SLOT_MUTATOR = 0; protected static Map mutations = new HashMap<>(); diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java index 981f7599..d3f57d61 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorAlvearyPackage.java @@ -9,6 +9,7 @@ import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; public class MutatorAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public MutatorAlvearyPackage() { super("mutator", ExtraBeeTexture.AlvearyMutator.getTexture(), false); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java index 622047ba..4d12dbf0 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorModifierComponent.java @@ -7,6 +7,7 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; public class MutatorModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public MutatorModifierComponent(Machine machine) { super(machine); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java index 1b4c6397..002a0ec2 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/mutator/MutatorSlotValidator.java @@ -1,12 +1,14 @@ package binnie.extrabees.apiary.machine.mutator; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.ValidatorIcon; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; -import net.minecraft.item.ItemStack; public class MutatorSlotValidator extends SlotValidator { + public MutatorSlotValidator() { super(new ValidatorIcon(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1")); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java index 8203bd00..91ec8209 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldAlvearyPackage.java @@ -6,6 +6,7 @@ import binnie.extrabees.apiary.machine.AlvearyMachine; import binnie.extrabees.core.ExtraBeeTexture; public class RainShieldAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public RainShieldAlvearyPackage() { super("rainShield", ExtraBeeTexture.AlvearyRainShield.getTexture(), false); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java index efff93e6..a3366692 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/rainShield/RainShieldModifierComponent.java @@ -6,6 +6,7 @@ import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; public class RainShieldModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public RainShieldModifierComponent(Machine machine) { super(machine); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java index 11bf6df0..adf05b99 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/AlvearyStimulator.java @@ -1,5 +1,6 @@ package binnie.extrabees.apiary.machine.stimulator; public class AlvearyStimulator { + public static final int SLOT_CIRCUIT = 0; } diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java index 8b2d4847..7cb59ecf 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitSlotValidator.java @@ -1,11 +1,13 @@ package binnie.extrabees.apiary.machine.stimulator; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import forestry.api.circuits.ChipsetManager; -import net.minecraft.item.ItemStack; public class CircuitSlotValidator extends SlotValidator { + public CircuitSlotValidator() { super(SlotValidator.IconCircuit); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java index f4c37490..8ff94892 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java @@ -8,6 +8,7 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.circuits.ICircuitLayout; public enum CircuitType implements IBeeModifier { + LowVoltage(3, 10), HighVoltage(5, 20), Plant(10, 10), diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java index 59af6b13..813f4b71 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java @@ -10,6 +10,7 @@ import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ExtraBeeTexture; public class StimulatorAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public StimulatorAlvearyPackage() { super("stimulator", ExtraBeeTexture.AlvearyStimulator.getTexture(), true); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java index 1fd97fd4..d14c144c 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorCircuit.java @@ -7,6 +7,7 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.circuits.ICircuitLayout; public class StimulatorCircuit extends BinnieCircuit implements IBeeModifier { + protected CircuitType type; public StimulatorCircuit(CircuitType type, ICircuitLayout layout) { diff --git a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java index aae03127..94e2d499 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java @@ -1,5 +1,8 @@ package binnie.extrabees.apiary.machine.stimulator; +import java.util.ArrayList; +import java.util.List; + import binnie.core.machines.Machine; import binnie.extrabees.apiary.ComponentBeeModifier; import forestry.api.apiculture.IBeeGenome; @@ -8,10 +11,9 @@ import forestry.api.apiculture.IBeeModifier; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuit; import forestry.api.circuits.ICircuitBoard; -import java.util.ArrayList; -import java.util.List; public class StimulatorModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + protected float powerUsage; protected boolean powered; protected StimulatorCircuit[] modifiers; diff --git a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java index 427a3ce4..ae1e1134 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java +++ b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionAlvearyPackage.java @@ -7,6 +7,7 @@ import binnie.extrabees.apiary.machine.AlvearyMachine; import binnie.extrabees.core.ExtraBeeTexture; public class TransmissionAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation { + public TransmissionAlvearyPackage() { super("transmission", ExtraBeeTexture.AlvearyTransmission.getTexture(), false); } diff --git a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java index 18a2ec2b..5f19a1aa 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java +++ b/src/main/java/binnie/extrabees/apiary/machine/transmission/TransmissionModifierComponent.java @@ -1,17 +1,20 @@ package binnie.extrabees.apiary.machine.transmission; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.machines.Machine; import binnie.extrabees.apiary.ComponentBeeModifier; import binnie.extrabees.apiary.TileExtraBeeAlveary; import cofh.api.energy.IEnergyHandler; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; public class TransmissionModifierComponent extends ComponentBeeModifier implements IBeeModifier, IBeeListener { + public TransmissionModifierComponent(Machine machine) { super(machine); } diff --git a/src/main/java/binnie/extrabees/config/ConfigurationMachines.java b/src/main/java/binnie/extrabees/config/ConfigurationMachines.java index 2f725550..483a7530 100644 --- a/src/main/java/binnie/extrabees/config/ConfigurationMachines.java +++ b/src/main/java/binnie/extrabees/config/ConfigurationMachines.java @@ -7,19 +7,18 @@ import binnie.core.mod.config.PropPercentage; @ConfigFile(filename = "/config/forestry/extrabees/machines.conf") public class ConfigurationMachines { + @ConfigProperty( key = "isolatorConsumptionChance", - comment = {"Percentage chance of Isolator consuming bee, in x%."}) + comment = { "Percentage chance of Isolator consuming bee, in x%." }) @PropPercentage public static int isolatorConsumptionChance = 30; @ConfigProperty( key = "geneticErrorModifier", - comment = { - "Modifier that changes how severe splicer/inoculator erros are.", - "0 would result in no errors, even for awful serums.", - "2.0 would result in twice as severe errors" - }) + comment = { "Modifier that changes how severe splicer/inoculator erros are.", + "0 would result in no errors, even for awful serums.", + "2.0 would result in twice as severe errors" }) @PropDouble public static double geneticErrorModifier = 1.0; } diff --git a/src/main/java/binnie/extrabees/config/ConfigurationMain.java b/src/main/java/binnie/extrabees/config/ConfigurationMain.java index ce530311..007d1291 100644 --- a/src/main/java/binnie/extrabees/config/ConfigurationMain.java +++ b/src/main/java/binnie/extrabees/config/ConfigurationMain.java @@ -7,6 +7,7 @@ import binnie.core.mod.config.PropInteger; @ConfigFile(filename = "/config/forestry/extrabees/main.conf") public class ConfigurationMain { + @ConfigProperty(key = "canQuarryMineHives") @PropBoolean public static boolean canQuarryMineHives = true; diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java b/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java index 58414838..d9ae8b82 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeGUID.java @@ -1,5 +1,10 @@ package binnie.extrabees.core; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.extrabees.gui.WindowAlvearyFrame; @@ -8,12 +13,9 @@ import binnie.extrabees.gui.WindowAlvearyMutator; import binnie.extrabees.gui.WindowAlvearyStimulator; import binnie.extrabees.gui.database.WindowApiaristDatabase; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public enum ExtraBeeGUID implements IBinnieGUID { + Database, DatabaseNEI, AlvearyMutator, diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 8f82eb8c..b99195d3 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -1,5 +1,15 @@ package binnie.extrabees.core; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.item.IItemMisc; @@ -9,16 +19,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.recipes.RecipeManagers; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public enum ExtraBeeItems implements IItemMisc { + ScentedGear("scentedGear"), DiamondShard("diamondShard"), EmeraldShard("emeraldShard"), @@ -103,22 +106,18 @@ public enum ExtraBeeItems implements IItemMisc { ItemStack dust = null; ItemStack ingot = null; if (!OreDictionary.getOres("ingot" + item.metalString).isEmpty()) { - ingot = OreDictionary.getOres("ingot" + item.metalString) - .get(0) - .copy(); + ingot = OreDictionary.getOres("ingot" + item.metalString).get(0).copy(); } if (!OreDictionary.getOres("dust" + item.metalString).isEmpty()) { - dust = OreDictionary.getOres("dust" + item.metalString) - .get(0) - .copy(); + dust = OreDictionary.getOres("dust" + item.metalString).get(0).copy(); } ItemStack input = item.get(1); if (dust != null) { GameRegistry.addShapelessRecipe(dust, input, input, input, input); } else if (ingot != null) { - GameRegistry.addShapelessRecipe( - ingot, input, input, input, input, input, input, input, input, input); + GameRegistry + .addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); } else if (item == ExtraBeeItems.CoalDust) { GameRegistry.addShapelessRecipe(new ItemStack(Items.coal), input, input, input, input); } @@ -131,16 +130,23 @@ public enum ExtraBeeItems implements IItemMisc { ItemStack input2 = item.get(1); if (gem != null) { GameRegistry.addShapelessRecipe( - gem.copy(), input2, input2, input2, input2, input2, input2, input2, input2, input2); + gem.copy(), + input2, + input2, + input2, + input2, + input2, + input2, + input2, + input2, + input2); } } } Item woodGear = null; try { - woodGear = (Item) Class.forName("buildcraft.BuildCraftCore") - .getField("woodenGearItem") - .get(null); + woodGear = (Item) Class.forName("buildcraft.BuildCraftCore").getField("woodenGearItem").get(null); } catch (Exception ex) { // ignored } diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java index 45dee92a..8221c3e0 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeTexture.java @@ -7,6 +7,7 @@ import binnie.core.resource.ResourceType; import binnie.extrabees.ExtraBees; public enum ExtraBeeTexture implements IBinnieTexture { + AlvearyMutator(ResourceType.Tile, "alveary/AlvearyMutator"), AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"), AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"), diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 48994cfe..3f914f26 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -6,6 +6,7 @@ import binnie.extrabees.ExtraBees; import forestry.api.core.Tabs; public class ModuleCore implements IInitializable { + @Override public void preInit() { ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java index a3931f6f..64c06c3f 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java @@ -1,5 +1,8 @@ package binnie.extrabees.genetics; +import java.util.Arrays; +import java.util.Locale; + import binnie.extrabees.genetics.effect.ExtraBeesEffect; import binnie.genetics.genetics.AlleleHelper; import forestry.api.apiculture.BeeManager; @@ -10,12 +13,12 @@ import forestry.api.genetics.IClassification; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.IBranchDefinition; import forestry.core.genetics.alleles.EnumAllele; -import java.util.Arrays; -import java.util.Locale; @SuppressWarnings("Duplicates") public enum ExtraBeeBranchDefinition implements IBranchDefinition { + BARREN("Vacapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); @@ -31,6 +34,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, HOSTILE("Infenapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); @@ -48,6 +52,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, ROCKY("Monapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -64,6 +69,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, METALLIC("Lamminapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -80,6 +86,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, METALLIC2("Metalapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -97,6 +104,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { }, ALLOY("Allapis"), PRECIOUS("Pluriapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -113,6 +121,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, MINERAL("Niphapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -129,6 +138,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, GEMSTONE("Gemmapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -145,6 +155,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, NUCLEAR("Levapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); @@ -159,10 +170,13 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); } }, HISTORIC("Priscapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); @@ -171,6 +185,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, FOSSILIZED("Fosiapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); @@ -179,6 +194,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, REFINED("Petrapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); @@ -187,6 +203,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, AQUATIC("Aquapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true); @@ -196,11 +213,12 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.WATER.getUID())); - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WATER.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WATER.getUID())); } }, SACCHARINE("Sacchapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set( @@ -211,16 +229,18 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { }, CLASSICAL("Grecapis"), VOLCANIC("Irrapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.METEOR.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.METEOR.getUID())); } }, VIRULENT("Virapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); @@ -232,6 +252,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, VISCOUS("Viscapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); @@ -239,10 +260,13 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE); AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ECTOPLASM.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.ECTOPLASM.getUID())); } }, CAUSTIC("Morbapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); @@ -250,11 +274,12 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE); AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST); AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE); - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ACID.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ACID.getUID())); } }, ENERGETIC("Incitapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.CAVE_DWELLING, true); @@ -263,24 +288,30 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.REDSTONE.getUID())); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.LIGHTNING.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.LIGHTNING.getUID())); } }, FARMING("Agriapis"), SHADOW("Pullapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BLINDNESS.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.BLINDNESS.getUID())); } }, PRIMARY("Primapis"), SECONDARY("Secapis"), TERTIARY("Tertiapis"), FTB("Eftebeapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST); @@ -292,6 +323,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { } }, QUANTUM("Quantapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); @@ -301,11 +333,12 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE); AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END); AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.GRAVITY.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.GRAVITY.getUID())); } }, BOTANIA("Botaniapis") { + @Override protected void setBranchProperties(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); @@ -352,8 +385,8 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.NORMAL); - AlleleHelper.instance.set( - defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.instance + .set(defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.NOCTURNAL, false); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.TOLERANT_FLYER, false); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java index df888cf0..9bc468f2 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java @@ -1,5 +1,16 @@ package binnie.extrabees.genetics; +import java.awt.Color; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.Locale; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.BiomeDictionary; + import binnie.core.Mods; import binnie.extrabees.genetics.effect.ExtraBeesEffect; import binnie.extrabees.genetics.requirements.RequirementPerson; @@ -23,24 +34,15 @@ import forestry.apiculture.genetics.IBeeDefinition; import forestry.apiculture.genetics.alleles.AlleleEffect; import forestry.core.genetics.IBranchDefinition; import forestry.core.genetics.alleles.EnumAllele; -import java.awt.Color; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.Locale; -import java.util.Map; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.BiomeDictionary; public enum ExtraBeeDefinition implements IBeeDefinition { + /* BARREN BRANCH */ ARID(ExtraBeeBranchDefinition.BARREN, "aridus", true, new Color(0xbee854), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .setTemperature(EnumTemperature.HOT) + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -56,11 +58,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BARREN(ExtraBeeBranchDefinition.BARREN, "infelix", true, new Color(0xe0d263), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .setTemperature(EnumTemperature.HOT) + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -70,20 +71,18 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, DESOLATE(ExtraBeeBranchDefinition.BARREN, "desolo", false, new Color(0xd1b890), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .setTemperature(EnumTemperature.HOT) - .setHumidity(EnumHumidity.ARID) - .setHasEffect(); + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT) + .setHumidity(EnumHumidity.ARID).setHasEffect(); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.HUNGER.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.HUNGER.getUID())); } @Override @@ -92,13 +91,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, DECOMPOSING(ExtraBeeBranchDefinition.BARREN, "aegrus", true, new Color(0x523711), new Color(0xffffff)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .addSpecialty(EnumHoneyComb.COMPOST.get(1), 0.08f) - .setTemperature(EnumTemperature.HOT) - .setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).addSpecialty(EnumHoneyComb.COMPOST.get(1), 0.08f) + .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); } @Override @@ -107,13 +104,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, GNAWING(ExtraBeeBranchDefinition.BARREN, "apica", true, new Color(0xe874b0), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.25f) - .addSpecialty(EnumHoneyComb.SAWDUST.get(1), 0.25f) - .setTemperature(EnumTemperature.HOT) - .setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.25f).addSpecialty(EnumHoneyComb.SAWDUST.get(1), 0.25f) + .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); } @Override @@ -132,19 +127,19 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* HOSTILE BRANCH */ ROTTEN(ExtraBeeBranchDefinition.HOSTILE, "caries", true, new Color(0xbfe0b6), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .addSpecialty(EnumHoneyComb.ROTTEN.get(1), 0.10f) - .setTemperature(EnumTemperature.HOT) - .setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).addSpecialty(EnumHoneyComb.ROTTEN.get(1), 0.10f) + .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.SPAWN_ZOMBIE.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.SPAWN_ZOMBIE.getUID())); } @Override @@ -153,13 +148,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BONE(ExtraBeeBranchDefinition.HOSTILE, "os", true, new Color(0xe9ede8), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .addSpecialty(EnumHoneyComb.BONE.get(1), 0.10f) - .setTemperature(EnumTemperature.HOT) - .setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).addSpecialty(EnumHoneyComb.BONE.get(1), 0.10f) + .setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID); } @Override @@ -176,19 +169,20 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, CREEPER(ExtraBeeBranchDefinition.HOSTILE, "erepo", true, new Color(0x2ce615), new Color(0xcbe374)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) - .addSpecialty(ItemHoneyComb.VanillaComb.POWDERY.get(), 0.08f) - .setTemperature(EnumTemperature.HOT) + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f) + .addSpecialty(ItemHoneyComb.VanillaComb.POWDERY.get(), 0.08f).setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.SPAWN_CREEPER.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.SPAWN_CREEPER.getUID())); } @Override @@ -199,12 +193,14 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* ROCKY BRANCH */ ROCK(ExtraBeeBranchDefinition.ROCKY, "saxum", true, new Color(0xa8a8a8), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f); } }, STONE(ExtraBeeBranchDefinition.ROCKY, "lapis", false, new Color(0x757575), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f); @@ -216,6 +212,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, GRANITE(ExtraBeeBranchDefinition.ROCKY, "granum", true, new Color(0x695555), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f); @@ -233,6 +230,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, MINERAL(ExtraBeeBranchDefinition.ROCKY, "minerale", true, new Color(0x6e757d), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f); @@ -252,6 +250,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* METALLIC BRANCH */ COPPER(ExtraBeeBranchDefinition.METALLIC, "cuprous", true, new Color(0xd16308), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.COPPER.get(1), 0.06f); @@ -264,6 +263,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, TIN(ExtraBeeBranchDefinition.METALLIC, "stannus", true, new Color(0xbdb1bd), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.TIN.get(1), 0.06f); @@ -276,6 +276,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, IRON(ExtraBeeBranchDefinition.METALLIC, "ferrous", false, new Color(0xa87058), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.IRON.get(1), 0.05f); @@ -288,6 +289,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, LEAD(ExtraBeeBranchDefinition.METALLIC, "plumbous", true, new Color(0xad8bab), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.LEAD.get(1), 0.05f); @@ -302,6 +304,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* METALLIC2 BRANCH */ ZINC(ExtraBeeBranchDefinition.METALLIC2, "spelta", true, new Color(0xedebff), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.ZINC.get(1), 0.05f); @@ -314,6 +317,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, TITANIUM(ExtraBeeBranchDefinition.METALLIC2, "titania", true, new Color(0xb0aae3), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.TITANIUM.get(1), 0.02f); @@ -325,6 +329,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, TUNGSTATE(ExtraBeeBranchDefinition.METALLIC2, "wolfram", true, new Color(0x131214), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.TUNGSTEN.get(1), 0.01f); @@ -336,6 +341,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, NICKEL(ExtraBeeBranchDefinition.METALLIC2, "claro", true, new Color(0xffdefc), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.NICKEL.get(1), 0.05f); @@ -350,6 +356,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* PRECIOUS BRANCH */ GOLD(ExtraBeeBranchDefinition.PRECIOUS, "aureus", true, new Color(0xe6cc0b), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.GOLD.get(1), 0.02f); @@ -364,6 +371,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, SILVER(ExtraBeeBranchDefinition.PRECIOUS, "argentus", false, new Color(0x43455b), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.SILVER.get(1), 0.02f); @@ -379,6 +387,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { }, // ELECTRUM, PLATINUM(ExtraBeeBranchDefinition.PRECIOUS, "platina", false, new Color(0xdbdbdb), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.PLATINUM.get(1), 0.01f); @@ -392,6 +401,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* MINERAL BRANCH */ LAPIS(ExtraBeeBranchDefinition.MINERAL, "lazuli", true, new Color(0x3d2cdb), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.LAPIS.get(1), 0.05f); @@ -410,6 +420,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* GEMSTONE BRANCH */ EMERALD(ExtraBeeBranchDefinition.GEMSTONE, "emerala", true, new Color(0x1cff03), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.EMERALD.get(1), 0.04f); @@ -421,6 +432,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, RUBY(ExtraBeeBranchDefinition.GEMSTONE, "ruba", true, new Color(0xd60000), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.RUBY.get(1), 0.03f); @@ -432,6 +444,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, SAPPHIRE(ExtraBeeBranchDefinition.GEMSTONE, "saphhira", true, new Color(0x0a47ff), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.SAPPHIRE.get(1), 0.03f); @@ -444,6 +457,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { }, // OLIVINE, DIAMOND(ExtraBeeBranchDefinition.GEMSTONE, "diama", true, new Color(0x7fbdfa), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.DIAMOND.get(1), 0.01f); @@ -457,6 +471,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* NUCLEAR BRANCH */ UNSTABLE(ExtraBeeBranchDefinition.NUCLEAR, "levis", false, new Color(0x3e8c34), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f); @@ -468,6 +483,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, NUCLEAR(ExtraBeeBranchDefinition.NUCLEAR, "nucleus", false, new Color(0x41cc2f), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f); @@ -484,11 +500,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, RADIOACTIVE(ExtraBeeBranchDefinition.NUCLEAR, "fervens", false, new Color(0x1eff00), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.20f) - .addSpecialty(EnumHoneyComb.URANIUM.get(1), 0.02f) + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f).addSpecialty(EnumHoneyComb.URANIUM.get(1), 0.02f) .setHasEffect(); } @@ -499,10 +514,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, YELLORIUM(ExtraBeeBranchDefinition.NUCLEAR, "yellori", true, new Color(0xd5ed00), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.20f) + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f) .addSpecialty(EnumHoneyComb.YELLORIUM.get(1), 0.02f); } @@ -511,7 +526,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); } @Override @@ -520,6 +537,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, CYANITE(ExtraBeeBranchDefinition.NUCLEAR, "cyanita", true, new Color(0x0086ed), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f).addSpecialty(EnumHoneyComb.CYANITE.get(1), 0.01f); @@ -530,7 +548,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); } @Override @@ -539,10 +559,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BLUTONIUM(ExtraBeeBranchDefinition.NUCLEAR, "caruthus", true, new Color(0x1b00e6), new Color(0x999999)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.BARREN.get(1), 0.20f) + beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f) .addSpecialty(EnumHoneyComb.BLUTONIUM.get(1), 0.01f); } @@ -551,7 +571,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID())); } @Override @@ -562,6 +584,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* HISTORIC BRANCH */ ANCIENT(ExtraBeeBranchDefinition.HISTORIC, "antiquus", true, new Color(0xf2db8f), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f); @@ -573,6 +596,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, PRIMEVAL(ExtraBeeBranchDefinition.HISTORIC, "priscus", true, new Color(0xb3a67b), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f); @@ -589,6 +613,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, PREHISTORIC(ExtraBeeBranchDefinition.HISTORIC, "pristinus", false, new Color(0x6e5a40), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f); @@ -606,6 +631,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, RELIC(ExtraBeeBranchDefinition.HISTORIC, "sapiens", true, new Color(0x4d3e16), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f).setHasEffect(); @@ -624,6 +650,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* FOSSILIZED BRANCH */ COAL(ExtraBeeBranchDefinition.FOSSILIZED, "carbo", true, new Color(0x7a7648), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.20f).addSpecialty(EnumHoneyComb.COAL.get(1), 0.08f); @@ -636,6 +663,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, RESIN(ExtraBeeBranchDefinition.FOSSILIZED, "lacrima", false, new Color(0xa6731b), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.20f).addSpecialty(EnumHoneyComb.RESIN.get(1), 0.05f); @@ -647,6 +675,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, OIL(ExtraBeeBranchDefinition.FOSSILIZED, "lubricus", true, new Color(0x574770), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.20f).addSpecialty(EnumHoneyComb.OIL.get(1), 0.05f); @@ -658,10 +687,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { registerMutation(BeeDefinition.FRUGAL, PRIMEVAL, 8); } }, - // PEAT, + // PEAT, /* REFINED BRANCH */ DISTILLED(ExtraBeeBranchDefinition.REFINED, "distilli", false, new Color(0x356356), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.10f); @@ -673,11 +703,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, FUEL(ExtraBeeBranchDefinition.REFINED, "refina", true, new Color(0xffc003), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.OIL.get(1), 0.10f) - .addSpecialty(EnumHoneyComb.FUEL.get(1), 0.04f) + beeSpecies.addProduct(EnumHoneyComb.OIL.get(1), 0.10f).addSpecialty(EnumHoneyComb.FUEL.get(1), 0.04f) .setHasEffect(); } @@ -687,11 +716,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, CREOSOTE(ExtraBeeBranchDefinition.REFINED, "creosota", true, new Color(0x979e13), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.COAL.get(1), 0.10f) - .addSpecialty(EnumHoneyComb.CREOSOTE.get(1), 0.07f) + beeSpecies.addProduct(EnumHoneyComb.COAL.get(1), 0.10f).addSpecialty(EnumHoneyComb.CREOSOTE.get(1), 0.07f) .setHasEffect(); } @@ -701,11 +729,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, LATEX(ExtraBeeBranchDefinition.REFINED, "latex", true, new Color(0x494a3e), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.RESIN.get(1), 0.10f) - .addSpecialty(EnumHoneyComb.LATEX.get(1), 0.05f) + beeSpecies.addProduct(EnumHoneyComb.RESIN.get(1), 0.10f).addSpecialty(EnumHoneyComb.LATEX.get(1), 0.05f) .setHasEffect(); } @@ -717,17 +744,17 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* AQUATIC BRANCH */ WATER(ExtraBeeBranchDefinition.AQUATIC, "aqua", true, new Color(0x94a2ff), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).setHumidity(EnumHumidity.DAMP); } }, RIVER(ExtraBeeBranchDefinition.AQUATIC, "flumen", true, new Color(0x83b3d4), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.WATER.get(1), 0.30f) - .addSpecialty(EnumHoneyComb.CLAY.get(1), 0.20f) + beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).addSpecialty(EnumHoneyComb.CLAY.get(1), 0.20f) .setHumidity(EnumHumidity.DAMP); } @@ -737,6 +764,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, OCEAN(ExtraBeeBranchDefinition.AQUATIC, "mare", false, new Color(0x1d2ead), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).setHumidity(EnumHumidity.DAMP); @@ -748,11 +776,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, INK(ExtraBeeBranchDefinition.AQUATIC, "atramentum", true, new Color(0xe1447), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.WATER.get(1), 0.30f) - .addSpecialty(new ItemStack(Items.dye, 1, 0), 0.10f) + beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).addSpecialty(new ItemStack(Items.dye, 1, 0), 0.10f) .setHumidity(EnumHumidity.DAMP); } @@ -764,6 +791,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* AGRARIAN BRANCH */ GROWING(BeeBranchDefinition.AGRARIAN, "tyrelli", true, new Color(0x5bebd8), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); @@ -785,10 +813,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, FARM(BeeBranchDefinition.AGRARIAN, "ager", true, new Color(0x75db60), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) .addSpecialty(EnumHoneyComb.SEED.get(1), 0.10f); } @@ -798,6 +826,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, THRIVING(BeeBranchDefinition.AGRARIAN, "thriva", true, new Color(0x34e37d), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); @@ -819,6 +848,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BLOOMING(BeeBranchDefinition.AGRARIAN, "blooma", true, new Color(0x0abf34), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); @@ -846,10 +876,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* SACCHARINE BRANCH */ SWEET(ExtraBeeBranchDefinition.SACCHARINE, "mellitus", true, new Color(0xfc51f1), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f) .addProduct(new ItemStack(Items.sugar, 1, 0), 0.10f); } @@ -859,10 +889,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, SUGAR(ExtraBeeBranchDefinition.SACCHARINE, "dulcis", true, new Color(0xe6d3e0), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f) .addProduct(new ItemStack(Items.sugar, 1, 0), 0.20f); } @@ -872,10 +902,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, RIPENING(ExtraBeeBranchDefinition.SACCHARINE, "ripa", true, new Color(0xb2c75d), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) .addProduct(new ItemStack(Items.sugar, 1, 0), 0.10f) .addSpecialty(EnumHoneyComb.FRUIT.get(1), 0.10f); } @@ -894,12 +924,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, FRUIT(ExtraBeeBranchDefinition.SACCHARINE, "pomum", true, new Color(0xdb5876), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) - .addProduct(new ItemStack(Items.sugar, 1, 0), 0.15f) - .addSpecialty(EnumHoneyComb.FRUIT.get(1), 0.20f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) + .addProduct(new ItemStack(Items.sugar, 1, 0), 0.15f).addSpecialty(EnumHoneyComb.FRUIT.get(1), 0.20f) .setHasEffect(); } @@ -919,17 +948,17 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* FARMING BRANCH */ ALCOHOL(ExtraBeeBranchDefinition.FARMING, "vinum", false, new Color(0xe88a61), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) .addSpecialty(EnumHoneyComb.ALCOHOL.get(1), 0.10f); } @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele("forestry.effectDrunkard")); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele("forestry.effectDrunkard")); } @Override @@ -938,10 +967,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, MILK(ExtraBeeBranchDefinition.FARMING, "lacteus", true, new Color(0xe3e8e8), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) .addSpecialty(EnumHoneyComb.MILK.get(1), 0.10f); } @@ -951,10 +980,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, COFFEE(ExtraBeeBranchDefinition.FARMING, "arabica", true, new Color(0x8c5e30), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f) .addSpecialty(EnumHoneyComb.COFFEE.get(1), 0.08f); } @@ -968,6 +997,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* BOGGY BRANCH */ SWAMP(BeeBranchDefinition.BOGGY, "paludis", true, new Color(0x356933), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f).setHumidity(EnumHumidity.DAMP); @@ -975,8 +1005,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.SLOW.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.SLOW.getUID())); } @Override @@ -985,6 +1015,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BOGGY(BeeBranchDefinition.BOGGY, "lama", false, new Color(0x785c29), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f); @@ -992,8 +1023,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.SLOW.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.SLOW.getUID())); } @Override @@ -1002,12 +1033,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, FUNGAL(BeeBranchDefinition.BOGGY, "boletus", true, new Color(0xd16200), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f) - .addSpecialty(EnumHoneyComb.FUNGAL.get(1), 0.15f) - .setHasEffect(); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f) + .addSpecialty(EnumHoneyComb.FUNGAL.get(1), 0.15f).setHasEffect(); } @Override @@ -1033,12 +1063,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* VOLCANIC BRANCH */ BASALT(ExtraBeeBranchDefinition.VOLCANIC, "aceri", true, new Color(0x8c6969), new Color(0x9a2323)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f) - .setTemperature(EnumTemperature.HELLISH) - .setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f) + .setTemperature(EnumTemperature.HELLISH).setHumidity(EnumHumidity.ARID); } @Override @@ -1047,12 +1076,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, TEMPERED(ExtraBeeBranchDefinition.VOLCANIC, "iratus", false, new Color(0x8a4848), new Color(0x9a2323)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f) - .setTemperature(EnumTemperature.HELLISH) - .setHumidity(EnumHumidity.ARID); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f) + .setTemperature(EnumTemperature.HELLISH).setHumidity(EnumHumidity.ARID); } @Override @@ -1063,14 +1091,12 @@ public enum ExtraBeeDefinition implements IBeeDefinition { }, // ANGRY, VOLCANIC(ExtraBeeBranchDefinition.VOLCANIC, "volcano", true, new Color(0x4d0c0c), new Color(0x9a2323)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f) - .addSpecialty(EnumHoneyComb.BLAZE.get(1), 0.10f) - .setTemperature(EnumTemperature.HELLISH) - .setHumidity(EnumHumidity.ARID) - .setHasEffect(); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f) + .addSpecialty(EnumHoneyComb.BLAZE.get(1), 0.10f).setTemperature(EnumTemperature.HELLISH) + .setHumidity(EnumHumidity.ARID).setHasEffect(); } @Override @@ -1080,11 +1106,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, GLOWSTONE(ExtraBeeBranchDefinition.VOLCANIC, "glowia", true, new Color(0xe0c61b), new Color(0x9a2323)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.GLOWSTONE.get(1), 0.15f) - .setTemperature(EnumTemperature.HELLISH) + beeSpecies.addProduct(EnumHoneyComb.GLOWSTONE.get(1), 0.15f).setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @@ -1101,11 +1126,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* VIRULENT BRANCH */ MALICIOUS(ExtraBeeBranchDefinition.VIRULENT, "acerbus", true, new Color(0x782a77), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) - .setHumidity(EnumHumidity.DAMP) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP) .setTemperature(EnumTemperature.WARM); } @@ -1115,6 +1139,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, INFECTIOUS(ExtraBeeBranchDefinition.VIRULENT, "contagio", true, new Color(0xb82eb5), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); @@ -1131,14 +1156,12 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, VIRULENT(ExtraBeeBranchDefinition.VIRULENT, "morbus", false, new Color(0xf013ec), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) - .addSpecialty(EnumHoneyComb.VENOMOUS.get(1), 0.12f) - .setHumidity(EnumHumidity.DAMP) - .setTemperature(EnumTemperature.WARM) - .setHasEffect(); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) + .addSpecialty(EnumHoneyComb.VENOMOUS.get(1), 0.12f).setHumidity(EnumHumidity.DAMP) + .setTemperature(EnumTemperature.WARM).setHasEffect(); } @Override @@ -1154,11 +1177,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* VISCOUS BRANCH */ VISCOUS(ExtraBeeBranchDefinition.VISCOUS, "liquidus", true, new Color(0x9470e), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) - .setHumidity(EnumHumidity.DAMP) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP) .setTemperature(EnumTemperature.WARM); } @@ -1168,11 +1190,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, GLUTINOUS(ExtraBeeBranchDefinition.VISCOUS, "glutina", true, new Color(0x1d8c27), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) - .setHumidity(EnumHumidity.DAMP) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP) .setTemperature(EnumTemperature.WARM); } @@ -1187,12 +1208,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, STICKY(ExtraBeeBranchDefinition.VISCOUS, "lentesco", true, new Color(0x17e328), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) - .addSpecialty(EnumHoneyComb.SLIME.get(1), 0.12f) - .setHasEffect(); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) + .addSpecialty(EnumHoneyComb.SLIME.get(1), 0.12f).setHasEffect(); } @Override @@ -1208,11 +1228,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* CAUSTIC BRANCH */ CORROSIVE(ExtraBeeBranchDefinition.CAUSTIC, "corrumpo", false, new Color(0x4a5c0b), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f) - .setHumidity(EnumHumidity.DAMP) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f).setHumidity(EnumHumidity.DAMP) .setTemperature(EnumTemperature.WARM); } @@ -1222,12 +1241,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, CAUSTIC(ExtraBeeBranchDefinition.CAUSTIC, "torrens", true, new Color(0x84a11d), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) - .addSpecialty(EnumHoneyComb.ACIDIC.get(1), 0.03f) - .setHumidity(EnumHumidity.DAMP) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f) + .addSpecialty(EnumHoneyComb.ACIDIC.get(1), 0.03f).setHumidity(EnumHumidity.DAMP) .setTemperature(EnumTemperature.WARM); } @@ -1237,14 +1255,12 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, ACIDIC(ExtraBeeBranchDefinition.CAUSTIC, "acidus", true, new Color(0xc0f016), new Color(0x069764)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f) - .addSpecialty(EnumHoneyComb.ACIDIC.get(1), 0.16f) - .setHumidity(EnumHumidity.DAMP) - .setTemperature(EnumTemperature.WARM) - .setHasEffect(); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f) + .addSpecialty(EnumHoneyComb.ACIDIC.get(1), 0.16f).setHumidity(EnumHumidity.DAMP) + .setTemperature(EnumTemperature.WARM).setHasEffect(); } @Override @@ -1255,6 +1271,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* ENERGETIC BRANCH */ EXCITED(ExtraBeeBranchDefinition.ENERGETIC, "excita", true, new Color(0xff4545), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.REDSTONE.get(1), 0.10f); @@ -1266,6 +1283,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, ENERGETIC(ExtraBeeBranchDefinition.ENERGETIC, "energia", false, new Color(0xe835c7), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(EnumHoneyComb.REDSTONE.get(1), 0.12f); @@ -1277,18 +1295,17 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, ECSTATIC(ExtraBeeBranchDefinition.ENERGETIC, "ecstatica", true, new Color(0xaf35e8), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.REDSTONE.get(1), 0.20f) - .addSpecialty(EnumHoneyComb.IC2ENERGY.get(1), 0.08f) - .setHasEffect(); + beeSpecies.addProduct(EnumHoneyComb.REDSTONE.get(1), 0.20f) + .addSpecialty(EnumHoneyComb.IC2ENERGY.get(1), 0.08f).setHasEffect(); } @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.POWER.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.POWER.getUID())); } @Override @@ -1299,6 +1316,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* FROZEN BRANCH */ ARTIC(BeeBranchDefinition.FROZEN, "artica", true, new Color(0xade0e0), new Color(0xdaf5f3)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.25f).setTemperature(EnumTemperature.ICY); @@ -1317,12 +1335,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, FREEZING(BeeBranchDefinition.FROZEN, "glacia", true, new Color(0x7be3e3), new Color(0xdaf5f3)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.20f) - .addSpecialty(EnumHoneyComb.GLACIAL.get(1), 0.10f) - .setTemperature(EnumTemperature.ICY); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.20f) + .addSpecialty(EnumHoneyComb.GLACIAL.get(1), 0.10f).setTemperature(EnumTemperature.ICY); } @Override @@ -1340,11 +1357,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* SHADOW BRANCH */ SHADOW(ExtraBeeBranchDefinition.SHADOW, "shadowa", false, new Color(0x595959), new Color(0x333333)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.SHADOW.get(1), 0.05f) - .setTemperature(EnumTemperature.HELLISH) + beeSpecies.addProduct(EnumHoneyComb.SHADOW.get(1), 0.05f).setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @@ -1354,11 +1370,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, DARKENED(ExtraBeeBranchDefinition.SHADOW, "darka", true, new Color(0x332e33), new Color(0x333333)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.SHADOW.get(1), 0.10f) - .setTemperature(EnumTemperature.HELLISH) + beeSpecies.addProduct(EnumHoneyComb.SHADOW.get(1), 0.10f).setTemperature(EnumTemperature.HELLISH) .setHumidity(EnumHumidity.ARID); } @@ -1368,19 +1383,17 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, ABYSS(ExtraBeeBranchDefinition.SHADOW, "abyssba", true, new Color(0x210821), new Color(0x333333)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.SHADOW.get(1), 0.25f) - .setTemperature(EnumTemperature.HELLISH) - .setHumidity(EnumHumidity.ARID) - .setHasEffect(); + beeSpecies.addProduct(EnumHoneyComb.SHADOW.get(1), 0.25f).setTemperature(EnumTemperature.HELLISH) + .setHumidity(EnumHumidity.ARID).setHasEffect(); } @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WITHER.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WITHER.getUID())); } @Override @@ -1391,10 +1404,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* PRIMARY BRNCH */ RED(ExtraBeeBranchDefinition.PRIMARY, "rubra", true, new Color(0xff0000), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.RED.get(1), 0.25f); } @@ -1404,10 +1417,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, YELLOW(ExtraBeeBranchDefinition.PRIMARY, "fulvus", true, new Color(0xffdd00), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.YELLOW.get(1), 0.25f); } @@ -1417,10 +1430,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BLUE(ExtraBeeBranchDefinition.PRIMARY, "caeruleus", true, new Color(0x0022ff), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.BLUE.get(1), 0.25f); } @@ -1430,10 +1443,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, GREEN(ExtraBeeBranchDefinition.PRIMARY, "prasinus", true, new Color(0x009900), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.GREEN.get(1), 0.25f); } @@ -1443,10 +1456,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BLACK(ExtraBeeBranchDefinition.PRIMARY, "niger", true, new Color(0x575757), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.BLACK.get(1), 0.25f); } @@ -1456,10 +1469,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, WHITE(ExtraBeeBranchDefinition.PRIMARY, "albus", true, new Color(0xffffff), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.WHITE.get(1), 0.25f); } @@ -1469,10 +1482,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, BROWN(ExtraBeeBranchDefinition.PRIMARY, "fuscus", true, new Color(0x5c350f), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.BROWN.get(1), 0.25f); } @@ -1484,10 +1497,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* SECONDARY BRANCH */ ORANGE(ExtraBeeBranchDefinition.SECONDARY, "flammeus", true, new Color(0xff9d00), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.ORANGE.get(1), 0.25f); } @@ -1497,10 +1510,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, CYAN(ExtraBeeBranchDefinition.SECONDARY, "cyana", true, new Color(0x00ffe5), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.CYAN.get(1), 0.25f); } @@ -1510,10 +1523,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, PURPLE(ExtraBeeBranchDefinition.SECONDARY, "purpureus", true, new Color(0xae00ff), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.PURPLE.get(1), 0.25f); } @@ -1523,10 +1536,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, GRAY(ExtraBeeBranchDefinition.SECONDARY, "ravus", true, new Color(0xbababa), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.GRAY.get(1), 0.25f); } @@ -1536,10 +1549,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, LIGHTBLUE(ExtraBeeBranchDefinition.SECONDARY, "aqua", true, new Color(0x009dff), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.LIGHTBLUE.get(1), 0.25f); } @@ -1549,10 +1562,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, PINK(ExtraBeeBranchDefinition.SECONDARY, "rosaceus", true, new Color(0xff80df), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.PINK.get(1), 0.25f); } @@ -1562,10 +1575,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, LIMEGREEN(ExtraBeeBranchDefinition.SECONDARY, "lima", true, new Color(0x00ff08), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.LIMEGREEN.get(1), 0.25f); } @@ -1577,10 +1590,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* TERTIARY BRANCH */ MAGENTA(ExtraBeeBranchDefinition.TERTIARY, "fuchsia", true, new Color(0xff00cc), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.MAGENTA.get(1), 0.25f); } @@ -1590,10 +1603,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, LIGHTGRAY(ExtraBeeBranchDefinition.TERTIARY, "canus", true, new Color(0xc9c9c9), new Color(0x8cff00)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f) .addSpecialty(EnumHoneyComb.LIGHTGRAY.get(1), 0.25f); } @@ -1605,6 +1618,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* FESTIVE BRANCH */ CELEBRATORY(BeeBranchDefinition.FESTIVE, "celeba", true, new Color(0xfa0a6a), new Color(0xd40000)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.setTemperature(EnumTemperature.ICY); @@ -1614,7 +1628,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.FIREWORKS.getUID())); + template, + EnumBeeChromosome.EFFECT, + AlleleHelper.getAllele(ExtraBeesEffect.FIREWORKS.getUID())); } @Override @@ -1625,14 +1641,12 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* FTB BRANCH */ JADED(ExtraBeeBranchDefinition.FTB, "jadeca", true, new Color(0xfa0a6a), new Color(0xdc8aeb)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) - .addSpecialty(Mods.forestry.stack("pollen"), 0.20f) - .addSpecialty(EnumHoneyComb.PURPLE.get(1), 0.15f) - .setIsNotCounted() - .setHasEffect(); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) + .addSpecialty(Mods.forestry.stack("pollen"), 0.20f).addSpecialty(EnumHoneyComb.PURPLE.get(1), 0.15f) + .setIsNotCounted().setHasEffect(); } @Override @@ -1641,46 +1655,48 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, CHAD(ExtraBeeBranchDefinition.FTB, "merciboocoup", true, new Color(0x2157DB), new Color(0xD2ABD1)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(new ItemStack(Items.cake, 1), 1f) + beeSpecies.addProduct(new ItemStack(Items.cake, 1), 1f) .addSpecialty(Mods.forestry.stack("pollenFertile"), 0.50f) - .addSpecialty(EnumHoneyComb.MILK.get(1), 0.55f) - .setIsNotCounted() - .setHasEffect(); + .addSpecialty(EnumHoneyComb.MILK.get(1), 0.55f).setIsNotCounted().setHasEffect(); } protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_5); AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_5); - AlleleHelper.instance.set( - template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BIRTHDAY.getUID())); + AlleleHelper.instance + .set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BIRTHDAY.getUID())); } @Override protected void registerMutations() { - registerMutation(BeeDefinition.CULTIVATED, CELEBRATORY, 5) - .restrictPerson(new RequirementPerson() - .add( - name -> "" - + EnumChatFormatting.DARK_RED - + EnumChatFormatting.BOLD + "R" - + EnumChatFormatting.RED - + EnumChatFormatting.BOLD + "u" - + EnumChatFormatting.GOLD - + EnumChatFormatting.BOLD + "n" - + EnumChatFormatting.YELLOW - + EnumChatFormatting.BOLD + "a" - + EnumChatFormatting.DARK_GREEN - + EnumChatFormatting.BOLD + "k" - + EnumChatFormatting.GREEN - + EnumChatFormatting.BOLD + "a" - + EnumChatFormatting.AQUA - + EnumChatFormatting.BOLD + "i", - "Runakai") - .add( + registerMutation(BeeDefinition.CULTIVATED, CELEBRATORY, 5).restrictPerson( + new RequirementPerson().add( + name -> "" + EnumChatFormatting.DARK_RED + + EnumChatFormatting.BOLD + + "R" + + EnumChatFormatting.RED + + EnumChatFormatting.BOLD + + "u" + + EnumChatFormatting.GOLD + + EnumChatFormatting.BOLD + + "n" + + EnumChatFormatting.YELLOW + + EnumChatFormatting.BOLD + + "a" + + EnumChatFormatting.DARK_GREEN + + EnumChatFormatting.BOLD + + "k" + + EnumChatFormatting.GREEN + + EnumChatFormatting.BOLD + + "a" + + EnumChatFormatting.AQUA + + EnumChatFormatting.BOLD + + "i", + "Runakai").add( "boubou_19", "Alastors_Game", "BlueWeabo", @@ -1699,11 +1715,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* AUSTERE BRANCH */ HAZARDOUS(BeeBranchDefinition.AUSTERE, "infensus", true, new Color(0xb06c28), new Color(0xffdc16)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(EnumHoneyComb.SALTPETER.get(1), 0.12f) - .setTemperature(EnumTemperature.HOT) + beeSpecies.addProduct(EnumHoneyComb.SALTPETER.get(1), 0.12f).setTemperature(EnumTemperature.HOT) .setHumidity(EnumHumidity.ARID); } @@ -1729,10 +1744,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* QUANTUM BRANCH */ QUANTUM(ExtraBeeBranchDefinition.QUANTUM, "quanta", true, new Color(0x37c5db), new Color(0xd50fdb)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f) + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f) .addSpecialty(EnumHoneyComb.CERTUS.get(1), 0.15f) .addSpecialty(EnumHoneyComb.ENDERPEARL.get(1), 0.15f); } @@ -1755,6 +1770,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, UNUSUAL(ExtraBeeBranchDefinition.QUANTUM, "daniella", true, new Color(0x59a4ba), new Color(0xbaa2eb)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f).setTemperature(EnumTemperature.COLD); @@ -1766,12 +1782,11 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } }, SPATIAL(ExtraBeeBranchDefinition.QUANTUM, "spatia", true, new Color(0x4c1be0), new Color(0xa44ecc)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies - .addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f) - .addSpecialty(EnumHoneyComb.CERTUS.get(1), 0.05f) - .setTemperature(EnumTemperature.COLD); + beeSpecies.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f) + .addSpecialty(EnumHoneyComb.CERTUS.get(1), 0.05f).setTemperature(EnumTemperature.COLD); } @Override @@ -1782,10 +1797,10 @@ public enum ExtraBeeDefinition implements IBeeDefinition { /* BOTANIA BRANCH */ MYSTICAL(ExtraBeeBranchDefinition.BOTANIA, "mystica", true, new Color(0x46a722), new Color(0xffffff)) { + @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - Map products = - BeeDefinition.NOBLE.getGenome().getPrimary().getProductChances(); + Map products = BeeDefinition.NOBLE.getGenome().getPrimary().getProductChances(); for (Map.Entry entry : products.entrySet()) { beeSpecies.addProduct(entry.getKey(), entry.getValue()); } @@ -1901,8 +1916,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { BeeManager.beeRoot.registerTemplate(template); } - protected final ExtraBeeMutation registerMutation( - ExtraBeeDefinition parent1, ExtraBeeDefinition parent2, int chance) { + protected final ExtraBeeMutation registerMutation(ExtraBeeDefinition parent1, ExtraBeeDefinition parent2, + int chance) { return registerMutation(parent1.species, parent2.species, chance); } @@ -1911,29 +1926,34 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } protected final ExtraBeeMutation registerMutation(BeeDefinition parent1, BeeDefinition parent2, int chance) { - return registerMutation( - parent1.getGenome().getPrimary(), parent2.getGenome().getPrimary(), chance); + return registerMutation(parent1.getGenome().getPrimary(), parent2.getGenome().getPrimary(), chance); } - protected final ExtraBeeMutation registerMutation( - IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) { + protected final ExtraBeeMutation registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, + int chance) { ExtraBeeMutation mutation = new ExtraBeeMutation(parent1, parent2, getTemplate(), chance); BeeManager.beeRoot.registerMutation(mutation); return mutation; } - private static ExtraBeeMutation registerMutation( - ExtraBeeDefinition parent1, ExtraBeeDefinition parent2, BeeDefinition result, int chance) { - ExtraBeeMutation mutation = - new ExtraBeeMutation(parent1.species, parent2.species, result.getTemplate(), chance); + private static ExtraBeeMutation registerMutation(ExtraBeeDefinition parent1, ExtraBeeDefinition parent2, + BeeDefinition result, int chance) { + ExtraBeeMutation mutation = new ExtraBeeMutation( + parent1.species, + parent2.species, + result.getTemplate(), + chance); BeeManager.beeRoot.registerMutation(mutation); return mutation; } - private static ExtraBeeMutation registerMutation( - BeeDefinition parent1, ExtraBeeDefinition parent2, BeeDefinition result, int chance) { - ExtraBeeMutation mutation = - new ExtraBeeMutation(parent1.getGenome().getPrimary(), parent2.species, result.getTemplate(), chance); + private static ExtraBeeMutation registerMutation(BeeDefinition parent1, ExtraBeeDefinition parent2, + BeeDefinition result, int chance) { + ExtraBeeMutation mutation = new ExtraBeeMutation( + parent1.getGenome().getPrimary(), + parent2.species, + result.getTemplate(), + chance); BeeManager.beeRoot.registerMutation(mutation); return mutation; } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index 9a4b8220..81b0c2a9 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -1,5 +1,9 @@ package binnie.extrabees.genetics; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import binnie.extrabees.genetics.requirements.*; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -10,11 +14,9 @@ import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; import forestry.api.genetics.IMutation; import forestry.apiculture.genetics.BeeMutation; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom { + public static List mutations = new ArrayList<>(); private List requirements; @@ -31,12 +33,8 @@ public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom } @Override - public float getChance( - IBeeHousing housing, - IAlleleBeeSpecies allele0, - IAlleleBeeSpecies allele1, - IBeeGenome genome0, - IBeeGenome genome1) { + public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, + IBeeGenome genome0, IBeeGenome genome1) { for (IMutationRequirement requirement : requirements) { if (!requirement.fufilled(housing, allele0, allele1, genome0, genome1)) { return 0.0f; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java index 88827c2e..193f41b9 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesFlowers.java @@ -1,5 +1,21 @@ package binnie.extrabees.genetics; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; + import binnie.core.Mods; import binnie.core.util.I18N; import forestry.api.apiculture.FlowerManager; @@ -13,22 +29,9 @@ import forestry.api.genetics.IFruitBearer; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType { + WATER, SUGAR, ROCK, @@ -86,37 +89,37 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo public ItemStack[] getItemStacks() { switch (this) { case WATER: - return new ItemStack[] {new ItemStack(Blocks.waterlily)}; + return new ItemStack[] { new ItemStack(Blocks.waterlily) }; case SUGAR: - return new ItemStack[] {new ItemStack(Blocks.reeds)}; + return new ItemStack[] { new ItemStack(Blocks.reeds) }; case ROCK: - return new ItemStack[] {new ItemStack(Blocks.cobblestone)}; + return new ItemStack[] { new ItemStack(Blocks.cobblestone) }; case BOOK: - return new ItemStack[] {new ItemStack(Blocks.bookshelf)}; + return new ItemStack[] { new ItemStack(Blocks.bookshelf) }; case REDSTONE: - return new ItemStack[] {new ItemStack(Blocks.redstone_torch)}; + return new ItemStack[] { new ItemStack(Blocks.redstone_torch) }; case DEAD: - return new ItemStack[] {new ItemStack(Blocks.deadbush)}; + return new ItemStack[] { new ItemStack(Blocks.deadbush) }; case FRUIT: - return new ItemStack[] {new ItemStack(Items.apple)}; + return new ItemStack[] { new ItemStack(Items.apple) }; case LEAVES: - return new ItemStack[] {new ItemStack(Blocks.leaves)}; + return new ItemStack[] { new ItemStack(Blocks.leaves) }; case SAPLING: - return new ItemStack[] {new ItemStack(Blocks.sapling)}; + return new ItemStack[] { new ItemStack(Blocks.sapling) }; case WOOD: - return new ItemStack[] {new ItemStack(Blocks.log)}; + return new ItemStack[] { new ItemStack(Blocks.log) }; case BEDROCK: - return new ItemStack[] {new ItemStack(Blocks.bedrock)}; + return new ItemStack[] { new ItemStack(Blocks.bedrock) }; } return new ItemStack[0]; } @@ -176,13 +179,11 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo public boolean growFlower(World world, IIndividual individual, int x, int y, int z) { switch (this) { case WATER: - return world.isAirBlock(x, y, z) - && world.getBlock(x, y - 1, z) == Blocks.water + return world.isAirBlock(x, y, z) && world.getBlock(x, y - 1, z) == Blocks.water && world.setBlock(x, y, z, Blocks.waterlily, 0, 2); case SUGAR: - return world.getBlock(x, y - 1, z) == Blocks.reeds - && world.isAirBlock(x, y, z) + return world.getBlock(x, y - 1, z) == Blocks.reeds && world.isAirBlock(x, y, z) && world.setBlock(x, y, z, Blocks.reeds, 0, 0); } return false; diff --git a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java index 78595f4b..d56d6cd6 100644 --- a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java @@ -1,5 +1,9 @@ package binnie.extrabees.genetics; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.IInitializable; import binnie.extrabees.ExtraBees; @@ -10,11 +14,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IGenome; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class ModuleGenetics implements IInitializable { + public static IGenome getGenome(IAlleleBeeSpecies allele0) { return Binnie.Genetics.getBeeRoot() .templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID())); diff --git a/src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java b/src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java index 976c3557..37e94a64 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java +++ b/src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java @@ -1,15 +1,18 @@ package binnie.extrabees.genetics.effect; -import binnie.extrabees.ExtraBees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.block.BlockWeb; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.Item; +import binnie.extrabees.ExtraBees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockEctoplasm extends BlockWeb { + public BlockEctoplasm() { setLightOpacity(1); setHardness(0.5f); diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java index c9bc694b..e89d3cfc 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java +++ b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java @@ -1,6 +1,7 @@ package binnie.extrabees.genetics.effect; import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.init.Blocks; @@ -9,6 +10,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class EntityBeeLightning extends EntityLightningBolt { + int lightningState; int boltLivingTime; @@ -31,12 +33,11 @@ public class EntityBeeLightning extends EntityLightningBolt { lightningState = 1; boltVertex = rand.nextLong(); - if (!worldObj.isRemote - && worldObj.doChunksNearChunkExist( - MathHelper.floor_double(posX), - MathHelper.floor_double(posY), - MathHelper.floor_double(posZ), - 10)) { + if (!worldObj.isRemote && worldObj.doChunksNearChunkExist( + MathHelper.floor_double(posX), + MathHelper.floor_double(posY), + MathHelper.floor_double(posZ), + 10)) { int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(posY); int k = MathHelper.floor_double(posZ); diff --git a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java index 33556250..ffbb7de9 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java +++ b/src/main/java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java @@ -1,21 +1,9 @@ package binnie.extrabees.genetics.effect; -import binnie.Binnie; -import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.genetics.ExtraBeesFlowers; -import cofh.api.energy.IEnergyReceiver; -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; -import forestry.api.genetics.IEffectData; -import forestry.core.proxy.Proxies; import java.util.ArrayList; import java.util.Calendar; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -37,7 +25,22 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; +import binnie.Binnie; +import binnie.core.util.I18N; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.genetics.ExtraBeesFlowers; +import cofh.api.energy.IEnergyReceiver; +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; +import forestry.api.genetics.IEffectData; +import forestry.core.proxy.Proxies; + public enum ExtraBeesEffect implements IAlleleBeeEffect { + ECTOPLASM, ACID, SPAWN_ZOMBIE, @@ -178,10 +181,8 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } int entityCount = world.getEntitiesWithinAABB( - entity.getClass(), - AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1) - .expand(8.0, 4.0, 8.0)) - .size(); + entity.getClass(), + AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(8.0, 4.0, 8.0)).size(); if (entityCount >= 6) { return; } @@ -327,9 +328,8 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { return; } - if (world.isAirBlock(x, y, z) - && (world.isBlockNormalCubeDefault(x, y - 1, z, false) - || world.getBlock(x, y - 1, z) == ExtraBees.ectoplasm)) { + if (world.isAirBlock(x, y, z) && (world.isBlockNormalCubeDefault(x, y - 1, z, false) + || world.getBlock(x, y - 1, z) == ExtraBees.ectoplasm)) { world.setBlock(x, y, z, ExtraBees.ectoplasm, 0, 0); } } @@ -566,18 +566,18 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { int[] territory; int[] area = territory = genome.getTerritory(); int n = 0; - territory[n] *= - (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f); + territory[n] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) + * 3.0f); int[] array = area; int n2 = 1; - array[n2] *= - (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f); + array[n2] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) + * 3.0f); int[] array2 = area; int n3 = 2; - array2[n3] *= - (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) * 3.0f); + array2[n3] *= (int) (BeeManager.beeRoot.createBeeHousingModifier(housing).getTerritoryModifier(genome, 1.0f) + * 3.0f); if (area[0] < 1) { area[0] = 1; @@ -609,17 +609,12 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { public List getEntities(Class eClass, IBeeGenome genome, IBeeHousing housing) { int[] area = genome.getTerritory(); - int[] offset = {-Math.round(area[0] / 2), -Math.round(area[1] / 2), -Math.round(area[2] / 2)}; - int[] min = { - housing.getCoordinates().posX + offset[0], - housing.getCoordinates().posY + offset[1], - housing.getCoordinates().posZ + offset[2] - }; - int[] max = { - housing.getCoordinates().posX + offset[0] + area[0], - housing.getCoordinates().posY + offset[1] + area[1], - housing.getCoordinates().posZ + offset[2] + area[2] - }; + int[] offset = { -Math.round(area[0] / 2), -Math.round(area[1] / 2), -Math.round(area[2] / 2) }; + int[] min = { housing.getCoordinates().posX + offset[0], housing.getCoordinates().posY + offset[1], + housing.getCoordinates().posZ + offset[2] }; + int[] max = { housing.getCoordinates().posX + offset[0] + area[0], + housing.getCoordinates().posY + offset[1] + area[1], + housing.getCoordinates().posZ + offset[2] + area[2] }; AxisAlignedBB box = AxisAlignedBB.getBoundingBox(min[0], min[1], min[2], max[0], max[1], max[2]); return housing.getWorld().getEntitiesWithinAABB(eClass, box); } @@ -630,6 +625,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } public static class Birthday { + protected int day; protected int month; protected String name; @@ -641,8 +637,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect { } public boolean isToday() { - return Calendar.getInstance().get(5) == month - && Calendar.getInstance().get(2) == day; + return Calendar.getInstance().get(5) == month && Calendar.getInstance().get(2) == day; } public String getName() { diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index 6bdb4a9e..fa8ce2e4 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -1,12 +1,14 @@ package binnie.extrabees.genetics.effect; import java.util.ArrayList; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; public class FireworkCreator { + public enum Shape { Ball, LargeBall, @@ -16,6 +18,7 @@ public class FireworkCreator { } public static class Firework { + protected boolean flicker; protected boolean trail; protected ArrayList colors; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index 78efc083..546dbf04 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -1,12 +1,7 @@ package binnie.extrabees.genetics.items; -import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.core.ExtraBeeGUID; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.core.util.I18N; +import binnie.extrabees.ExtraBees; +import binnie.extrabees.core.ExtraBeeGUID; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemDictionary extends Item { + protected IIcon iconMaster; public ItemDictionary() { @@ -56,19 +59,18 @@ public class ItemDictionary extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 0) { - ExtraBees.proxy.openGui( - ExtraBeeGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); + ExtraBees.proxy + .openGui(ExtraBeeGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); } else { - ExtraBees.proxy.openGui( - ExtraBeeGUID.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); + ExtraBees.proxy + .openGui(ExtraBeeGUID.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); } return stack; } @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) - ? I18N.localise("extrabees.item.database") + return (stack.getItemDamage() == 0) ? I18N.localise("extrabees.item.database") : I18N.localise("extrabees.item.masterDatabase"); } } diff --git a/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java b/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java index 0bdd7ce3..d8c194d8 100644 --- a/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java +++ b/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationCondition.java @@ -1,12 +1,14 @@ package binnie.extrabees.genetics.requirements; +import net.minecraft.world.World; + import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; -import net.minecraft.world.World; public class DummyMutationCondition implements IMutationCondition { + private final RequirementPerson requirement; public DummyMutationCondition(RequirementPerson requirement) { @@ -14,16 +16,8 @@ public class DummyMutationCondition implements IMutationCondition { } @Override - public float getChance( - World world, - int x, - int y, - int z, - IAllele allele0, - IAllele allele1, - IGenome genome0, - IGenome genome1, - IClimateProvider climate) { + public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, + IGenome genome1, IClimateProvider climate) { return 1.0F; } diff --git a/src/main/java/binnie/extrabees/genetics/requirements/IMutationRequirement.java b/src/main/java/binnie/extrabees/genetics/requirements/IMutationRequirement.java index 0facd377..30b4a1df 100644 --- a/src/main/java/binnie/extrabees/genetics/requirements/IMutationRequirement.java +++ b/src/main/java/binnie/extrabees/genetics/requirements/IMutationRequirement.java @@ -5,6 +5,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; public interface IMutationRequirement { + String getDescription(); boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1); diff --git a/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java b/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java index 5c959063..a91af2f3 100644 --- a/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java +++ b/src/main/java/binnie/extrabees/genetics/requirements/RequirementPerson.java @@ -1,17 +1,20 @@ package binnie.extrabees.genetics.requirements; -import binnie.core.util.I18N; -import forestry.api.apiculture.IBeeHousing; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IGenome; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; + import net.minecraft.util.EnumChatFormatting; +import binnie.core.util.I18N; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; + public class RequirementPerson implements IMutationRequirement { + protected List names; protected HashMap> nameFormatters = new HashMap<>(); private static final Function defaultApplier = name -> name; @@ -44,8 +47,7 @@ public class RequirementPerson implements IMutationRequirement { hasNewLines = true; } String name = names.get(i); - namesFormatted.append( - nameFormatters.getOrDefault(name, defaultApplier).apply(name)); + namesFormatted.append(nameFormatters.getOrDefault(name, defaultApplier).apply(name)); namesFormatted.append(EnumChatFormatting.RESET); } namesFormatted.append("]"); diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java index 30c30fc2..a5a38b07 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java @@ -1,5 +1,8 @@ package binnie.extrabees.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; @@ -9,10 +12,9 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowAlvearyFrame extends Window { + protected Machine machine; protected ControlPlayerInventory playerInventory; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java index 0ccda28e..e7b9f35c 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java @@ -1,5 +1,8 @@ package binnie.extrabees.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlPlayerInventory; @@ -10,10 +13,9 @@ import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.hatchery.AlvearyHatchery; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowAlvearyHatchery extends Window { + protected Machine machine; protected ControlPlayerInventory playerInventory; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index d7916962..09b84123 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -1,5 +1,9 @@ package binnie.extrabees.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import binnie.core.AbstractMod; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.IArea; @@ -14,11 +18,9 @@ import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.mutator.AlvearyMutator; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class WindowAlvearyMutator extends Window { + protected Machine machine; protected ControlPlayerInventory playerInventory; @@ -41,11 +43,10 @@ public class WindowAlvearyMutator extends Window { ControlSlot slot = new ControlSlot(this, 79.0f, 30.0f); slot.assign(AlvearyMutator.SLOT_MUTATOR); new ControlText( - this, - new IArea(0.0f, 52.0f, w(), 16.0f), - I18N.localise("extrabees.machine.alveay.mutator.mutagens"), - TextJustification.MIDDLE_CENTER) - .setColor(0x555555); + this, + new IArea(0.0f, 52.0f, w(), 16.0f), + I18N.localise("extrabees.machine.alveay.mutator.mutagens"), + TextJustification.MIDDLE_CENTER).setColor(0x555555); int size = AlvearyMutator.getMutagens().size(); int w = size * 18; diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java index 7873f48a..dd5c8229 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java @@ -1,5 +1,8 @@ package binnie.extrabees.gui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; @@ -12,10 +15,9 @@ import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.stimulator.AlvearyStimulator; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowAlvearyStimulator extends Window { + protected Machine machine; protected ControlPlayerInventory playerInventory; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index 95fa2d7d..cfdf5a59 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -1,5 +1,9 @@ package binnie.extrabees.gui.database; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -15,24 +19,16 @@ import forestry.api.apiculture.IBeeRoot; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; public class ControlClimateBar extends Control implements ITooltip { + protected boolean isHumidity; protected List tolerated; - private static final Color[] TEMP_COLORS = new Color[] { - new Color(0x00fffb), - new Color(0x78bbff), - new Color(0x4fff30), - new Color(0xffff00), - new Color(0xffa200), - new Color(0xff0000) - }; - private static final Color[] HUMID_COLORS = - new Color[] {new Color(0xffe7a3), new Color(0x1aff00), new Color(0x307cff)}; + private static final Color[] TEMP_COLORS = new Color[] { new Color(0x00fffb), new Color(0x78bbff), + new Color(0x4fff30), new Color(0xffff00), new Color(0xffa200), new Color(0xff0000) }; + private static final Color[] HUMID_COLORS = new Color[] { new Color(0xffe7a3), new Color(0x1aff00), + new Color(0x307cff) }; public ControlClimateBar(IWidget parent, int x, int y, int width, int height) { this(parent, x, y, width, height, false); @@ -52,8 +48,7 @@ public class ControlClimateBar extends Control implements ITooltip { } int types = isHumidity ? 3 : 6; - int type = (int) - ((int) (getRelativeMousePosition().x() - 1.0f) / ((getSize().x() - 2.0f) / types)); + int type = (int) ((int) (getRelativeMousePosition().x() - 1.0f) / ((getSize().x() - 2.0f) / types)); if (!tolerated.contains(type) || type >= types) { return; } diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java index 9205e47b..db300914 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesClimate.java @@ -9,6 +9,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesClimate extends PageSpecies { + protected ControlClimateBar tempBar; protected ControlClimateBar humidBar; diff --git a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java index 05478b73..4a778355 100644 --- a/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/extrabees/gui/database/PageSpeciesGenome.java @@ -17,6 +17,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.core.genetics.alleles.EnumAllele; public class PageSpeciesGenome extends PageSpecies { + protected ControlText title; protected ControlText speedText; protected ControlText lifespanText; @@ -188,8 +189,8 @@ public class PageSpeciesGenome extends PageSpecies { IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template); speedText.setValue(rateSpeed(genome.getSpeed())); lifespanText.setValue(rateLifespan(genome.getLifespan())); - fertilityText.setValue( - I18N.localise("extrabees.gui.database.tab.species.genome.children", genome.getFertility())); + fertilityText + .setValue(I18N.localise("extrabees.gui.database.tab.species.genome.children", genome.getFertility())); floweringText.setValue(rateFlowering(genome.getFlowering())); int[] area = genome.getTerritory(); territoryText.setValue(area[0] + "x" + area[1] + "x" + area[2]); diff --git a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java index 2c2820ba..49eadec1 100644 --- a/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/extrabees/gui/database/WindowApiaristDatabase.java @@ -1,5 +1,7 @@ package binnie.extrabees.gui.database; +import net.minecraft.entity.player.EntityPlayer; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.DatabaseTab; @@ -16,9 +18,9 @@ import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import binnie.extrabees.gui.database.product.PageSpeciesProducts; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; public class WindowApiaristDatabase extends WindowAbstractDatabase { + public WindowApiaristDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.beeBreedingSystem, 110.0f); } @@ -31,7 +33,8 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { protected void addTabs() { new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.overview")); new PageSpeciesClassification( - getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.classification")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraBees.instance, "species.classification")); new PageSpeciesGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.genome")); new PageSpeciesProducts(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.products")); new PageSpeciesClimate(getInfoPages(Mode.Species), new DatabaseTab(ExtraBees.instance, "species.climate")); diff --git a/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java b/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java index dcc88dc2..7a6ed559 100644 --- a/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java +++ b/src/main/java/binnie/extrabees/gui/database/product/ControlProductsBox.java @@ -1,5 +1,12 @@ package binnie.extrabees.gui.database.product; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; @@ -7,13 +14,9 @@ import binnie.core.craftgui.controls.listbox.ControlListBox; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.IAllele; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import net.minecraft.item.ItemStack; public class ControlProductsBox extends ControlListBox { + protected IAlleleBeeSpecies species; private ProductType type; @@ -38,10 +41,8 @@ public class ControlProductsBox extends ControlListBox { IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template); float speed = genome.getSpeed(); - float modeSpeed = Binnie.Genetics.getBeeRoot() - .getBeekeepingMode(BinnieCore.proxy.getWorld()) - .getBeeModifier() - .getProductionModifier(genome, 1.0f); + float modeSpeed = Binnie.Genetics.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()) + .getBeeModifier().getProductionModifier(genome, 1.0f); List strings = new ArrayList<>(); Set> chances; diff --git a/src/main/java/binnie/extrabees/gui/database/product/ControlProductsItem.java b/src/main/java/binnie/extrabees/gui/database/product/ControlProductsItem.java index f01074be..82e170bb 100644 --- a/src/main/java/binnie/extrabees/gui/database/product/ControlProductsItem.java +++ b/src/main/java/binnie/extrabees/gui/database/product/ControlProductsItem.java @@ -1,5 +1,7 @@ package binnie.extrabees.gui.database.product; +import java.text.DecimalFormat; + import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.controls.listbox.ControlList; @@ -8,9 +10,9 @@ import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; -import java.text.DecimalFormat; public class ControlProductsItem extends ControlOption { + protected ControlItemDisplay item; public ControlProductsItem(ControlList controlList, Product value, int y) { diff --git a/src/main/java/binnie/extrabees/gui/database/product/PageSpeciesProducts.java b/src/main/java/binnie/extrabees/gui/database/product/PageSpeciesProducts.java index 9627133c..91de3b65 100644 --- a/src/main/java/binnie/extrabees/gui/database/product/PageSpeciesProducts.java +++ b/src/main/java/binnie/extrabees/gui/database/product/PageSpeciesProducts.java @@ -9,6 +9,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesProducts extends PageSpecies { + protected ControlProductsBox products; protected ControlProductsBox specialties; diff --git a/src/main/java/binnie/extrabees/gui/database/product/Product.java b/src/main/java/binnie/extrabees/gui/database/product/Product.java index 34538e91..5f6a2bea 100644 --- a/src/main/java/binnie/extrabees/gui/database/product/Product.java +++ b/src/main/java/binnie/extrabees/gui/database/product/Product.java @@ -3,6 +3,7 @@ package binnie.extrabees.gui.database.product; import net.minecraft.item.ItemStack; public class Product { + protected ItemStack item; protected float chance; diff --git a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java index 7628b864..723c6848 100644 --- a/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java +++ b/src/main/java/binnie/extrabees/liquids/ExtraBeeLiquid.java @@ -1,5 +1,11 @@ package binnie.extrabees.liquids; +import java.awt.Color; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ILiquidType; @@ -7,12 +13,9 @@ import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.awt.Color; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; public enum ExtraBeeLiquid implements ILiquidType { + ACID("acid", new Color(0xafeb19)), POISON("poison", new Color(0xeb14eb)), GLACIAL("liquidnitrogen", new Color(0x96c8c8)); @@ -69,8 +72,7 @@ public enum ExtraBeeLiquid implements ILiquidType { @Override public boolean showInCreative(FluidContainer container) { - return container == FluidContainer.Bucket - || container == FluidContainer.Can + return container == FluidContainer.Bucket || container == FluidContainer.Can || container == FluidContainer.Capsule || container == FluidContainer.Refractory; } diff --git a/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java b/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java index 8d991d9e..394d98d5 100644 --- a/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java +++ b/src/main/java/binnie/extrabees/liquids/ModuleLiquids.java @@ -5,6 +5,7 @@ import binnie.core.IInitializable; import binnie.core.liquid.ItemFluidContainer; public class ModuleLiquids implements IInitializable { + @Override public void preInit() { Binnie.Liquid.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee); diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index 0447d9a2..5c4f6f1f 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -1,16 +1,19 @@ package binnie.extrabees.products; +import java.awt.Color; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; + +import net.minecraft.item.ItemStack; + import binnie.core.item.IItemEnum; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; -import java.awt.Color; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; -import net.minecraft.item.ItemStack; public enum EnumHoneyComb implements IItemEnum { + BARREN(new Color(0x736c44), new Color(0xc2bea7)), ROTTEN(new Color(0x3e5221), new Color(0xb1cc89)), BONE(new Color(0xc4c4af), new Color(0xdedec1)), @@ -31,7 +34,7 @@ public enum EnumHoneyComb implements IItemEnum { COPPER(new Color(0x363534), new Color(0xd16308)), TIN(new Color(0x363534), new Color(0xbdb1bd)), SILVER(new Color(0x363534), new Color(0xdbdbdb)), - // BRONZE, + // BRONZE, URANIUM(new Color(0x1eff00), new Color(0x41ab33)), CLAY(new Color(0x6b563a), new Color(0xb0c0d6)), OLD(new Color(0x453314), new Color(0xb39664)), @@ -44,29 +47,29 @@ public enum EnumHoneyComb implements IItemEnum { BLAZE(new Color(0xff6a00), new Color(0xffcc00)), COFFEE(new Color(0x54381d), new Color(0xb37f4b)), GLACIAL(new Color(0x4e8787), new Color(0xcbf2f2)), - // MINT, - // CITRUS, - // PEAT, + // MINT, + // CITRUS, + // PEAT, SHADOW(new Color(0x000000), new Color(0x361835)), LEAD(new Color(0x363534), new Color(0x9a809c)), - // BRASS, - // ELECTRUM, + // BRASS, + // ELECTRUM, ZINC(new Color(0x363534), new Color(0xedebff)), TITANIUM(new Color(0x363534), new Color(0xb0aae3)), TUNGSTEN(new Color(0x363534), new Color(0x131214)), - // STEEL, - // IRIDIUM, + // STEEL, + // IRIDIUM, PLATINUM(new Color(0x363534), new Color(0x9a809c)), LAPIS(new Color(0x363534), new Color(0x3d2cdb)), - // SODALITE, - // PYRITE, - // BAUXITE, - // CINNABAR, - // SPHALERITE, + // SODALITE, + // PYRITE, + // BAUXITE, + // CINNABAR, + // SPHALERITE, EMERALD(new Color(0x363534), new Color(0x1cff03)), RUBY(new Color(0x363534), new Color(0xd60000)), SAPPHIRE(new Color(0x363534), new Color(0xa47ff)), - // OLIVINE, + // OLIVINE, DIAMOND(new Color(0x363534), new Color(0x7fbdfa)), RED(new Color(0xcc4c4c), new Color(0xff0000)), YELLOW(new Color(0xe5e533), new Color(0xffdd00)), @@ -85,7 +88,7 @@ public enum EnumHoneyComb implements IItemEnum { MAGENTA(new Color(0xe57fd8), new Color(0xff00cc)), LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9)), NICKEL(new Color(0x363534), new Color(0xffdefc)), - // INVAR, + // INVAR, GLOWSTONE(new Color(0xa69c5e), new Color(0xe0c409)), SALTPETER(new Color(0xa69c5e), new Color(0xe0c409)), // PULP, diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index d6a54d3b..3474ffc5 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -1,29 +1,32 @@ package binnie.extrabees.products; +import java.awt.Color; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.item.IItemEnum; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; -import java.awt.Color; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public enum EnumHoneyDrop implements IItemEnum { + ENERGY(new Color(0x9c4972), new Color(0xe37171), ""), ACID(new Color(0x4bb541), new Color(0x49de3c), "acid"), POISON(new Color(0xd106b9), new Color(0xff03e2), "poison"), APPLE(new Color(0xc75252), new Color(0xc92a2a), "juice"), - // CITRUS, + // CITRUS, ICE(new Color(0xaee8e2), new Color(0x96fff5), "liquidnitrogen"), MILK(new Color(0xe0e0e0), new Color(0xffffff), "milk"), SEED(new Color(0x7cc272), new Color(0xc2bea7), "seedoil"), ALCOHOL(new Color(0xdbe84d), new Color(0xa5e84d), "short.mead"), - // FRUIT, - // VEGETABLE, - // PUMPKIN, - // MELON, + // FRUIT, + // VEGETABLE, + // PUMPKIN, + // MELON, RED(new Color(0xcc4c4c), new Color(0xff0000), "for.honey"), YELLOW(new Color(0xe5e533), new Color(0xffdd00), "for.honey"), BLUE(new Color(0x99b2f2), new Color(0x0022ff), "for.honey"), @@ -70,7 +73,7 @@ public enum EnumHoneyDrop implements IItemEnum { if (liquid == null) { return; } - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] {get(1)}, liquid, remenant, 100); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] { get(1) }, liquid, remenant, 100); } @Override diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/products/EnumPropolis.java index 5651d2d8..61befd18 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/products/EnumPropolis.java @@ -1,25 +1,28 @@ package binnie.extrabees.products; +import java.awt.Color; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.item.IItemEnum; import binnie.core.util.I18N; import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; -import java.awt.Color; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public enum EnumPropolis implements IItemEnum { + WATER(new Color(0x24b3c9), new Color(0xc2bea7), "Water"), OIL(new Color(0x172f33), new Color(0xc2bea7), "oil"), FUEL(new Color(0xa38d12), new Color(0xc2bea7), "fuel"), - // MILK, - // FRUIT, - // SEED, - // ALCOHOL, + // MILK, + // FRUIT, + // SEED, + // ALCOHOL, CREOSOTE(new Color(0x877501), new Color(0xbda613), "creosote"); - // GLACIAL, - // PEAT + // GLACIAL, + // PEAT public final int secondaryColor; public final int primaryColor; @@ -44,7 +47,7 @@ public enum EnumPropolis implements IItemEnum { if (liquid == null) { return; } - RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {get(1)}, liquid, null, 0); + RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] { get(1) }, liquid, null, 0); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index c1497d9c..27cdf398 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -1,5 +1,12 @@ package binnie.extrabees.products; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.extrabees.ExtraBees; @@ -7,14 +14,9 @@ import binnie.extrabees.core.ExtraBeeItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public class ItemHoneyComb extends ItemProduct { + protected IIcon icon1; protected IIcon icon2; @@ -78,8 +80,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.LATEX.addProduct(honeyDrop, 0.50f); EnumHoneyComb.LATEX.addProduct(beeswax, 0.85f); if (!OreDictionary.getOres("itemRubber").isEmpty()) { - EnumHoneyComb.LATEX.tryAddProduct( - OreDictionary.getOres("itemRubber").get(0), 1.00f); + EnumHoneyComb.LATEX.tryAddProduct(OreDictionary.getOres("itemRubber").get(0), 1.00f); } else { EnumHoneyComb.LATEX.active = false; } @@ -116,8 +117,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.URANIUM.copyProducts(EnumHoneyComb.STONE); if (!OreDictionary.getOres("crushedUranium").isEmpty()) { - EnumHoneyComb.URANIUM.tryAddProduct( - OreDictionary.getOres("crushedUranium").get(0), 0.50f); + EnumHoneyComb.URANIUM.tryAddProduct(OreDictionary.getOres("crushedUranium").get(0), 0.50f); } EnumHoneyComb.CLAY.addProduct(beeswax, 0.25f); @@ -156,8 +156,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f); if (!OreDictionary.getOres("dustObsidian").isEmpty()) { - EnumHoneyComb.SHADOW.tryAddProduct( - OreDictionary.getOres("dustObsidian").get(0), 0.75f); + EnumHoneyComb.SHADOW.tryAddProduct(OreDictionary.getOres("dustObsidian").get(0), 0.75f); } else { EnumHoneyComb.SHADOW.active = false; } @@ -206,8 +205,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f); if (!OreDictionary.getOres("dustSawdust").isEmpty()) { - EnumHoneyComb.SAWDUST.tryAddProduct( - OreDictionary.getOres("dustSawdust").get(0), 1.00f); + EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f); } else if (!OreDictionary.getOres("sawdust").isEmpty()) { EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("sawdust").get(0), 1.00f); } @@ -215,14 +213,12 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.CERTUS.addProduct(honeyDrop, 0.25f); EnumHoneyComb.CERTUS.addProduct(new ItemStack(Items.quartz), 0.25f); if (!OreDictionary.getOres("dustCertusQuartz").isEmpty()) { - EnumHoneyComb.CERTUS.tryAddProduct( - OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f); + EnumHoneyComb.CERTUS.tryAddProduct(OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f); } EnumHoneyComb.ENDERPEARL.addProduct(honeyDrop, 0.25f); if (!OreDictionary.getOres("dustEnderPearl").isEmpty()) { - EnumHoneyComb.ENDERPEARL.tryAddProduct( - OreDictionary.getOres("dustEnderPearl").get(0), 0.25f); + EnumHoneyComb.ENDERPEARL.tryAddProduct(OreDictionary.getOres("dustEnderPearl").get(0), 0.25f); } EnumHoneyComb.YELLORIUM.copyProducts(EnumHoneyComb.STONE); @@ -245,7 +241,7 @@ public class ItemHoneyComb extends ItemProduct { for (int i = 0; i < 16; ++i) { EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i]; EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i]; - int[] dyeC = {1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7}; + int[] dyeC = { 1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7 }; int k = dyeC[i]; ItemStack dye = new ItemStack(Items.dye, 1, k); switch (k) { @@ -324,6 +320,7 @@ public class ItemHoneyComb extends ItemProduct { } public enum VanillaComb { + HONEY, COCOA, SIMMERING, diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java index eeecb9f1..8a44cf03 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java @@ -1,14 +1,16 @@ package binnie.extrabees.products; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.core.BinnieCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class ItemHoneyDrop extends ItemProduct { + protected IIcon icon1; protected IIcon icon2; diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index 1e509d81..f59a9a1c 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -1,12 +1,15 @@ package binnie.extrabees.products; -import binnie.core.item.IItemEnum; import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import binnie.core.item.IItemEnum; + public class ItemProduct extends Item { + protected IItemEnum[] types; public ItemProduct(IItemEnum[] types) { diff --git a/src/main/java/binnie/extrabees/products/ItemPropolis.java b/src/main/java/binnie/extrabees/products/ItemPropolis.java index aaf97490..0278cb9f 100644 --- a/src/main/java/binnie/extrabees/products/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/products/ItemPropolis.java @@ -1,13 +1,15 @@ package binnie.extrabees.products; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; + import binnie.core.BinnieCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; public class ItemPropolis extends ItemProduct { + public ItemPropolis() { super(EnumPropolis.values()); setCreativeTab(Tabs.tabApiculture); diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index 9b381333..6fd48fec 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -1,11 +1,13 @@ package binnie.extrabees.products; -import binnie.core.IInitializable; -import binnie.extrabees.ExtraBees; import net.minecraft.init.Items; import net.minecraftforge.oredict.OreDictionary; +import binnie.core.IInitializable; +import binnie.extrabees.ExtraBees; + public class ModuleProducts implements IInitializable { + @Override public void preInit() { ExtraBees.honeyDrop = new ItemHoneyDrop(); diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxy.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxy.java index 552610df..135fafed 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxy.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxy.java @@ -4,6 +4,7 @@ import binnie.core.proxy.BinnieModProxy; import binnie.extrabees.ExtraBees; public class ExtraBeesProxy extends BinnieModProxy { + public ExtraBeesProxy() { super(ExtraBees.instance); } diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java index 78b39cdd..1d27543e 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java @@ -1,3 +1,4 @@ package binnie.extrabees.proxy; -public class ExtraBeesProxyClient extends ExtraBeesProxy {} +public class ExtraBeesProxyClient extends ExtraBeesProxy { +} diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyServer.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyServer.java index 593f4ae2..ec85c8ae 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyServer.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyServer.java @@ -1,3 +1,4 @@ package binnie.extrabees.proxy; -public class ExtraBeesProxyServer extends ExtraBeesProxy {} +public class ExtraBeesProxyServer extends ExtraBeesProxy { +} diff --git a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java index 25184a05..1f223e9c 100644 --- a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java @@ -1,13 +1,9 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IHiveDrop; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -16,7 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.extrabees.ExtraBees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IHiveDrop; +import forestry.api.core.Tabs; + public class BlockExtraBeeHive extends Block { + protected IIcon[][] icons; public BlockExtraBeeHive() { @@ -55,10 +58,10 @@ public class BlockExtraBeeHive extends Block { public void registerBlockIcons(IIconRegister register) { icons = new IIcon[EnumHiveType.values().length][2]; for (EnumHiveType hive : EnumHiveType.values()) { - icons[hive.ordinal()][0] = - ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".0"); - icons[hive.ordinal()][1] = - ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".1"); + icons[hive.ordinal()][0] = ExtraBees.proxy + .getIcon(register, "hive/" + hive.toString().toLowerCase() + ".0"); + icons[hive.ordinal()][1] = ExtraBees.proxy + .getIcon(register, "hive/" + hive.toString().toLowerCase() + ".1"); } } diff --git a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java b/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java index ab9cb2c7..7c848823 100644 --- a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java +++ b/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java @@ -1,10 +1,12 @@ package binnie.extrabees.worldgen; -import forestry.api.apiculture.IHiveDrop; import java.util.ArrayList; import java.util.List; +import forestry.api.apiculture.IHiveDrop; + public enum EnumHiveType { + WATER, ROCK, NETHER, diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java index 01173d92..fd510127 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/worldgen/HiveDrop.java @@ -1,17 +1,20 @@ package binnie.extrabees.worldgen; +import java.util.ArrayList; +import java.util.Collections; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.Binnie; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeRoot; import forestry.api.apiculture.IHiveDrop; import forestry.api.genetics.IAllele; -import java.util.ArrayList; -import java.util.Collections; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class HiveDrop implements IHiveDrop { + private IAllele[] template; private ArrayList additional; private int chance; @@ -34,7 +37,8 @@ public class HiveDrop implements IHiveDrop { public ItemStack getPrincess(World world, int x, int y, int z, int fortune) { IBeeRoot beeRoot = Binnie.Genetics.getBeeRoot(); return beeRoot.getMemberStack( - beeRoot.getBee(world, beeRoot.templateAsGenome(template)), EnumBeeType.PRINCESS.ordinal()); + beeRoot.getBee(world, beeRoot.templateAsGenome(template)), + EnumBeeType.PRINCESS.ordinal()); } @Override diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java index 4bc0c88d..4c51702b 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java @@ -1,14 +1,17 @@ package binnie.extrabees.worldgen; -import binnie.core.util.I18N; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import binnie.core.util.I18N; + public class ItemBeehive extends ItemBlock { + public ItemBeehive(Block block) { super(block); setMaxDamage(0); diff --git a/src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java b/src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java index 9264b7c5..6456bd7e 100644 --- a/src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java @@ -4,6 +4,7 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; public class MaterialBeehive extends Material { + public MaterialBeehive() { super(MapColor.stoneColor); setRequiresTool(); diff --git a/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java b/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java index 4a189485..e339d475 100644 --- a/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java +++ b/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java @@ -1,5 +1,10 @@ package binnie.extrabees.worldgen; +import java.util.Random; + +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; + import binnie.core.IInitializable; import binnie.extrabees.ExtraBees; import binnie.extrabees.config.ConfigurationMain; @@ -8,11 +13,9 @@ import buildcraft.api.core.BuildCraftAPI; import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.registry.GameRegistry; import forestry.apiculture.genetics.BeeDefinition; -import java.util.Random; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; public class ModuleGeneration implements IWorldGenerator, IInitializable { + protected static int waterRate = 2; protected static int rockRate = 2; protected static int netherRate = 2; @@ -38,20 +41,14 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable { @Override public void postInit() { - EnumHiveType.WATER.drops.add( - new HiveDrop(ExtraBeeDefinition.WATER.getGenome().getPrimary(), 80)); - EnumHiveType.WATER.drops.add( - new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3)); + EnumHiveType.WATER.drops.add(new HiveDrop(ExtraBeeDefinition.WATER.getGenome().getPrimary(), 80)); + EnumHiveType.WATER.drops.add(new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3)); - EnumHiveType.ROCK.drops.add( - new HiveDrop(ExtraBeeDefinition.ROCK.getGenome().getPrimary(), 80)); - EnumHiveType.ROCK.drops.add( - new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3)); + EnumHiveType.ROCK.drops.add(new HiveDrop(ExtraBeeDefinition.ROCK.getGenome().getPrimary(), 80)); + EnumHiveType.ROCK.drops.add(new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3)); - EnumHiveType.NETHER.drops.add( - new HiveDrop(ExtraBeeDefinition.BASALT.getGenome().getPrimary(), 80)); - EnumHiveType.NETHER.drops.add( - new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3)); + EnumHiveType.NETHER.drops.add(new HiveDrop(ExtraBeeDefinition.BASALT.getGenome().getPrimary(), 80)); + EnumHiveType.NETHER.drops.add(new HiveDrop(BeeDefinition.VALIANT.getGenome().getPrimary(), 3)); ExtraBees.hive.setHarvestLevel("scoop", 0, 0); ExtraBees.hive.setHarvestLevel("scoop", 0, 1); @@ -60,12 +57,7 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable { } @Override - public void generate( - Random rand, - int chunkX, - int chunkZ, - World world, - IChunkProvider chunkGenerator, + public void generate(Random rand, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { chunkX <<= 4; chunkZ <<= 4; diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java index a0a33f43..e265ab2c 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java @@ -1,7 +1,7 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -9,7 +9,10 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.BiomeDictionary; +import binnie.extrabees.ExtraBees; + public class WorldGenHiveNether extends WorldGenerator { + @Override public boolean generate(World world, Random random, int i, int j, int k) { BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k); @@ -24,11 +27,9 @@ public class WorldGenHiveNether extends WorldGenerator { } public boolean embedInWall(World world, Block blockID, int i, int j, int k) { - return world.getBlock(i, j, k) == blockID - && world.getBlock(i, j + 1, k) == blockID + return world.getBlock(i, j, k) == blockID && world.getBlock(i, j + 1, k) == blockID && world.getBlock(i, j - 1, k) == blockID - && (world.isAirBlock(i + 1, j, k) - || world.isAirBlock(i - 1, j, k) + && (world.isAirBlock(i + 1, j, k) || world.isAirBlock(i - 1, j, k) || world.isAirBlock(i, j, k + 1) || world.isAirBlock(i, j, k - 1)); } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java index 69c5d779..a1604eae 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java @@ -1,14 +1,17 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; +import binnie.extrabees.ExtraBees; + public class WorldGenHiveRock extends WorldGenerator { + @Override public boolean generate(World world, Random random, int i, int j, int k) { BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k); diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java index a142eeaf..cddb4446 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java @@ -1,14 +1,17 @@ package binnie.extrabees.worldgen; -import binnie.extrabees.ExtraBees; import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; +import binnie.extrabees.ExtraBees; + public class WorldGenHiveWater extends WorldGenerator { + @Override public boolean generate(World world, Random random, int i, int j, int k) { BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(i, k); diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 0e6c038e..7a49db04 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,8 @@ package binnie.extratrees; +import net.minecraft.block.Block; +import net.minecraft.item.Item; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -25,8 +28,6 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.block.Block; -import net.minecraft.item.Item; @Mod( modid = "ExtraTrees", @@ -35,6 +36,7 @@ import net.minecraft.item.Item; useMetadata = true, dependencies = "after:BinnieCore") public class ExtraTrees extends AbstractMod { + @Mod.Instance("ExtraTrees") public static ExtraTrees instance; @@ -100,7 +102,7 @@ public class ExtraTrees extends AbstractMod { @Override public Class[] getConfigs() { - return new Class[] {ConfigurationMain.class}; + return new Class[] { ConfigurationMain.class }; } @Override @@ -129,6 +131,7 @@ public class ExtraTrees extends AbstractMod { } public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { super(ExtraBees.instance); } diff --git a/src/main/java/binnie/extratrees/FakeWorld.java b/src/main/java/binnie/extratrees/FakeWorld.java index 177261fd..b3e2af11 100644 --- a/src/main/java/binnie/extratrees/FakeWorld.java +++ b/src/main/java/binnie/extratrees/FakeWorld.java @@ -1,9 +1,7 @@ package binnie.extratrees; -import binnie.core.block.TileEntityMetadata; -import forestry.api.arboriculture.EnumWoodType; -import forestry.arboriculture.tiles.TileWood; import java.lang.reflect.Field; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; @@ -14,9 +12,14 @@ import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldSettings.GameType; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; + import sun.misc.Unsafe; +import binnie.core.block.TileEntityMetadata; +import forestry.api.arboriculture.EnumWoodType; +import forestry.arboriculture.tiles.TileWood; public class FakeWorld extends World { + private static Unsafe unsafe; static { @@ -114,6 +117,7 @@ public class FakeWorld extends World { } public static class SilentObjectCreator { + /** * Creating objects without calling constructors. */ diff --git a/src/main/java/binnie/extratrees/api/CarpentryManager.java b/src/main/java/binnie/extratrees/api/CarpentryManager.java index f6e17037..591fd294 100644 --- a/src/main/java/binnie/extratrees/api/CarpentryManager.java +++ b/src/main/java/binnie/extratrees/api/CarpentryManager.java @@ -1,5 +1,6 @@ package binnie.extratrees.api; public class CarpentryManager { + public static ICarpentryInterface carpentryInterface; } diff --git a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java index 698bfa31..31b6d42a 100644 --- a/src/main/java/binnie/extratrees/api/ICarpentryInterface.java +++ b/src/main/java/binnie/extratrees/api/ICarpentryInterface.java @@ -2,9 +2,11 @@ package binnie.extratrees.api; import java.util.Collection; import java.util.List; + import net.minecraft.item.ItemStack; public interface ICarpentryInterface { + boolean registerCarpentryWood(int index, IDesignMaterial wood); int getCarpentryWoodIndex(IDesignMaterial wood); diff --git a/src/main/java/binnie/extratrees/api/IDesign.java b/src/main/java/binnie/extratrees/api/IDesign.java index 6b03edae..ef505152 100644 --- a/src/main/java/binnie/extratrees/api/IDesign.java +++ b/src/main/java/binnie/extratrees/api/IDesign.java @@ -1,6 +1,7 @@ package binnie.extratrees.api; public interface IDesign { + String getName(); ILayout getTopPattern(); diff --git a/src/main/java/binnie/extratrees/api/IDesignCategory.java b/src/main/java/binnie/extratrees/api/IDesignCategory.java index ffde3804..c5b5c67a 100644 --- a/src/main/java/binnie/extratrees/api/IDesignCategory.java +++ b/src/main/java/binnie/extratrees/api/IDesignCategory.java @@ -3,6 +3,7 @@ package binnie.extratrees.api; import java.util.List; public interface IDesignCategory { + String getName(); List getDesigns(); diff --git a/src/main/java/binnie/extratrees/api/IDesignMaterial.java b/src/main/java/binnie/extratrees/api/IDesignMaterial.java index 575293f1..18254cfb 100644 --- a/src/main/java/binnie/extratrees/api/IDesignMaterial.java +++ b/src/main/java/binnie/extratrees/api/IDesignMaterial.java @@ -3,6 +3,7 @@ package binnie.extratrees.api; import net.minecraft.item.ItemStack; public interface IDesignMaterial { + ItemStack getStack(); String getName(); diff --git a/src/main/java/binnie/extratrees/api/IDesignSystem.java b/src/main/java/binnie/extratrees/api/IDesignSystem.java index fb8b5d5c..2de416c4 100644 --- a/src/main/java/binnie/extratrees/api/IDesignSystem.java +++ b/src/main/java/binnie/extratrees/api/IDesignSystem.java @@ -5,6 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; public interface IDesignSystem { + IIcon getPrimaryIcon(IPattern pattern); IIcon getSecondaryIcon(IPattern pattern); diff --git a/src/main/java/binnie/extratrees/api/ILayout.java b/src/main/java/binnie/extratrees/api/ILayout.java index 54cf2e05..ceb4906d 100644 --- a/src/main/java/binnie/extratrees/api/ILayout.java +++ b/src/main/java/binnie/extratrees/api/ILayout.java @@ -3,6 +3,7 @@ package binnie.extratrees.api; import net.minecraft.util.IIcon; public interface ILayout { + IPattern getPattern(); boolean isInverted(); diff --git a/src/main/java/binnie/extratrees/api/IPattern.java b/src/main/java/binnie/extratrees/api/IPattern.java index f9496632..7feb7840 100644 --- a/src/main/java/binnie/extratrees/api/IPattern.java +++ b/src/main/java/binnie/extratrees/api/IPattern.java @@ -4,6 +4,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; public interface IPattern { + IIcon getPrimaryIcon(IDesignSystem system); IIcon getSecondaryIcon(IDesignSystem system); diff --git a/src/main/java/binnie/extratrees/api/IToolHammer.java b/src/main/java/binnie/extratrees/api/IToolHammer.java index f759fce9..cce432e2 100644 --- a/src/main/java/binnie/extratrees/api/IToolHammer.java +++ b/src/main/java/binnie/extratrees/api/IToolHammer.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public interface IToolHammer { + boolean isActive(ItemStack stack); void onHammerUsed(ItemStack stack, EntityPlayer player); diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 7163c8a1..bca3d30f 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -1,15 +1,8 @@ package binnie.extratrees.block; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; @@ -26,7 +19,17 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockETDoor extends BlockDoor implements IBlockMetadata { + protected BlockETDoor() { super(Material.wood); setHardness(3.0f); @@ -66,13 +69,11 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata { boolean flag2; boolean flag3 = (i1 & 0x8) != 0; if (flag) { - flag2 = (j1 == 0 && meta == 2) - || (j1 == 1 && meta == 5) + flag2 = (j1 == 0 && meta == 2) || (j1 == 1 && meta == 5) || (j1 == 2 && meta == 3) || (j1 == 3 && meta == 4); } else { - flag2 = (j1 == 0 && meta == 5) - || (j1 == 1 && meta == 3) + flag2 = (j1 == 0 && meta == 5) || (j1 == 1 && meta == 3) || (j1 == 2 && meta == 4) || (j1 == 3 && meta == 2); diff --git a/src/main/java/binnie/extratrees/block/BlockETLog.java b/src/main/java/binnie/extratrees/block/BlockETLog.java index 57458083..7bd1c64e 100644 --- a/src/main/java/binnie/extratrees/block/BlockETLog.java +++ b/src/main/java/binnie/extratrees/block/BlockETLog.java @@ -1,14 +1,8 @@ package binnie.extratrees.block; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockLog; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,7 +17,16 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockETLog extends BlockLog implements IBlockMetadata { + public BlockETLog() { setCreativeTab(Tabs.tabArboriculture); setBlockName("log"); diff --git a/src/main/java/binnie/extratrees/block/BlockETPlanks.java b/src/main/java/binnie/extratrees/block/BlockETPlanks.java index 0c7189af..a57b37b7 100644 --- a/src/main/java/binnie/extratrees/block/BlockETPlanks.java +++ b/src/main/java/binnie/extratrees/block/BlockETPlanks.java @@ -1,14 +1,8 @@ package binnie.extratrees.block; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockWood; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,7 +17,16 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockETPlanks extends BlockWood implements IBlockMetadata { + public BlockETPlanks() { setBlockName("planks"); setCreativeTab(Tabs.tabArboriculture); diff --git a/src/main/java/binnie/extratrees/block/BlockETSlab.java b/src/main/java/binnie/extratrees/block/BlockETSlab.java index f2e9322d..8a827e09 100644 --- a/src/main/java/binnie/extratrees/block/BlockETSlab.java +++ b/src/main/java/binnie/extratrees/block/BlockETSlab.java @@ -1,15 +1,8 @@ package binnie.extratrees.block; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockWoodSlab; import net.minecraft.creativetab.CreativeTabs; @@ -23,7 +16,17 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockETSlab extends BlockWoodSlab implements IBlockMetadata { + public BlockETSlab(boolean isDouble) { super(isDouble); setCreativeTab(Tabs.tabArboriculture); diff --git a/src/main/java/binnie/extratrees/block/BlockETStairs.java b/src/main/java/binnie/extratrees/block/BlockETStairs.java index 945ae5c2..c1b18415 100644 --- a/src/main/java/binnie/extratrees/block/BlockETStairs.java +++ b/src/main/java/binnie/extratrees/block/BlockETStairs.java @@ -1,15 +1,8 @@ package binnie.extratrees.block; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.creativetab.CreativeTabs; @@ -22,7 +15,17 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockETStairs extends BlockStairs implements IBlockMetadata { + public BlockETStairs(Block par2Block) { super(par2Block, 0); setCreativeTab(Tabs.tabArboriculture); @@ -105,9 +108,7 @@ public class BlockETStairs extends BlockStairs implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise( - "extratrees.block.woodstairs.name", - WoodManager.getPlankType(meta + 32).getName()); + return I18N.localise("extratrees.block.woodstairs.name", WoodManager.getPlankType(meta + 32).getName()); } @Override diff --git a/src/main/java/binnie/extratrees/block/BlockShrubLeaves.java b/src/main/java/binnie/extratrees/block/BlockShrubLeaves.java index 4a9bf10c..38346790 100644 --- a/src/main/java/binnie/extratrees/block/BlockShrubLeaves.java +++ b/src/main/java/binnie/extratrees/block/BlockShrubLeaves.java @@ -1,9 +1,11 @@ package binnie.extratrees.block; -import forestry.arboriculture.blocks.BlockForestryLeaves; import net.minecraft.world.World; +import forestry.arboriculture.blocks.BlockForestryLeaves; + public class BlockShrubLeaves extends BlockForestryLeaves { + public BlockShrubLeaves() { super(); } diff --git a/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java b/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java index 9bb94a8b..229aed1d 100644 --- a/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java +++ b/src/main/java/binnie/extratrees/block/BranchBlockRenderer.java @@ -1,20 +1,22 @@ package binnie.extratrees.block; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class BranchBlockRenderer implements ISimpleBlockRenderingHandler { + @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { // ignored } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { renderer.renderStandardBlock(block, x, y, z); return true; } diff --git a/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java b/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java index 92fc4921..7a4908b4 100644 --- a/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java +++ b/src/main/java/binnie/extratrees/block/DoorBlockRenderer.java @@ -1,22 +1,24 @@ package binnie.extratrees.block; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class DoorBlockRenderer implements ISimpleBlockRenderingHandler { + @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { // ignored } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { int c = block.colorMultiplier(renderer.blockAccess, x, y, z); float c2 = (c >> 16 & 0xFF) / 255.0f; float c3 = (c >> 8 & 0xFF) / 255.0f; diff --git a/src/main/java/binnie/extratrees/block/DoorType.java b/src/main/java/binnie/extratrees/block/DoorType.java index afc79954..371450d5 100644 --- a/src/main/java/binnie/extratrees/block/DoorType.java +++ b/src/main/java/binnie/extratrees/block/DoorType.java @@ -1,9 +1,11 @@ package binnie.extratrees.block; -import binnie.core.util.I18N; import net.minecraft.util.IIcon; +import binnie.core.util.I18N; + public enum DoorType { + STANDARD("standard"), SOLID("solid"), DOUBLE("double"), diff --git a/src/main/java/binnie/extratrees/block/FruitPod.java b/src/main/java/binnie/extratrees/block/FruitPod.java index 5c7b23eb..18a31234 100644 --- a/src/main/java/binnie/extratrees/block/FruitPod.java +++ b/src/main/java/binnie/extratrees/block/FruitPod.java @@ -1,14 +1,16 @@ package binnie.extratrees.block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IIconProvider; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public enum FruitPod implements IIconProvider { + Cocoa, Banana, Coconut, @@ -20,11 +22,8 @@ public enum FruitPod implements IIconProvider { protected IIcon[] icons; FruitPod() { - textures = new short[] { - BinnieCore.proxy.getUniqueTextureUID(), - BinnieCore.proxy.getUniqueTextureUID(), - BinnieCore.proxy.getUniqueTextureUID(), - }; + textures = new short[] { BinnieCore.proxy.getUniqueTextureUID(), BinnieCore.proxy.getUniqueTextureUID(), + BinnieCore.proxy.getUniqueTextureUID(), }; icons = new IIcon[3]; } diff --git a/src/main/java/binnie/extratrees/block/GateItemRenderer.java b/src/main/java/binnie/extratrees/block/GateItemRenderer.java index d92cde2b..b6964286 100644 --- a/src/main/java/binnie/extratrees/block/GateItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/GateItemRenderer.java @@ -6,9 +6,11 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; public class GateItemRenderer implements IItemRenderer { + private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) { Tessellator tessellator = Tessellator.instance; Block block = ((ItemBlock) item.getItem()).field_150939_a; @@ -28,32 +30,56 @@ public class GateItemRenderer implements IItemRenderer { tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, -1.0f, 0.0f); renderBlocks.renderFaceYNeg( - block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 0, item.getItemDamage())); + block, + 0.0, + 0.0, + 0.0, + renderBlocks.getBlockIconFromSideAndMetadata(block, 0, item.getItemDamage())); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, 1.0f, 0.0f); renderBlocks.renderFaceYPos( - block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 1, item.getItemDamage())); + block, + 0.0, + 0.0, + 0.0, + renderBlocks.getBlockIconFromSideAndMetadata(block, 1, item.getItemDamage())); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, 0.0f, -1.0f); renderBlocks.renderFaceZNeg( - block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); + block, + 0.0, + 0.0, + 0.0, + renderBlocks.getBlockIconFromSideAndMetadata(block, 2, item.getItemDamage())); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0f, 0.0f, 1.0f); renderBlocks.renderFaceZPos( - block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 3, item.getItemDamage())); + block, + 0.0, + 0.0, + 0.0, + renderBlocks.getBlockIconFromSideAndMetadata(block, 3, item.getItemDamage())); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0f, 0.0f, 0.0f); renderBlocks.renderFaceXNeg( - block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 4, item.getItemDamage())); + block, + 0.0, + 0.0, + 0.0, + renderBlocks.getBlockIconFromSideAndMetadata(block, 4, item.getItemDamage())); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0f, 0.0f, 0.0f); renderBlocks.renderFaceXPos( - block, 0.0, 0.0, 0.0, renderBlocks.getBlockIconFromSideAndMetadata(block, 5, item.getItemDamage())); + block, + 0.0, + 0.0, + 0.0, + renderBlocks.getBlockIconFromSideAndMetadata(block, 5, item.getItemDamage())); tessellator.draw(); GL11.glTranslatef(0.5f, 0.5f, 0.5f); } @@ -71,8 +97,8 @@ public class GateItemRenderer implements IItemRenderer { } @Override - public boolean shouldUseRenderHelper( - IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, + IItemRenderer.ItemRendererHelper helper) { return true; } diff --git a/src/main/java/binnie/extratrees/block/IFenceProvider.java b/src/main/java/binnie/extratrees/block/IFenceProvider.java index 2901077a..b5b1bb6c 100644 --- a/src/main/java/binnie/extratrees/block/IFenceProvider.java +++ b/src/main/java/binnie/extratrees/block/IFenceProvider.java @@ -3,5 +3,6 @@ package binnie.extratrees.block; import net.minecraft.item.ItemStack; public interface IFenceProvider { + ItemStack getFence(); } diff --git a/src/main/java/binnie/extratrees/block/ILogType.java b/src/main/java/binnie/extratrees/block/ILogType.java index 00b199ad..fd7fb63d 100644 --- a/src/main/java/binnie/extratrees/block/ILogType.java +++ b/src/main/java/binnie/extratrees/block/ILogType.java @@ -1,5 +1,12 @@ package binnie.extratrees.block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; @@ -8,14 +15,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.worldgen.BlockTypeLog; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public interface ILogType { + void placeBlock(World p0, int p1, int p2, int p3); ItemStack getItemStack(); @@ -23,6 +25,7 @@ public interface ILogType { int getColour(); enum ExtraTreeLog implements ILogType { + Apple("apple", 0x7b7a7b, PlankType.ExtraTreePlanks.Apple), Fig("fig", 0x807357, PlankType.ExtraTreePlanks.Fig), Butternut("butternut", 0xb7ada0, PlankType.ExtraTreePlanks.Butternut), @@ -84,10 +87,8 @@ public interface ILogType { public static void registerIcons(IIconRegister register) { for (ExtraTreeLog log : values()) { - log.trunk = ExtraTrees.proxy.getIcon( - register, "logs/" + log.toString().toLowerCase() + "Trunk"); - log.bark = ExtraTrees.proxy.getIcon( - register, "logs/" + log.toString().toLowerCase() + "Bark"); + log.trunk = ExtraTrees.proxy.getIcon(register, "logs/" + log.toString().toLowerCase() + "Trunk"); + log.bark = ExtraTrees.proxy.getIcon(register, "logs/" + log.toString().toLowerCase() + "Bark"); } } @@ -124,8 +125,7 @@ public interface ILogType { @Override public ItemStack getItemStack() { - return TileEntityMetadata.getItemStack(ExtraTrees.blockLog, ordinal()) - .copy(); + return TileEntityMetadata.getItemStack(ExtraTrees.blockLog, ordinal()).copy(); } @Override @@ -135,6 +135,7 @@ public interface ILogType { } enum ForestryLog implements ILogType { + LARCH(1, 0, 6376529), TEAK(1, 1, 3486249), ACACIA(1, 2, 7565906), @@ -190,6 +191,7 @@ public interface ILogType { } enum VanillaLog implements ILogType { + Oak(6376752), Spruce(2759179), Birch(6376752), diff --git a/src/main/java/binnie/extratrees/block/IPlankType.java b/src/main/java/binnie/extratrees/block/IPlankType.java index a3f11d77..97d78798 100644 --- a/src/main/java/binnie/extratrees/block/IPlankType.java +++ b/src/main/java/binnie/extratrees/block/IPlankType.java @@ -1,9 +1,11 @@ package binnie.extratrees.block; -import binnie.extratrees.api.IDesignMaterial; import net.minecraft.util.IIcon; +import binnie.extratrees.api.IDesignMaterial; + public interface IPlankType extends IDesignMaterial { + IIcon getIcon(); String getDescription(); diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java index de68b900..16ebcaac 100644 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ b/src/main/java/binnie/extratrees/block/ItemETDoor.java @@ -1,10 +1,5 @@ package binnie.extratrees.block; -import binnie.core.block.ItemMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -14,15 +9,22 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import binnie.core.block.ItemMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemETDoor extends ItemMetadata { + public ItemETDoor(Block block) { super(block); maxStackSize = 8; setCreativeTab(CreativeTabs.tabRedstone); } - public static void placeDoorBlock( - World world, int x, int y, int z, int meta, Block block, ItemStack item, EntityPlayer player) { + public static void placeDoorBlock(World world, int x, int y, int z, int meta, Block block, ItemStack item, + EntityPlayer player) { byte b0 = 0; byte b2 = 0; if (meta == 0) { @@ -73,17 +75,8 @@ public class ItemETDoor extends ItemMetadata { } @Override - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int meta, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int meta, + float hitX, float hitY, float hitZ) { if (meta != 1) { return false; } @@ -119,7 +112,6 @@ public class ItemETDoor extends ItemMetadata { @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int meta) { - return WoodManager.getPlankType((stack == null) ? 0 : (stack.getItemDamage() & 0xFF)) - .getColor(); + return WoodManager.getPlankType((stack == null) ? 0 : (stack.getItemDamage() & 0xFF)).getColor(); } } diff --git a/src/main/java/binnie/extratrees/block/ItemETSlab.java b/src/main/java/binnie/extratrees/block/ItemETSlab.java index 10bc260c..eedec2d2 100644 --- a/src/main/java/binnie/extratrees/block/ItemETSlab.java +++ b/src/main/java/binnie/extratrees/block/ItemETSlab.java @@ -1,16 +1,18 @@ package binnie.extratrees.block; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.core.block.ItemMetadata; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ItemETSlab extends ItemMetadata { + private boolean isFullBlock; private BlockETSlab theHalfSlab; private BlockETSlab doubleSlab; @@ -26,17 +28,8 @@ public class ItemETSlab extends ItemMetadata { @Override @SideOnly(Side.CLIENT) - public boolean onItemUse( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int meta, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int meta, + float hitX, float hitY, float hitZ) { if (isFullBlock) { return super.onItemUse(stack, player, world, x, y, z, meta, hitX, hitY, hitZ); } diff --git a/src/main/java/binnie/extratrees/block/ItemETStairs.java b/src/main/java/binnie/extratrees/block/ItemETStairs.java index a2b550ef..3cd51302 100644 --- a/src/main/java/binnie/extratrees/block/ItemETStairs.java +++ b/src/main/java/binnie/extratrees/block/ItemETStairs.java @@ -1,9 +1,5 @@ package binnie.extratrees.block; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -12,7 +8,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemETStairs extends ItemBlock { + public ItemETStairs(Block block) { super(block); setCreativeTab(CreativeTabs.tabBlock); @@ -26,18 +28,8 @@ public class ItemETStairs extends ItemBlock { } @Override - public boolean placeBlockAt( - ItemStack stack, - EntityPlayer player, - World world, - int x, - int y, - int z, - int side, - float hitX, - float hitY, - float hitZ, - int metadata) { + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, + float hitX, float hitY, float hitZ, int metadata) { boolean done = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); TileEntityMetadata tile = (TileEntityMetadata) world.getTileEntity(x, y, z); if (tile != null) { diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 0028e379..7cd35f30 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -1,5 +1,14 @@ package binnie.extratrees.block; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -22,16 +31,9 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleBlocks implements IInitializable { + public static int hedgeRenderID; @Override @@ -52,7 +54,8 @@ public class ModuleBlocks implements IInitializable { GameRegistry.registerBlock(ExtraTrees.blockFence, ItemMetadata.class, "fence"); GameRegistry.registerBlock(ExtraTrees.blockMultiFence, ItemMetadata.class, "multifence"); BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(ExtraTrees.blockMultiFence), new ItemMetadataRenderer()); + Item.getItemFromBlock(ExtraTrees.blockMultiFence), + new ItemMetadataRenderer()); GameRegistry.registerBlock(ExtraTrees.blockLog, ItemMetadata.class, "log"); GameRegistry.registerBlock(ExtraTrees.blockGate, ItemMetadata.class, "gate"); GameRegistry.registerBlock(ExtraTrees.blockSlab, ItemETSlab.class, "slab"); @@ -60,10 +63,10 @@ public class ModuleBlocks implements IInitializable { GameRegistry.registerBlock(ExtraTrees.blockDoor, ItemETDoor.class, "door"); GameRegistry.registerBlock(ExtraTrees.blockStairs, ItemETStairs.class, "stairs"); - BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(ExtraTrees.blockStairs), new StairItemRenderer()); - BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(ExtraTrees.blockGate), new GateItemRenderer()); + BinnieCore.proxy + .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockStairs), new StairItemRenderer()); + BinnieCore.proxy + .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockGate), new GateItemRenderer()); for (ILogType plank : ILogType.ExtraTreeLog.values()) { OreDictionary.registerOre("logWood", plank.getItemStack()); } @@ -92,8 +95,8 @@ public class ModuleBlocks implements IInitializable { RenderingRegistry.registerBlockHandler(new BranchBlockRenderer()); RenderingRegistry.registerBlockHandler(new HedgeRenderer()); RecipeSorter.register("extratrees:multifence", MultiFenceRecipeSize.class, RecipeSorter.Category.SHAPED, ""); - RecipeSorter.register( - "extratrees:multifence2", MultiFenceRecipeEmbedded.class, RecipeSorter.Category.SHAPED, ""); + RecipeSorter + .register("extratrees:multifence2", MultiFenceRecipeEmbedded.class, RecipeSorter.Category.SHAPED, ""); RecipeSorter.register("extratrees:multifence3", MultiFenceRecipeSolid.class, RecipeSorter.Category.SHAPED, ""); } @@ -106,8 +109,7 @@ public class ModuleBlocks implements IInitializable { stairs.stackSize = 4; GameRegistry.addRecipe(stairs.copy(), "# ", "## ", "###", '#', planks.copy()); slabs.stackSize = 6; - CraftingManager.getInstance() - .getRecipeList() + CraftingManager.getInstance().getRecipeList() .add(0, new ShapedOreRecipe(slabs.copy(), "###", '#', planks.copy())); } @@ -142,8 +144,11 @@ public class ModuleBlocks implements IInitializable { public void addSqueezer(ILogType log, ILiquidType liquid, int amount, float pulpChance) { FluidStack liquidStack = liquid.get(amount); RecipeManagers.squeezerManager.addRecipe( - 10, new ItemStack[] {log.getItemStack()}, liquidStack, Mods.forestry.stack("woodPulp"), (int) - (100.0f * pulpChance)); + 10, + new ItemStack[] { log.getItemStack() }, + liquidStack, + Mods.forestry.stack("woodPulp"), + (int) (100.0f * pulpChance)); } public void addSqueezer(ILogType log, ILiquidType liquid, int amount) { diff --git a/src/main/java/binnie/extratrees/block/PlankType.java b/src/main/java/binnie/extratrees/block/PlankType.java index 9951f9ab..f828d1b1 100644 --- a/src/main/java/binnie/extratrees/block/PlankType.java +++ b/src/main/java/binnie/extratrees/block/PlankType.java @@ -1,11 +1,5 @@ package binnie.extratrees.block; -import binnie.core.Mods; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.api.CarpentryManager; -import com.google.common.base.Optional; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; @@ -14,7 +8,16 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.Mods; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.CarpentryManager; + +import com.google.common.base.Optional; + public class PlankType { + public static void setup() { for (VanillaPlanks plank : VanillaPlanks.values()) { CarpentryManager.carpentryInterface.registerCarpentryWood(plank.ordinal(), plank); @@ -31,6 +34,7 @@ public class PlankType { } public enum ExtraTreePlanks implements IPlankType, IFenceProvider { + Fir(0xc38c54), Cedar(0xd86634), Hemlock(0xc7b56c), @@ -110,6 +114,7 @@ public class PlankType { } public enum VanillaPlanks implements IPlankType, IFenceProvider { + OAK(0xb4905a), SPRUCE(0x805e36), BIRCH(0xd7c185), @@ -157,6 +162,7 @@ public class PlankType { } public enum ForestryPlanks implements IPlankType, IFenceProvider { + LARCH(0xd79f8d), TEAK(0x7d7963), ACACIA(0x94b387), @@ -195,14 +201,12 @@ public class PlankType { @Override public String getName() { - return I18N.localise( - "extratrees.block.planks.forestry." + toString().toLowerCase()); + return I18N.localise("extratrees.block.planks.forestry." + toString().toLowerCase()); } @Override public String getDescription() { - return I18N.localise( - "extratrees.block.planks.forestry." + toString().toLowerCase() + ".desc"); + return I18N.localise("extratrees.block.planks.forestry." + toString().toLowerCase() + ".desc"); } @Override @@ -235,6 +239,7 @@ public class PlankType { } public enum ExtraBiomesPlank implements IPlankType { + Redwood(0x9b6b42), Fir(0x7e774a), Acacia(0xbfaa7e); diff --git a/src/main/java/binnie/extratrees/block/StairItemRenderer.java b/src/main/java/binnie/extratrees/block/StairItemRenderer.java index 386a6c1a..bf270f8d 100644 --- a/src/main/java/binnie/extratrees/block/StairItemRenderer.java +++ b/src/main/java/binnie/extratrees/block/StairItemRenderer.java @@ -7,9 +7,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; public class StairItemRenderer implements IItemRenderer { + private void renderStairBlock(RenderBlocks renderBlocks, ItemStack item, float f, float g, float h) { Tessellator tessellator = Tessellator.instance; Block block = ((ItemBlock) item.getItem()).field_150939_a; @@ -64,8 +66,8 @@ public class StairItemRenderer implements IItemRenderer { } @Override - public boolean shouldUseRenderHelper( - IItemRenderer.ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType type, ItemStack item, + IItemRenderer.ItemRendererHelper helper) { return true; } diff --git a/src/main/java/binnie/extratrees/block/StairsRenderer.java b/src/main/java/binnie/extratrees/block/StairsRenderer.java index d2290b42..18b29046 100644 --- a/src/main/java/binnie/extratrees/block/StairsRenderer.java +++ b/src/main/java/binnie/extratrees/block/StairsRenderer.java @@ -1,14 +1,17 @@ package binnie.extratrees.block; -import binnie.extratrees.ExtraTrees; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import binnie.extratrees.ExtraTrees; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class StairsRenderer implements ISimpleBlockRenderingHandler { + @Override public void renderInventoryBlock(Block par1Block, int metadata, int modelID, RenderBlocks renderer) { Tessellator var4 = Tessellator.instance; @@ -50,8 +53,8 @@ public class StairsRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { BlockETStairs blockStairs = (BlockETStairs) block; blockStairs.func_150147_e(renderer.blockAccess, x, y, z); renderer.setRenderBoundsFromBlock(blockStairs); diff --git a/src/main/java/binnie/extratrees/block/WoodManager.java b/src/main/java/binnie/extratrees/block/WoodManager.java index 04ae971c..365d77d4 100644 --- a/src/main/java/binnie/extratrees/block/WoodManager.java +++ b/src/main/java/binnie/extratrees/block/WoodManager.java @@ -1,19 +1,22 @@ package binnie.extratrees.block; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.core.block.TileEntityMetadata; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.block.decor.FenceDescription; import binnie.extratrees.block.decor.FenceType; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class WoodManager { + public static IPlankType getPlankType(int index) { IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index); if (wood instanceof IPlankType) { @@ -83,8 +86,8 @@ public class WoodManager { int ord = type.ordinal(); int i = getPlankTypeIndex(plank) + 256 * ord; - ItemStack stack = - TileEntityMetadata.getItemStack(ExtraTrees.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); + ItemStack stack = TileEntityMetadata + .getItemStack(ExtraTrees.blockMultiFence, i + 65536 * getPlankTypeIndex(plank2)); stack.stackSize = amount; return stack; } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockFence.java b/src/main/java/binnie/extratrees/block/decor/BlockFence.java index 364ea42e..37653c61 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockFence.java @@ -1,18 +1,8 @@ package binnie.extratrees.block.decor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.IFenceProvider; -import binnie.extratrees.block.PlankType; -import binnie.extratrees.block.WoodManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -27,7 +17,20 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.IFenceProvider; +import binnie.extratrees.block.PlankType; +import binnie.extratrees.block.WoodManager; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockFence extends net.minecraft.block.BlockFence implements IBlockMetadata, IBlockFence { + public BlockFence() { super("", Material.wood); setCreativeTab(Tabs.tabArboriculture); @@ -119,9 +122,7 @@ public class BlockFence extends net.minecraft.block.BlockFence implements IBlock @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise( - "extratrees.block.woodfence.name", - getDescription(meta).getPlankType().getName()); + return I18N.localise("extratrees.block.woodfence.name", getDescription(meta).getPlankType().getName()); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockGate.java b/src/main/java/binnie/extratrees/block/decor/BlockGate.java index c641fe14..3a13a04a 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockGate.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockGate.java @@ -1,16 +1,8 @@ package binnie.extratrees.block.decor; -import binnie.core.block.BlockMetadata; -import binnie.core.block.IBlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockFenceGate; import net.minecraft.creativetab.CreativeTabs; @@ -24,7 +16,18 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.IBlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class BlockGate extends BlockFenceGate implements IBlockMetadata { + public BlockGate() { setCreativeTab(Tabs.tabArboriculture); setResistance(5.0f); @@ -102,8 +105,7 @@ public class BlockGate extends BlockFenceGate implements IBlockMetadata { @Override public String getBlockName(ItemStack itemStack) { int meta = TileEntityMetadata.getItemDamage(itemStack); - return I18N.localise( - "extratrees.block.woodgate.name", WoodManager.getPlankType(meta).getName()); + return I18N.localise("extratrees.block.woodgate.name", WoodManager.getPlankType(meta).getName()); } @Override diff --git a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java index c6b8680b..af605865 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockHedge.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockHedge.java @@ -1,12 +1,7 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.ModuleBlocks; -import binnie.extratrees.genetics.LeafType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.ForestryAPI; -import forestry.api.core.Tabs; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -20,7 +15,15 @@ import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import binnie.extratrees.block.ModuleBlocks; +import binnie.extratrees.genetics.LeafType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.ForestryAPI; +import forestry.api.core.Tabs; + public class BlockHedge extends Block implements IBlockFence { + public BlockHedge() { super(Material.leaves); setCreativeTab(Tabs.tabArboriculture); @@ -38,8 +41,8 @@ public class BlockHedge extends Block implements IBlockFence { } @Override - public void addCollisionBoxesToList( - World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, + Entity entity) { boolean connectNegZ = canConnectFenceTo(world, x, y, z - 1); boolean connectPosZ = canConnectFenceTo(world, x, y, z + 1); boolean connectNegX = canConnectFenceTo(world, x - 1, y, z); @@ -128,11 +131,9 @@ public class BlockHedge extends Block implements IBlockFence { @Override public boolean canConnectFenceTo(IBlockAccess world, int x, int y, int z) { Block block = world.getBlock(x, y, z); - return block == this - || IBlockFence.isFence(block) + return block == this || IBlockFence.isFence(block) || block.isLeaves(world, x, y, z) - || (block.getMaterial().isOpaque() - && block.renderAsNormalBlock() + || (block.getMaterial().isOpaque() && block.renderAsNormalBlock() && block.getMaterial() != Material.gourd); } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index e05c5f68..7ffe9076 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -1,18 +1,21 @@ package binnie.extratrees.block.decor; +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.core.block.IBlockMetadata; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.PlankType; import binnie.extratrees.block.WoodManager; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public class BlockMultiFence extends BlockFence implements IBlockMetadata { + public BlockMultiFence() { setBlockName("multifence"); } @@ -26,8 +29,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata { @Override public IIcon getIcon(int side, int meta) { - return (FenceRenderer.layer == 0) - ? getDescription(meta).getPlankType().getIcon() + return (FenceRenderer.layer == 0) ? getDescription(meta).getPlankType().getIcon() : getDescription(meta).getSecondaryPlankType().getIcon(); } diff --git a/src/main/java/binnie/extratrees/block/decor/FenceDescription.java b/src/main/java/binnie/extratrees/block/decor/FenceDescription.java index 32da169d..6cb0871a 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceDescription.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceDescription.java @@ -4,6 +4,7 @@ import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; public class FenceDescription { + protected FenceType fenceType; protected IPlankType plankType; protected IPlankType secondaryPlankType; diff --git a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java index 0c18c9f8..988d12d0 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceRenderer.java @@ -1,17 +1,20 @@ package binnie.extratrees.block.decor; -import binnie.core.block.TileEntityMetadata; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.WoodManager; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import binnie.core.block.TileEntityMetadata; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.WoodManager; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class FenceRenderer implements ISimpleBlockRenderingHandler { + public static int layer; @Override @@ -28,8 +31,8 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler { } float s = 0.0625f; - FenceType fenceType = - (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) : new FenceType(0); + FenceType fenceType = (block == ExtraTrees.blockMultiFence) ? WoodManager.getFenceType(metadata) + : new FenceType(0); boolean bottomBar = !fenceType.solid; float topBarMaxY = 1.0f - s; float topBarMinY = 1.0f - s * 3.0f; @@ -135,8 +138,8 @@ public class FenceRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { FenceRenderer.layer = 0; BlockFence blockFence = (BlockFence) block; float i = 0.0625f; diff --git a/src/main/java/binnie/extratrees/block/decor/FenceType.java b/src/main/java/binnie/extratrees/block/decor/FenceType.java index 91100c68..210278c9 100644 --- a/src/main/java/binnie/extratrees/block/decor/FenceType.java +++ b/src/main/java/binnie/extratrees/block/decor/FenceType.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.List; public class FenceType { + public int size; public boolean solid; public boolean embossed; @@ -24,8 +25,8 @@ public class FenceType { public static Collection values() { List list = new ArrayList<>(); for (int size = 0; size < 3; ++size) { - for (boolean solid : new boolean[] {false, true}) { - for (boolean embedded : new boolean[] {false, true}) { + for (boolean solid : new boolean[] { false, true }) { + for (boolean embedded : new boolean[] { false, true }) { list.add(new FenceType(size, solid, embedded)); } } @@ -34,8 +35,7 @@ public class FenceType { } public String getPrefix() { - return ((size == 0) ? "" : ((size == 1) ? "Full " : "Low ")) - + (solid ? "Solid " : "") + return ((size == 0) ? "" : ((size == 1) ? "Full " : "Low ")) + (solid ? "Solid " : "") + (embossed ? "Embedded " : ""); } diff --git a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java b/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java index f546bc8c..fe859644 100644 --- a/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java +++ b/src/main/java/binnie/extratrees/block/decor/HedgeRenderer.java @@ -1,16 +1,19 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.block.ModuleBlocks; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.block.ModuleBlocks; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; + public class HedgeRenderer implements ISimpleBlockRenderingHandler { + @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { int color = BlockHedge.getColor(metadata); @@ -49,8 +52,8 @@ public class HedgeRenderer implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, + RenderBlocks renderer) { IIcon icon = block.getIcon(0, world.getBlockMetadata(x, y, z)); BlockHedge hedge = ExtraTrees.blockHedge; boolean connectNegX = hedge.canConnectFenceTo(world, x - 1, y, z); diff --git a/src/main/java/binnie/extratrees/block/decor/IBlockFence.java b/src/main/java/binnie/extratrees/block/decor/IBlockFence.java index b902026e..464b126e 100644 --- a/src/main/java/binnie/extratrees/block/decor/IBlockFence.java +++ b/src/main/java/binnie/extratrees/block/decor/IBlockFence.java @@ -1,6 +1,5 @@ package binnie.extratrees.block.decor; -import binnie.core.Mods; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; @@ -8,6 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.world.IBlockAccess; +import binnie.core.Mods; + public interface IBlockFence { /** diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java index 42da230a..146ba89a 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeEmbedded.java @@ -1,14 +1,16 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; + public class MultiFenceRecipeEmbedded implements IRecipe { + protected ItemStack cached; @Override diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java index 413cf9b5..2c1cc3f6 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSize.java @@ -1,16 +1,19 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; import java.util.ArrayList; import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; + public class MultiFenceRecipeSize implements IRecipe { + protected ItemStack cached; @Override diff --git a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java index 481536fd..8ead5ce9 100644 --- a/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java +++ b/src/main/java/binnie/extratrees/block/decor/MultiFenceRecipeSolid.java @@ -1,13 +1,15 @@ package binnie.extratrees.block.decor; -import binnie.extratrees.block.WoodManager; import net.minecraft.init.Blocks; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import binnie.extratrees.block.WoodManager; + public class MultiFenceRecipeSolid implements IRecipe { + ItemStack cached; @Override diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java index 16a54d52..b2f055b6 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipe.java @@ -1,6 +1,7 @@ package binnie.extratrees.block.decor; import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -10,6 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class NBTShapedRecipe implements IRecipe { + public int recipeWidth; public int recipeHeight; public ItemStack[] recipeItems; @@ -116,8 +118,7 @@ public class NBTShapedRecipe implements IRecipe { if (itemstack.getItemDamage() != 32767 && itemstack.getItemDamage() != itemstack2.getItemDamage()) { return false; } - if (itemstack.hasTagCompound() - && itemstack2.hasTagCompound() + if (itemstack.hasTagCompound() && itemstack2.hasTagCompound() && !ItemStack.areItemStackTagsEqual(itemstack, itemstack2)) { return false; } diff --git a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java index 64bcc6ff..aafa883a 100644 --- a/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java +++ b/src/main/java/binnie/extratrees/block/decor/NBTShapedRecipes.java @@ -2,12 +2,14 @@ package binnie.extratrees.block.decor; import java.util.ArrayList; import java.util.List; + import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; public class NBTShapedRecipes implements IRecipe { + static List recipes = new ArrayList<>(); public static void addRecipe(NBTShapedRecipe nbtShapedRecipe) { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java index 3d53ef6f..1e86cff8 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentry.java @@ -1,14 +1,16 @@ package binnie.extratrees.carpentry; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; + import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.block.PlankType; import forestry.api.core.Tabs; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; public class BlockCarpentry extends BlockDesign { + public BlockCarpentry() { super(DesignSystem.Wood, Material.wood); setCreativeTab(Tabs.tabArboriculture); @@ -20,13 +22,12 @@ public class BlockCarpentry extends BlockDesign { @Override public ItemStack getCreativeStack(IDesign design) { - return ModuleCarpentry.getItemStack( - this, PlankType.ExtraTreePlanks.Apple, PlankType.VanillaPlanks.BIRCH, design); + return ModuleCarpentry + .getItemStack(this, PlankType.ExtraTreePlanks.Apple, PlankType.VanillaPlanks.BIRCH, design); } @Override public String getBlockName(DesignBlock design) { - return I18N.localise( - "extratrees.block.woodentile.name", design.getDesign().getName()); + return I18N.localise("extratrees.block.woodentile.name", design.getDesign().getName()); } } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index 02607d21..5d8c86e3 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -1,11 +1,7 @@ package binnie.extratrees.carpentry; -import binnie.core.block.BlockMetadata; -import binnie.core.block.TileEntityMetadata; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,7 +11,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import binnie.core.block.BlockMetadata; +import binnie.core.block.TileEntityMetadata; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockCarpentryPanel extends BlockCarpentry { + public BlockCarpentryPanel() { useNeighborBrightness = true; setBlockBounds(0.0f, 0.0f, 0.0f, 1.0f, 0.0625f, 1.0f); @@ -83,15 +86,14 @@ public class BlockCarpentryPanel extends BlockCarpentry { @Override public String getBlockName(ItemStack stack) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); - return I18N.localise( - "extratrees.block.woodenpanel.name", block.getDesign().getName()); + return I18N.localise("extratrees.block.woodenpanel.name", block.getDesign().getName()); } @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { setBlockBoundsBasedOnState(par1World, par2, par3, par4); - return AxisAlignedBB.getBoundingBox( - par2 + minX, par3 + minY, par4 + minZ, par2 + maxX, par3 + maxY, par4 + maxZ); + return AxisAlignedBB + .getBoundingBox(par2 + minX, par3 + minY, par4 + minZ, par2 + maxX, par3 + maxY, par4 + maxZ); } @Override @@ -117,8 +119,8 @@ public class BlockCarpentryPanel extends BlockCarpentry { @Override public int getPlacedMeta(ItemStack itemStack, World world, int x, int y, int z, ForgeDirection clickedBlock) { - DesignBlock block = - ModuleCarpentry.getCarpentryPanel(getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); + DesignBlock block = ModuleCarpentry + .getCarpentryPanel(getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); ForgeDirection facing = clickedBlock; boolean valid = true; if (!isValidPanelPlacement(world, x, y, z, facing)) { diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index dd754532..ada65b17 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -1,5 +1,19 @@ package binnie.extratrees.carpentry; +import java.util.List; + +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + import binnie.core.BinnieCore; import binnie.core.block.BlockMetadata; import binnie.core.block.IMultipassBlock; @@ -13,28 +27,11 @@ import binnie.extratrees.api.IToolHammer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; public abstract class BlockDesign extends BlockMetadata implements IMultipassBlock { - public static ForgeDirection[] RENDER_DIRECTIONS = new ForgeDirection[] { - ForgeDirection.DOWN, - ForgeDirection.UP, - ForgeDirection.EAST, - ForgeDirection.WEST, - ForgeDirection.NORTH, - ForgeDirection.SOUTH - }; + + public static ForgeDirection[] RENDER_DIRECTIONS = new ForgeDirection[] { ForgeDirection.DOWN, ForgeDirection.UP, + ForgeDirection.EAST, ForgeDirection.WEST, ForgeDirection.NORTH, ForgeDirection.SOUTH }; protected IDesignSystem designSystem; @@ -64,8 +61,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo BlockDesign blockC = (BlockDesign) world.getBlock(x, y, z); ItemStack item = player.getHeldItem(); - if (item == null - || !(item.getItem() instanceof IToolHammer) + if (item == null || !(item.getItem() instanceof IToolHammer) || !((IToolHammer) item.getItem()).isActive(item)) { return; } @@ -133,10 +129,11 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo public void addBlockTooltip(ItemStack stack, List tooltip) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { - tooltip.add(I18N.localise( - "extratrees.block.tooltip.twoMaterials", - block.getPrimaryMaterial().getName(), - block.getSecondaryMaterial().getName())); + tooltip.add( + I18N.localise( + "extratrees.block.tooltip.twoMaterials", + block.getPrimaryMaterial().getName(), + block.getSecondaryMaterial().getName())); } else { tooltip.add(block.getPrimaryMaterial().getName()); } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 3601f020..6ff46b3b 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -1,5 +1,13 @@ package binnie.extratrees.carpentry; +import java.util.List; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; + import binnie.botany.Botany; import binnie.core.block.TileEntityMetadata; import binnie.core.util.I18N; @@ -7,14 +15,9 @@ import binnie.extratrees.api.IDesign; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; -import java.util.List; -import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; public class BlockStainedDesign extends BlockDesign { + public BlockStainedDesign() { super(DesignSystem.Glass, Material.glass); setCreativeTab(Tabs.tabArboriculture); @@ -45,7 +48,7 @@ public class BlockStainedDesign extends BlockDesign { @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - // Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - + // Block block2 = world.getBlock(x - Facing.offsetsXForSide[side], y - Facing.offsetsYForSide[side], z - // Facing.offsetsZForSide[side]); Block block = world.getBlock(x, y, z); return block != this && block != Botany.stained && super.shouldSideBeRendered(world, x, y, z, side); @@ -58,18 +61,18 @@ public class BlockStainedDesign extends BlockDesign { @Override public String getBlockName(DesignBlock design) { - return I18N.localise( - "extratrees.block.stainedglass.name", design.getDesign().getName()); + return I18N.localise("extratrees.block.stainedglass.name", design.getDesign().getName()); } @Override public void addBlockTooltip(ItemStack stack, List tooltip) { DesignBlock block = ModuleCarpentry.getDesignBlock(getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); if (block.getPrimaryMaterial() != block.getSecondaryMaterial()) { - tooltip.add(I18N.localise( - "extratrees.block.tooltip.twoColors", - block.getPrimaryMaterial().getName(), - block.getSecondaryMaterial().getName())); + tooltip.add( + I18N.localise( + "extratrees.block.tooltip.twoColors", + block.getPrimaryMaterial().getName(), + block.getSecondaryMaterial().getName())); } else { tooltip.add(block.getPrimaryMaterial().getName()); } diff --git a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java index b01ad786..4e9e0821 100644 --- a/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java +++ b/src/main/java/binnie/extratrees/carpentry/CarpentryInterface.java @@ -1,20 +1,23 @@ package binnie.extratrees.carpentry; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; + import binnie.extratrees.api.ICarpentryInterface; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.item.ItemStack; public class CarpentryInterface implements ICarpentryInterface { + protected static Map woodMap = new LinkedHashMap<>(); protected static Map designMap = new LinkedHashMap<>(); protected static Map designCategories = new HashMap<>(); @@ -66,8 +69,7 @@ public class CarpentryInterface implements ICarpentryInterface { @Override public boolean registerDesignCategory(IDesignCategory category) { - return category != null - && category.getId() != null + return category != null && category.getId() != null && CarpentryInterface.designCategories.put(category.getId(), category) == null; } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java index ab4cdfb4..fd034890 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignBlock.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignBlock.java @@ -1,18 +1,20 @@ package binnie.extratrees.carpentry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.util.I18N; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IToolHammer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class DesignBlock { + protected IDesign design; protected IDesignMaterial primaryMaterial; protected IDesignMaterial secondaryMaterial; @@ -20,13 +22,8 @@ public class DesignBlock { protected ForgeDirection facing; protected boolean panel; - DesignBlock( - IDesignSystem system, - IDesignMaterial primaryWood, - IDesignMaterial secondaryWood, - IDesign design, - int rotation, - ForgeDirection dir) { + DesignBlock(IDesignSystem system, IDesignMaterial primaryWood, IDesignMaterial secondaryWood, IDesign design, + int rotation, ForgeDirection dir) { this.rotation = 0; this.design = design; this.rotation = rotation; @@ -55,8 +52,17 @@ public class DesignBlock { @Override public String toString() { - return super.toString() + " { design:" + design + " }, { primary:" + primaryMaterial + " }, { secondary:" - + secondaryMaterial + " }, { rotation:" + rotation + " }, { facing:" + facing + " }"; + return super.toString() + " { design:" + + design + + " }, { primary:" + + primaryMaterial + + " }, { secondary:" + + secondaryMaterial + + " }, { rotation:" + + rotation + + " }, { facing:" + + facing + + " }"; } public IDesign getDesign() { @@ -140,8 +146,7 @@ public class DesignBlock { } // TODO remove label - Label_1107: - { + Label_1107: { switch (getFacing()) { case UP: if (dir == ForgeDirection.DOWN || dir == ForgeDirection.UP) { @@ -392,7 +397,17 @@ public class DesignBlock { } else { type = getPrimaryMaterial().getName(); } - return super.toString() + " " + "{" + type + " " + getDesign().getName() + " " + (panel ? "Panel" : "Tile") - + ", Facing:" + getFacing().toString() + ", Rotation:" + getRotation() + "}"; + return super.toString() + " " + + "{" + + type + + " " + + getDesign().getName() + + " " + + (panel ? "Panel" : "Tile") + + ", Facing:" + + getFacing().toString() + + ", Rotation:" + + getRotation() + + "}"; } } diff --git a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index b86a51e0..ef9ecef1 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -1,5 +1,12 @@ package binnie.extratrees.carpentry; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.extratrees.ExtraTrees; @@ -9,13 +16,9 @@ import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; import binnie.extratrees.block.PlankType; import binnie.extratrees.item.ExtraTreeItems; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public enum DesignSystem implements IDesignSystem { + Wood, Glass; diff --git a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java index ca792d4c..0f74eed4 100644 --- a/src/main/java/binnie/extratrees/carpentry/DesignerManager.java +++ b/src/main/java/binnie/extratrees/carpentry/DesignerManager.java @@ -1,11 +1,13 @@ package binnie.extratrees.carpentry; -import binnie.extratrees.api.IDesignSystem; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import binnie.extratrees.api.IDesignSystem; + public class DesignerManager { + public static DesignerManager instance = new DesignerManager(); List systems; diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java index cbe7c098..1cf53dc5 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesign.java @@ -5,6 +5,7 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.ILayout; public enum EnumDesign implements IDesign { + Blank("blank"), Octagon("octagon"), Diamond("diamond"), @@ -197,8 +198,8 @@ public enum EnumDesign implements IDesign { EnumDesign.VeryThinCorner.setCornered(EnumPattern.VeryThinCorner.layout(), EnumPattern.ThinEdged.layout()); EnumDesign.ThinCorner.setCornered(EnumPattern.ThinCorner.layout(), EnumPattern.Edged.layout()); EnumDesign.Corner.setCornered(EnumPattern.Corner.layout(), EnumPattern.Halved.layout()); - EnumDesign.ThickCorner.setCornered( - EnumPattern.ThickCorner.layout(), EnumPattern.Edged.layout(true).flipHorizontal()); + EnumDesign.ThickCorner + .setCornered(EnumPattern.ThickCorner.layout(), EnumPattern.Edged.layout(true).flipHorizontal()); EnumDesign.ThinCurvedCorner.setCornered(EnumPattern.ThinCurvedCorner.layout(), EnumPattern.Edged.layout()); EnumDesign.CurvedCorner.setCornered(EnumPattern.CurvedCorner.layout(), EnumPattern.Halved.layout()); EnumDesign.Edged.setEdged(EnumPattern.Edged.layout()); @@ -218,23 +219,23 @@ public enum EnumDesign implements IDesign { EnumDesign.ThinTSection.setTSection(EnumPattern.ThinTSection.layout(), EnumPattern.ThinBarred.layout()); EnumDesign.TSection.setTSection(EnumPattern.TSection.layout(), EnumPattern.Barred.layout()); EnumDesign.ThickTSection.setTSection(EnumPattern.ThickTSection.layout(), EnumPattern.ThickBarred.layout()); - EnumDesign.ThinCurvedTSection.setTSection( - EnumPattern.ThinCurvedTSection.layout(), EnumPattern.ThinBarred.layout()); + EnumDesign.ThinCurvedTSection + .setTSection(EnumPattern.ThinCurvedTSection.layout(), EnumPattern.ThinBarred.layout()); EnumDesign.CurvedTSection.setTSection(EnumPattern.CurvedTSection.layout(), EnumPattern.Barred.layout()); - EnumDesign.ThinBarredCorner.setBarredCorner( - EnumPattern.ThinBarredCorner.layout(), EnumPattern.ThinBarred.layout()); + EnumDesign.ThinBarredCorner + .setBarredCorner(EnumPattern.ThinBarredCorner.layout(), EnumPattern.ThinBarred.layout()); EnumDesign.BarredCorner.setBarredCorner(EnumPattern.BarredCorner.layout(), EnumPattern.Barred.layout()); - EnumDesign.ThickBarredCorner.setBarredCorner( - EnumPattern.ThickBarredCorner.layout(), EnumPattern.ThickBarred.layout()); - EnumDesign.ThinCurvedBarredCorner.setBarredCorner( - EnumPattern.ThinCurvedBarredCorner.layout(), EnumPattern.ThinBarred.layout()); - EnumDesign.CurvedBarredCorner.setBarredCorner( - EnumPattern.BarredCurvedCorner.layout(), EnumPattern.Barred.layout()); - EnumDesign.ThinStripedCorner.setStripedCorner( - EnumPattern.ThinStripedCorner.layout(), EnumPattern.ThinStriped.layout()); + EnumDesign.ThickBarredCorner + .setBarredCorner(EnumPattern.ThickBarredCorner.layout(), EnumPattern.ThickBarred.layout()); + EnumDesign.ThinCurvedBarredCorner + .setBarredCorner(EnumPattern.ThinCurvedBarredCorner.layout(), EnumPattern.ThinBarred.layout()); + EnumDesign.CurvedBarredCorner + .setBarredCorner(EnumPattern.BarredCurvedCorner.layout(), EnumPattern.Barred.layout()); + EnumDesign.ThinStripedCorner + .setStripedCorner(EnumPattern.ThinStripedCorner.layout(), EnumPattern.ThinStriped.layout()); EnumDesign.StripedCorner.setStripedCorner(EnumPattern.StripedCorner.layout(), EnumPattern.Striped.layout()); - EnumDesign.OrnateStripedCorner.setStripedCorner( - EnumPattern.OrnateStripedCorner.layout(), EnumPattern.ThinStriped.layout()); + EnumDesign.OrnateStripedCorner + .setStripedCorner(EnumPattern.OrnateStripedCorner.layout(), EnumPattern.ThinStriped.layout()); EnumDesign.Emblem1.setAllPatterns(EnumPattern.Emblem1.layout()); EnumDesign.Emblem2.setAllPatterns(EnumPattern.Emblem2.layout()); EnumDesign.Emblem3.setAllPatterns(EnumPattern.Emblem3.layout()); @@ -247,23 +248,31 @@ public enum EnumDesign implements IDesign { EnumDesign.LetterT.setLetterPattern(EnumPattern.LetterT.layout()); EnumDesign.BarredEnd.setBarredEndPattern(EnumPattern.BarredEnd.layout(), EnumPattern.Barred.layout()); EnumDesign.DiagonalCorner.setDiagonalCorner( - EnumPattern.DiagonalCorner.layout(), EnumPattern.Barred.layout(), EnumPattern.Edged.layout()); + EnumPattern.DiagonalCorner.layout(), + EnumPattern.Barred.layout(), + EnumPattern.Edged.layout()); EnumDesign.DiagonalTSection.setDiagonalTSection( - EnumPattern.DiagonalTSection.layout(), EnumPattern.Barred.layout(), EnumPattern.Edged.layout()); + EnumPattern.DiagonalTSection.layout(), + EnumPattern.Barred.layout(), + EnumPattern.Edged.layout()); EnumDesign.DiagonalCurvedCorner.setDiagonalCorner( - EnumPattern.DiagonalCurvedCorner.layout(), EnumPattern.Barred.layout(), EnumPattern.Edged.layout()); + EnumPattern.DiagonalCurvedCorner.layout(), + EnumPattern.Barred.layout(), + EnumPattern.Edged.layout()); EnumDesign.DiagonalCurvedTSection.setDiagonalTSection( - EnumPattern.DiagonalCurvedTSection.layout(), EnumPattern.Barred.layout(), EnumPattern.Edged.layout()); + EnumPattern.DiagonalCurvedTSection.layout(), + EnumPattern.Barred.layout(), + EnumPattern.Edged.layout()); EnumDesign.OrnateBarred.setBarred(EnumPattern.OrnateBarred.layout()); EnumDesign.OrnateThinBarred.setBarred(EnumPattern.OrnateThinBarred.layout()); EnumDesign.SplitBarred.setBarred(EnumPattern.SplitBarred.layout()); - EnumDesign.SplitBarredCorner.setBarredCorner( - EnumPattern.SplitBarredCorner.layout(), EnumPattern.SplitBarred.layout()); - EnumDesign.SplitBarredTSection.setTSection( - EnumPattern.SplitBarredTSection.layout(), EnumPattern.SplitBarred.layout()); + EnumDesign.SplitBarredCorner + .setBarredCorner(EnumPattern.SplitBarredCorner.layout(), EnumPattern.SplitBarred.layout()); + EnumDesign.SplitBarredTSection + .setTSection(EnumPattern.SplitBarredTSection.layout(), EnumPattern.SplitBarred.layout()); EnumDesign.SplitCrossed.setCross(EnumPattern.SplitCrossed.layout(), EnumPattern.SplitBarred.layout()); - EnumDesign.SplitBarredEnd.setBarredEndPattern( - EnumPattern.SplitBarredEnd.layout(), EnumPattern.SplitBarred.layout()); + EnumDesign.SplitBarredEnd + .setBarredEndPattern(EnumPattern.SplitBarredEnd.layout(), EnumPattern.SplitBarred.layout()); EnumDesign.Circle.setAllPatterns(EnumPattern.Circle.layout()); EnumDesign.Plus.setAllPatterns(EnumPattern.Plus.layout()); EnumDesign.Creeper.setAllPatterns(EnumPattern.Blank.layout(true)); @@ -292,10 +301,10 @@ public enum EnumDesign implements IDesign { EnumPattern.Blank.layout(true), EnumPattern.Blank.layout(true), EnumPattern.Halved.layout()); - EnumDesign.ThickBarredEnd.setBarredEndPattern( - EnumPattern.ThickBarredEnd.layout(), EnumPattern.ThickBarred.layout()); - EnumDesign.ThinBarredEnd.setBarredEndPattern( - EnumPattern.ThinBarredEnd.layout(), EnumPattern.ThinBarred.layout()); + EnumDesign.ThickBarredEnd + .setBarredEndPattern(EnumPattern.ThickBarredEnd.layout(), EnumPattern.ThickBarred.layout()); + EnumDesign.ThinBarredEnd + .setBarredEndPattern(EnumPattern.ThinBarredEnd.layout(), EnumPattern.ThinBarred.layout()); EnumDesign.OverlappedSplitBarred.setAllPatterns(EnumPattern.SplitBarred.layout()); EnumDesign.OverlappedSplitBarred.setTopPattern(EnumPattern.OverlappedSplitBarred.layout()); EnumDesign.OverlappedBarred.setAllPatterns(EnumPattern.Barred.layout()); diff --git a/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java b/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java index b3740568..4d5c42ff 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumDesignCategory.java @@ -1,13 +1,15 @@ package binnie.extratrees.carpentry; +import java.util.ArrayList; +import java.util.List; + import binnie.core.util.I18N; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; -import java.util.ArrayList; -import java.util.List; public enum EnumDesignCategory implements IDesignCategory { + Design("designsEmblems"), Stripes("squaresStripes"), Edges("edges"), diff --git a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java index 135e3da6..2582e263 100644 --- a/src/main/java/binnie/extratrees/carpentry/EnumPattern.java +++ b/src/main/java/binnie/extratrees/carpentry/EnumPattern.java @@ -1,12 +1,14 @@ package binnie.extratrees.carpentry; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public enum EnumPattern implements IPattern { + Blank, Octagon, Diamond, @@ -233,10 +235,16 @@ public enum EnumPattern implements IPattern { EnumPattern.VeryThinCorner3, EnumPattern.VeryThinCorner4); setupCornerPattern( - EnumPattern.ThinCorner, EnumPattern.ThinCorner2, EnumPattern.ThinCorner3, EnumPattern.ThinCorner4); + EnumPattern.ThinCorner, + EnumPattern.ThinCorner2, + EnumPattern.ThinCorner3, + EnumPattern.ThinCorner4); setupCornerPattern(EnumPattern.Corner, EnumPattern.Corner2, EnumPattern.Corner3, EnumPattern.Corner4); setupCornerPattern( - EnumPattern.ThickCorner, EnumPattern.ThickCorner2, EnumPattern.ThickCorner3, EnumPattern.ThickCorner4); + EnumPattern.ThickCorner, + EnumPattern.ThickCorner2, + EnumPattern.ThickCorner3, + EnumPattern.ThickCorner4); setupCornerPattern( EnumPattern.ThinCurvedCorner, EnumPattern.ThinCurvedCorner2, @@ -248,9 +256,15 @@ public enum EnumPattern implements IPattern { EnumPattern.CurvedCorner3, EnumPattern.CurvedCorner4); setupBarredPattern( - EnumPattern.BarredEnd, EnumPattern.BarredEnd2, EnumPattern.BarredEnd3, EnumPattern.BarredEnd4); + EnumPattern.BarredEnd, + EnumPattern.BarredEnd2, + EnumPattern.BarredEnd3, + EnumPattern.BarredEnd4); setupEdgedPattern( - EnumPattern.ThinEdged, EnumPattern.ThinEdged2, EnumPattern.ThinEdged3, EnumPattern.ThinEdged4); + EnumPattern.ThinEdged, + EnumPattern.ThinEdged2, + EnumPattern.ThinEdged3, + EnumPattern.ThinEdged4); setupEdgedPattern(EnumPattern.Edged, EnumPattern.Edged2, EnumPattern.Edged3, EnumPattern.Edged4); setupBarredPattern(EnumPattern.ThinBarred, EnumPattern.ThinBarred2); setupBarredPattern(EnumPattern.Barred, EnumPattern.Barred2); diff --git a/src/main/java/binnie/extratrees/carpentry/GlassType.java b/src/main/java/binnie/extratrees/carpentry/GlassType.java index 87f5de11..e64900c7 100644 --- a/src/main/java/binnie/extratrees/carpentry/GlassType.java +++ b/src/main/java/binnie/extratrees/carpentry/GlassType.java @@ -1,16 +1,19 @@ package binnie.extratrees.carpentry; +import java.awt.Color; +import java.util.LinkedHashMap; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.botany.genetics.EnumFlowerColor; import binnie.core.block.TileEntityMetadata; import binnie.extratrees.api.IDesignMaterial; -import java.awt.Color; -import java.util.LinkedHashMap; -import java.util.Map; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; public class GlassType implements IDesignMaterial { + protected static Map types = new LinkedHashMap<>(); static { @@ -18,8 +21,8 @@ public class GlassType implements IDesignMaterial { GlassType.types.put(c.ordinal(), new GlassType(c.ordinal(), c.name, c.color)); } for (EnumFlowerColor c2 : EnumFlowerColor.values()) { - GlassType.types.put( - 128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getName(), c2.getColor(false))); + GlassType.types + .put(128 + c2.ordinal(), new GlassType(128 + c2.ordinal(), c2.getName(), c2.getColor(false))); } } @@ -77,6 +80,7 @@ public class GlassType implements IDesignMaterial { } private enum StandardColor { + White("White", new Color(0xffffff)), Orange("Orange", new Color(0xd87f33)), Magenta("Magenta", new Color(0xb24cd8)), diff --git a/src/main/java/binnie/extratrees/carpentry/Layout.java b/src/main/java/binnie/extratrees/carpentry/Layout.java index 6cd3271c..c0a15eb3 100644 --- a/src/main/java/binnie/extratrees/carpentry/Layout.java +++ b/src/main/java/binnie/extratrees/carpentry/Layout.java @@ -1,11 +1,13 @@ package binnie.extratrees.carpentry; +import net.minecraft.util.IIcon; + import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.ILayout; import binnie.extratrees.api.IPattern; -import net.minecraft.util.IIcon; public class Layout implements ILayout { + protected IPattern pattern; protected boolean inverted; diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index b2fe78a9..7dec990d 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -1,5 +1,10 @@ package binnie.extratrees.carpentry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.block.ItemMetadata; @@ -11,18 +16,15 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; public class ModuleCarpentry implements IInitializable { + static { CarpentryManager.carpentryInterface = new CarpentryInterface(); } - public static ItemStack getItemStack( - BlockDesign block, IDesignMaterial type1, IDesignMaterial type2, IDesign design) { + public static ItemStack getItemStack(BlockDesign block, IDesignMaterial type1, IDesignMaterial type2, + IDesign design) { return getItemStack( block, block.getDesignSystem().getMaterialIndex(type1), @@ -31,8 +33,8 @@ public class ModuleCarpentry implements IInitializable { } public static ItemStack getItemStack(BlockDesign block, int type1, int type2, int design) { - return TileEntityMetadata.getItemStack( - block, getMetadata(type1, type2, design, 0, ForgeDirection.UP.ordinal())); + return TileEntityMetadata + .getItemStack(block, getMetadata(type1, type2, design, 0, ForgeDirection.UP.ordinal())); } public static ItemStack getItemStack(BlockDesign blockC, DesignBlock block) { @@ -86,12 +88,14 @@ public class ModuleCarpentry implements IInitializable { GameRegistry.registerBlock(ExtraTrees.blockPanel, ItemMetadata.class, "panel"); GameRegistry.registerBlock(ExtraTrees.blockStained, ItemMetadata.class, "stainedglass"); BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(ExtraTrees.blockCarpentry), new MultipassItemRenderer()); + Item.getItemFromBlock(ExtraTrees.blockCarpentry), + new MultipassItemRenderer()); BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(ExtraTrees.blockStained), new MultipassItemRenderer()); + Item.getItemFromBlock(ExtraTrees.blockStained), + new MultipassItemRenderer()); MinecraftForge.EVENT_BUS.register(ExtraTrees.blockCarpentry); - BinnieCore.proxy.registerCustomItemRenderer( - Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); + BinnieCore.proxy + .registerCustomItemRenderer(Item.getItemFromBlock(ExtraTrees.blockPanel), new MultipassItemRenderer()); } @Override diff --git a/src/main/java/binnie/extratrees/config/ConfigurationMain.java b/src/main/java/binnie/extratrees/config/ConfigurationMain.java index b11f39bd..7bdbd1b7 100644 --- a/src/main/java/binnie/extratrees/config/ConfigurationMain.java +++ b/src/main/java/binnie/extratrees/config/ConfigurationMain.java @@ -6,9 +6,10 @@ import binnie.core.mod.config.PropBoolean; @ConfigFile(filename = "/config/forestry/extratrees/main.conf") public class ConfigurationMain { + @ConfigProperty( key = "lemon.citrus.family", - comment = {"Uses reflection to convert the Forestry lemon tree to the Citrus family."}) + comment = { "Uses reflection to convert the Forestry lemon tree to the Citrus family." }) @PropBoolean public static boolean alterLemon = true; } diff --git a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java index 2ac5650c..1f749484 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreeTexture.java @@ -7,6 +7,7 @@ import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; public enum ExtraTreeTexture implements IBinnieTexture { + Gui(ResourceType.GUI, "gui"), Nursery(ResourceType.Tile, "Nursery"); diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index 0ac27784..61469fbb 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -1,5 +1,10 @@ package binnie.extratrees.core; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.extratrees.craftgui.WindowArboristDatabase; @@ -8,12 +13,9 @@ import binnie.extratrees.craftgui.WindowLumbermill; import binnie.extratrees.craftgui.WindowSetSquare; import binnie.extratrees.craftgui.WindowWoodworker; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public enum ExtraTreesGUID implements IBinnieGUID { + Database, Woodworker, Lumbermill, diff --git a/src/main/java/binnie/extratrees/core/ModuleCore.java b/src/main/java/binnie/extratrees/core/ModuleCore.java index 08af1af2..e3902b96 100644 --- a/src/main/java/binnie/extratrees/core/ModuleCore.java +++ b/src/main/java/binnie/extratrees/core/ModuleCore.java @@ -1,5 +1,12 @@ package binnie.extratrees.core; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Collections; +import java.util.LinkedList; +import java.util.Queue; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.extratrees.api.CarpentryManager; @@ -10,14 +17,9 @@ import binnie.extratrees.block.PlankType; import binnie.extratrees.genetics.ExtraTreeFruitGene; import binnie.extratrees.genetics.ExtraTreeSpecies; import forestry.api.arboriculture.IAlleleTreeSpecies; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Collections; -import java.util.LinkedList; -import java.util.Queue; public class ModuleCore implements IInitializable { + @Override public void preInit() { // ignored @@ -76,8 +78,10 @@ public class ModuleCore implements IInitializable { if (wood5 == null) { outputLogs.println(""); } else { - String img = "\"""; + String img = "\"""; outputLogs.println("" + img + " " + wood5.getName() + ""); } } @@ -94,7 +98,9 @@ public class ModuleCore implements IInitializable { if (wood2 == null) { outputPlanks.println(""); } else { - String img = "\"""; outputPlanks.println("" + img + " " + wood2.getName() + ""); } @@ -130,8 +136,7 @@ public class ModuleCore implements IInitializable { if (wood4 == null) { outputDesigns.println(""); } else { - String texture = - wood4.getTopPattern().getPattern().toString().toLowerCase(); + String texture = wood4.getTopPattern().getPattern().toString().toLowerCase(); String img2 = "\"""; outputDesigns.println("" + img2 + " " + wood4.getName() + ""); } diff --git a/src/main/java/binnie/extratrees/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/craftgui/ControlBlockIconDisplay.java index 73a708d5..be35cfc3 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlBlockIconDisplay.java @@ -1,12 +1,14 @@ package binnie.extratrees.craftgui; +import net.minecraft.util.IIcon; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IPoint; -import net.minecraft.util.IIcon; public class ControlBlockIconDisplay extends Control { + protected IIcon icon; public ControlBlockIconDisplay(IWidget parent, float x, float y, IIcon icon) { diff --git a/src/main/java/binnie/extratrees/craftgui/ControlFluidDisplay.java b/src/main/java/binnie/extratrees/craftgui/ControlFluidDisplay.java index 4dbf5b4a..c183db3f 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlFluidDisplay.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlFluidDisplay.java @@ -1,5 +1,10 @@ package binnie.extratrees.craftgui; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -8,11 +13,9 @@ import binnie.core.craftgui.WidgetAttribute; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.Window; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.opengl.GL11; public class ControlFluidDisplay extends Control implements ITooltip { + public boolean hasTooltip; protected FluidStack itemStack; diff --git a/src/main/java/binnie/extratrees/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/craftgui/ControlLumbermillProgress.java index 0d4bfb1c..1836a42b 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlLumbermillProgress.java @@ -1,5 +1,12 @@ package binnie.extratrees.craftgui; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.geometry.IArea; @@ -12,13 +19,9 @@ import binnie.core.craftgui.resource.minecraft.StandardTexture; import binnie.core.craftgui.window.Panel; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.lumbermill.Lumbermill; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import org.lwjgl.opengl.GL11; public class ControlLumbermillProgress extends ControlProgressBase { + protected static Texture saw = new StandardTexture(0, 0, 6, 32, ExtraTreeTexture.Gui); protected static Texture saw2 = new StandardTexture(2, 0, 4, 32, ExtraTreeTexture.Gui); @@ -45,8 +48,8 @@ public class ControlLumbermillProgress extends ControlProgressBase { public void onRenderForeground() { GL11.glDisable(2896); int sawX = (int) (63.0f * progress); - CraftGUI.render.texture( - ControlLumbermillProgress.saw, new IPoint(sawX, -8.0f + 6.0f * (float) Math.sin(animation))); + CraftGUI.render + .texture(ControlLumbermillProgress.saw, new IPoint(sawX, -8.0f + 6.0f * (float) Math.sin(animation))); ItemStack item = Window.get(this).getInventory().getStackInSlot(Lumbermill.SLOT_WOOD); if (item == null) { return; @@ -80,14 +83,15 @@ public class ControlLumbermillProgress extends ControlProgressBase { IIcon icon2 = block2.getIcon(2, result.getItemDamage()); IPoint pos = getAbsolutePosition(); - CraftGUI.render.limitArea( - new IArea(pos.add(new IPoint(0.0f, 0.0f)), new IPoint(progress * 64.0f + 2.0f, 18.0f))); + CraftGUI.render + .limitArea(new IArea(pos.add(new IPoint(0.0f, 0.0f)), new IPoint(progress * 64.0f + 2.0f, 18.0f))); GL11.glEnable(3089); for (int j = 0; j < 4; ++j) { CraftGUI.render.iconBlock(new IPoint(1 + j * 16, 1.0f), icon2); } GL11.glDisable(3089); CraftGUI.render.texture( - ControlLumbermillProgress.saw2, new IPoint(sawX + 2, -8.0f + 6.0f * (float) Math.sin(animation))); + ControlLumbermillProgress.saw2, + new IPoint(sawX + 2, -8.0f + 6.0f * (float) Math.sin(animation))); } } diff --git a/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java index 4a3fe90e..6cdf127a 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlRecipeSlot.java @@ -1,5 +1,9 @@ package binnie.extratrees.craftgui; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.minecraft.Window; @@ -7,11 +11,9 @@ import binnie.core.craftgui.minecraft.control.ControlSlotBase; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; import binnie.core.machines.component.IComponentRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; public class ControlRecipeSlot extends ControlSlotBase { + public ControlRecipeSlot(IWidget parent, int x, int y) { super(parent, x, y, 50); addSelfEventHandler(new MouseDownHandler()); @@ -20,12 +22,12 @@ public class ControlRecipeSlot extends ControlSlotBase { @Override public ItemStack getItemStack() { - IComponentRecipe recipe = - Machine.getInterface(IComponentRecipe.class, Window.get(this).getInventory()); + IComponentRecipe recipe = Machine.getInterface(IComponentRecipe.class, Window.get(this).getInventory()); return recipe.isRecipe() ? recipe.getProduct() : null; } private class MouseDownHandler extends EventMouse.Down.Handler { + @Override public void onEvent(EventMouse.Down event) { TileEntity tile = (TileEntity) Window.get(getWidget()).getInventory(); diff --git a/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java index 291b9482..dfea5003 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlSlotFluid.java @@ -1,5 +1,7 @@ package binnie.extratrees.craftgui; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -10,9 +12,9 @@ import binnie.core.craftgui.events.EventWidget; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.resource.minecraft.CraftGUITexture; -import net.minecraftforge.fluids.FluidStack; public class ControlSlotFluid extends Control implements ITooltip { + protected ControlFluidDisplay itemDisplay; protected FluidStack fluidStack; @@ -26,6 +28,7 @@ public class ControlSlotFluid extends Control implements ITooltip { itemDisplay = new ControlFluidDisplay(this, 1.0f, 1.0f, size - 2); fluidStack = fluid; addSelfEventHandler(new EventWidget.ChangeSize.Handler() { + @Override public void onEvent(EventWidget.ChangeSize event) { if (itemDisplay != null) { diff --git a/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java index 52395ecb..7353cd76 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlTankSlot.java @@ -1,12 +1,14 @@ package binnie.extratrees.craftgui; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.events.EventMouse; import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.minecraft.Window; -import net.minecraft.nbt.NBTTagCompound; public class ControlTankSlot extends ControlSlotFluid { + protected int tankID; public ControlTankSlot(IWidget parent, int x, int y, int i) { @@ -14,6 +16,7 @@ public class ControlTankSlot extends ControlSlotFluid { tankID = 0; tankID = i; addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { if (event.getButton() == 0) { diff --git a/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java index 268c7d9e..0904b621 100644 --- a/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/craftgui/ControlTileSelect.java @@ -1,5 +1,13 @@ package binnie.extratrees.craftgui; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -20,24 +28,14 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignCategory; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.machines.designer.WoodworkerRecipeComponent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class ControlTileSelect extends Control implements IControlValue, IControlScrollable { + protected IDesign value; protected float shownHeight; protected ControlTileSelect(IWidget parent, float x, float y) { - super( - parent, - x, - y, - 102.0f, - 20 * (CarpentryManager.carpentryInterface.getSortedDesigns().size() / 4) + 22); + super(parent, x, y, 102.0f, 20 * (CarpentryManager.carpentryInterface.getSortedDesigns().size() / 4) + 22); value = EnumDesign.Blank; shownHeight = 92.0f; refresh(""); @@ -124,6 +122,7 @@ public class ControlTileSelect extends Control implements IControlValue } public static class ControlTile extends Control implements IControlValue, ITooltip { + IDesign value; protected ControlTile(IWidget parent, float x, float y, IDesign value) { @@ -135,8 +134,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void getTooltip(Tooltip tooltip) { - tooltip.add( - I18N.localise("binniecore.gui.designer.pattern", getValue().getName())); + tooltip.add(I18N.localise("binniecore.gui.designer.pattern", getValue().getName())); } @Override @@ -156,8 +154,7 @@ public class ControlTileSelect extends Control implements IControlValue @Override public void onRenderForeground() { - ItemStack image = - ((WindowWoodworker) getSuperParent()).getDesignerType().getDisplayStack(getValue()); + ItemStack image = ((WindowWoodworker) getSuperParent()).getDesignerType().getDisplayStack(getValue()); CraftGUI.render.item(new IPoint(1.0f, 1.0f), image); if (((IControlValue) getParent()).getValue() == getValue()) { return; @@ -171,10 +168,10 @@ public class ControlTileSelect extends Control implements IControlValue } private class MouseDownHandler extends EventMouse.Down.Handler { + @Override public void onEvent(EventMouse.Down event) { - TileEntityMachine tile = - (TileEntityMachine) Window.get(getWidget()).getInventory(); + TileEntityMachine tile = (TileEntityMachine) Window.get(getWidget()).getInventory(); if (tile == null) { return; } diff --git a/src/main/java/binnie/extratrees/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/craftgui/PageFruit.java index 25d43bfa..15d5ff9a 100644 --- a/src/main/java/binnie/extratrees/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/craftgui/PageFruit.java @@ -1,5 +1,9 @@ package binnie.extratrees.craftgui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.ControlSpeciesBox; @@ -12,10 +16,9 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; -import java.util.Collection; -import net.minecraft.item.ItemStack; public class PageFruit extends PageAbstract { + boolean treesThatBearFruit; public PageFruit(IWidget parent, DatabaseTab tab, boolean treesThatBearFruit) { @@ -35,9 +38,11 @@ public class PageFruit extends PageAbstract { Collection trees = treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()) .getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) - : ((TreeBreedingSystem) database.getBreedingSystem()) - .getTreesThatCanBearFruit( - species, database.isNEI(), database.getWorld(), database.getUsername()); + : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit( + species, + database.isNEI(), + database.getWorld(), + database.getUsername()); new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); } } diff --git a/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java index bcb326b0..05940921 100644 --- a/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/craftgui/PagePlanksOverview.java @@ -1,5 +1,8 @@ package binnie.extratrees.craftgui; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -14,10 +17,9 @@ import binnie.extratrees.block.DoorType; import binnie.extratrees.block.IPlankType; import binnie.extratrees.block.WoodManager; import binnie.extratrees.block.decor.FenceType; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class PagePlanksOverview extends PageAbstract { + public PagePlanksOverview(IWidget parent, DatabaseTab tab) { super(parent, tab); } @@ -55,9 +57,15 @@ public class PagePlanksOverview extends PageAbstract { } ControlText controlDescription = new ControlText( - this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.MIDDLE_CENTER); + this, + new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), + "", + TextJustification.MIDDLE_CENTER); ControlText controlSignature = new ControlText( - this, new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), "", TextJustification.BOTTOM_RIGHT); + this, + new IArea(8.0f, 84.0f, getSize().x() - 16.0f, 0.0f), + "", + TextJustification.BOTTOM_RIGHT); String desc = ""; if (type != null) { desc = type.getDescription(); @@ -80,9 +88,8 @@ public class PagePlanksOverview extends PageAbstract { controlDescription.setValue(descBody + EnumChatFormatting.RESET); controlSignature.setValue(descSig + EnumChatFormatting.RESET); - float descHeight = CraftGUI.render.textHeight( - controlDescription.getValue(), controlDescription.getSize().x()); - controlSignature.setPosition(new IPoint( - controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f)); + float descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); + controlSignature.setPosition( + new IPoint(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10.0f)); } } diff --git a/src/main/java/binnie/extratrees/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/craftgui/PagePlanksTrees.java index e5c70770..b95bb7dd 100644 --- a/src/main/java/binnie/extratrees/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/craftgui/PagePlanksTrees.java @@ -1,5 +1,9 @@ package binnie.extratrees.craftgui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.ControlSpeciesBox; @@ -11,10 +15,9 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; import forestry.api.genetics.IAlleleSpecies; -import java.util.Collection; -import net.minecraft.item.ItemStack; public class PagePlanksTrees extends PageAbstract { + public PagePlanksTrees(IWidget parent, DatabaseTab tab) { super(parent, tab); } diff --git a/src/main/java/binnie/extratrees/craftgui/PageSpeciesImage.java b/src/main/java/binnie/extratrees/craftgui/PageSpeciesImage.java index 018d170f..4be5e716 100644 --- a/src/main/java/binnie/extratrees/craftgui/PageSpeciesImage.java +++ b/src/main/java/binnie/extratrees/craftgui/PageSpeciesImage.java @@ -11,6 +11,7 @@ import binnie.core.craftgui.window.Panel; import forestry.api.genetics.IAlleleSpecies; public class PageSpeciesImage extends PageSpecies { + protected ControlDatabaseIndividualDisplay display; public PageSpeciesImage(IWidget parent, DatabaseTab tab) { diff --git a/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java index 13ef80d7..940921f5 100644 --- a/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/craftgui/PageSpeciesTreeGenome.java @@ -1,5 +1,13 @@ package binnie.extratrees.craftgui; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -21,14 +29,9 @@ import forestry.api.arboriculture.ITreeGenome; import forestry.api.core.ForestryAPI; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; public class PageSpeciesTreeGenome extends PageSpecies { + public PageSpeciesTreeGenome(IWidget parent, DatabaseTab tab) { super(parent, tab); } @@ -49,16 +52,8 @@ public class PageSpeciesTreeGenome extends PageSpecies { ItemStack log = null; try { FakeWorld world = FakeWorld.instance; - tree.getGenome() - .getPrimary() - .getGenerator() - .setLogBlock( - tree.getGenome(), - world, - 0, - 0, - 0, - ForgeDirection.UP); // getGenome().getPrimary().getGenerator().getWorldGenerator(tree); + tree.getGenome().getPrimary().getGenerator() + .setLogBlock(tree.getGenome(), world, 0, 0, 0, ForgeDirection.UP); // getGenome().getPrimary().getGenerator().getWorldGenerator(tree); log = world.getWooLog(); } catch (Exception e) { @@ -106,8 +101,8 @@ public class PageSpeciesTreeGenome extends PageSpecies { int fruitColour = 0xffffff; try { - fruit = ForestryAPI.textureManager.getIcon( - genome.getFruitProvider().getIconIndex(genome, null, 0, 0, 0, 100, false)); + fruit = ForestryAPI.textureManager + .getIcon(genome.getFruitProvider().getIconIndex(genome, null, 0, 0, 0, 100, false)); fruitColour = genome.getFruitProvider().getColour(genome, null, 0, 0, 0, 100); } catch (Exception ex) { ex.printStackTrace(); @@ -202,7 +197,10 @@ public class PageSpeciesTreeGenome extends PageSpecies { syst.getChromosomeShortName(EnumTreeChromosome.MATURATION) + " : ", TextJustification.MIDDLE_RIGHT); new ControlText( - contents, new IArea(w2, y, w3, th), genome.getMaturationTime() + "x", TextJustification.MIDDLE_LEFT); + contents, + new IArea(w2, y, w3, th), + genome.getMaturationTime() + "x", + TextJustification.MIDDLE_LEFT); y += th; new ControlText( contents, diff --git a/src/main/java/binnie/extratrees/craftgui/PageWood.java b/src/main/java/binnie/extratrees/craftgui/PageWood.java index da030d15..671e8638 100644 --- a/src/main/java/binnie/extratrees/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/craftgui/PageWood.java @@ -1,5 +1,9 @@ package binnie.extratrees.craftgui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.database.ControlSpeciesBox; @@ -11,10 +15,9 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.craftgui.minecraft.Window; import binnie.core.genetics.TreeBreedingSystem; import forestry.api.genetics.IAlleleSpecies; -import java.util.Collection; -import net.minecraft.item.ItemStack; public class PageWood extends PageAbstract { + public PageWood(IWidget parent, DatabaseTab tab) { super(parent, tab); } @@ -24,7 +27,10 @@ public class PageWood extends PageAbstract { deleteAllChildren(); WindowAbstractDatabase database = Window.get(this); new ControlText( - this, new IArea(0.0f, 0.0f, size().x(), 24.0f), getValue().toString(), TextJustification.MIDDLE_CENTER); + this, + new IArea(0.0f, 0.0f, size().x(), 24.0f), + getValue().toString(), + TextJustification.MIDDLE_CENTER); Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()) .getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4.0f, 24.0f, size().x() - 8.0f, size().y() - 4.0f - 24.0f).setOptions(trees); diff --git a/src/main/java/binnie/extratrees/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/craftgui/WindowArboristDatabase.java index 9481c441..28e35bc8 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/WindowArboristDatabase.java @@ -1,5 +1,8 @@ package binnie.extratrees.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.IWidget; @@ -21,10 +24,9 @@ import binnie.core.genetics.TreeBreedingSystem; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class WindowArboristDatabase extends WindowAbstractDatabase { + public WindowArboristDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.treeBreedingSystem, 120.0f); } @@ -38,40 +40,45 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { new PageSpeciesOverview(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.overview")); new PageSpeciesTreeGenome(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.genome")); new PageSpeciesClassification( - getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.classification")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraTrees.instance, "species.classification")); new PageSpeciesResultant(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.resultant")); new PageSpeciesMutations(getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "species.further")); new PageBranchOverview(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.overview")); new PageBranchSpecies(getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "branches.species")); new PageBreeder(getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder")); createMode(TreeMode.FRUIT, new ModeWidgets(TreeMode.FRUIT, this) { + @Override public void createListBox(IArea area) { (listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { - @Override - public IWidget createOption(ItemStack value, int y) { - return new ControlItemStackOption(getContent(), value, y); - } - }) - .setOptions(((TreeBreedingSystem) getBreedingSystem()).allFruits); + + @Override + public IWidget createOption(ItemStack value, int y) { + return new ControlItemStackOption(getContent(), value, y); + } + }).setOptions(((TreeBreedingSystem) getBreedingSystem()).allFruits); } }); createMode(TreeMode.WOOD, new ModeWidgets(TreeMode.WOOD, this) { + @Override public void createListBox(IArea area) { (listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { - @Override - public IWidget createOption(ItemStack value, int y) { - return new ControlItemStackOption(getContent(), value, y); - } - }) - .setOptions(((TreeBreedingSystem) getBreedingSystem()).allWoods); + + @Override + public IWidget createOption(ItemStack value, int y) { + return new ControlItemStackOption(getContent(), value, y); + } + }).setOptions(((TreeBreedingSystem) getBreedingSystem()).allWoods); } }); createMode(TreeMode.PLANKS, new ModeWidgets(TreeMode.PLANKS, this) { + @Override public void createListBox(IArea area) { listBox = new ControlListBox(modePage, area.x(), area.y(), area.w(), area.h(), 12.0f) { + @Override public IWidget createOption(ItemStack value, int y) { return new ControlItemStackOption(getContent(), value, y); @@ -97,6 +104,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { } enum TreeMode implements IDatabaseMode { + FRUIT, WOOD, PLANKS; diff --git a/src/main/java/binnie/extratrees/craftgui/WindowLepidopteristDatabase.java b/src/main/java/binnie/extratrees/craftgui/WindowLepidopteristDatabase.java index b9b90f8f..2e4aa798 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowLepidopteristDatabase.java +++ b/src/main/java/binnie/extratrees/craftgui/WindowLepidopteristDatabase.java @@ -1,5 +1,7 @@ package binnie.extratrees.craftgui; +import net.minecraft.entity.player.EntityPlayer; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.database.DatabaseTab; @@ -14,9 +16,9 @@ import binnie.core.craftgui.database.WindowAbstractDatabase; import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; public class WindowLepidopteristDatabase extends WindowAbstractDatabase { + public WindowLepidopteristDatabase(EntityPlayer player, Side side, boolean nei) { super(player, side, nei, Binnie.Genetics.mothBreedingSystem, 160.0f); } @@ -28,21 +30,30 @@ public class WindowLepidopteristDatabase extends WindowAbstractDatabase { @Override protected void addTabs() { new PageSpeciesOverview( - getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraTrees.instance, "butterfly.species.overview")); new PageSpeciesClassification( - getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraTrees.instance, "butterfly.species.classification")); new PageSpeciesImage( - getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraTrees.instance, "butterfly.species.specimen")); new PageSpeciesResultant( - getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraTrees.instance, "butterfly.species.resultant")); new PageSpeciesMutations( - getInfoPages(Mode.Species), new DatabaseTab(ExtraTrees.instance, "butterfly.species.further")); + getInfoPages(Mode.Species), + new DatabaseTab(ExtraTrees.instance, "butterfly.species.further")); new PageBranchOverview( - getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview")); + getInfoPages(Mode.Branches), + new DatabaseTab(ExtraTrees.instance, "butterfly.branches.overview")); new PageBranchSpecies( - getInfoPages(Mode.Branches), new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species")); + getInfoPages(Mode.Branches), + new DatabaseTab(ExtraTrees.instance, "butterfly.branches.species")); new PageBreeder( - getInfoPages(Mode.Breeder), getUsername(), new DatabaseTab(ExtraTrees.instance, "butterfly.breeder")); + getInfoPages(Mode.Breeder), + getUsername(), + new DatabaseTab(ExtraTrees.instance, "butterfly.breeder")); } @Override diff --git a/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java index dccee5ba..97dd4e92 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java +++ b/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java @@ -1,5 +1,8 @@ package binnie.extratrees.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; @@ -12,10 +15,9 @@ import binnie.core.machines.Machine; import binnie.extratrees.ExtraTrees; import binnie.extratrees.machines.lumbermill.Lumbermill; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowLumbermill extends Window { + public WindowLumbermill(EntityPlayer player, IInventory inventory, Side side) { super(220.0f, 192.0f, player, inventory, side); } diff --git a/src/main/java/binnie/extratrees/craftgui/WindowSetSquare.java b/src/main/java/binnie/extratrees/craftgui/WindowSetSquare.java index 4c8fe971..4c39fc95 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowSetSquare.java +++ b/src/main/java/binnie/extratrees/craftgui/WindowSetSquare.java @@ -1,14 +1,16 @@ package binnie.extratrees.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.world.World; + import binnie.core.AbstractMod; import binnie.core.craftgui.minecraft.Window; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.world.World; public class WindowSetSquare extends Window { + public WindowSetSquare(EntityPlayer player, IInventory inventory, Side side) { super(150.0f, 150.0f, player, inventory, side); } diff --git a/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java index e5bc8953..1a343a58 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java @@ -1,5 +1,8 @@ package binnie.extratrees.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.controls.ControlTextEdit; @@ -22,22 +25,21 @@ import binnie.extratrees.machines.designer.Designer; import binnie.extratrees.machines.designer.DesignerType; import binnie.extratrees.machines.designer.WoodworkerRecipeComponent; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowWoodworker extends Window { + protected ControlTextEdit textEdit; protected ControlTileSelect tileSelect; public WindowWoodworker(EntityPlayer player, IInventory inventory, Side side) { super(320.0f, 216.0f, player, inventory, side); - addEventHandler( - new EventTextEdit.Handler() { - @Override - public void onEvent(EventTextEdit event) { - tileSelect.refresh(event.getValue()); - } - }.setOrigin(EventHandler.Origin.DirectChild, this)); + addEventHandler(new EventTextEdit.Handler() { + + @Override + public void onEvent(EventTextEdit event) { + tileSelect.refresh(event.getValue()); + } + }.setOrigin(EventHandler.Origin.DirectChild, this)); } public static Window create(EntityPlayer player, IInventory inventory, Side side) { @@ -48,11 +50,10 @@ public class WindowWoodworker extends Window { public void initialiseClient() { setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName()); new ControlText( - this, - new IArea(190.0f, 36.0f, 114.0f, 10.0f), - I18N.localise("binniecore.gui.design"), - TextJustification.TOP_CENTER) - .setColor(4473924); + this, + new IArea(190.0f, 36.0f, 114.0f, 10.0f), + I18N.localise("binniecore.gui.design"), + TextJustification.TOP_CENTER).setColor(4473924); new Panel(this, 188.0f, 48.0f, 118.0f, 126.0f, MinecraftGUI.PanelType.Gray); textEdit = new ControlTextEdit(this, 188.0f, 178.0f, 118.0f, 12.0f); ControlScrollableContent scroll = new ControlScrollableContent(this, 190.0f, 50.0f, 114.0f, 122.0f, 12.0f); @@ -82,7 +83,6 @@ public class WindowWoodworker extends Window { } public DesignerType getDesignerType() { - return Machine.getInterface(WoodworkerRecipeComponent.class, getInventory()) - .getDesignerType(); + return Machine.getInterface(WoodworkerRecipeComponent.class, getInventory()).getDesignerType(); } } diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 649a8e31..c95c5114 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -1,12 +1,24 @@ package binnie.extratrees.genetics; +import java.awt.Color; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.BiomeDictionary; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.EnumHumidity; @@ -19,16 +31,9 @@ import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterflyRoot; -import java.awt.Color; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.BiomeDictionary; public enum ButterflySpecies implements IAlleleButterflySpecies { + WhiteAdmiral("whiteAdmiral", "Limenitis camilla", new Color(0xfafafa)), PurpleEmperor("purpleEmperor", "Apatura iris", new Color(0x4232c6)), RedAdmiral("redAdmiral", "Vanessa atalanta", new Color(0xe66f44)), @@ -219,8 +224,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { return 1.0f; } - for (Map.Entry entry : - getRoot().getResearchCatalysts().entrySet()) { + for (Map.Entry entry : getRoot().getResearchCatalysts().entrySet()) { if (entry.getKey().isItemEqual(itemstack)) { return entry.getValue(); } @@ -230,7 +234,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public ItemStack[] getResearchBounty(World world, GameProfile researcher, IIndividual individual, int bountyLevel) { - return new ItemStack[] {getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM.ordinal())}; + return new ItemStack[] { getRoot().getMemberStack(individual.copy(), EnumFlutterType.SERUM.ordinal()) }; } @Override diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java index a518cc53..63394f00 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitFamily.java @@ -3,6 +3,7 @@ package binnie.extratrees.genetics; import forestry.api.genetics.IFruitFamily; public enum ExtraTreeFruitFamily implements IFruitFamily { + Berry("Berries", "berry", "berri"), Citrus("Citrus", "citrus", "citrus"); diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index e4270164..05cedd2d 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -1,12 +1,25 @@ package binnie.extratrees.genetics; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + import binnie.Binnie; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.block.FruitPod; import binnie.extratrees.config.ConfigurationMain; import binnie.extratrees.item.Food; + import com.gtnewhorizon.gtnhlib.reflect.Fields; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumTreeChromosome; @@ -19,17 +32,9 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderNone; import forestry.arboriculture.genetics.alleles.AlleleTreeSpecies; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { + Blackthorn(10, 0x6d8f1e, 0xde2f69, FruitSprite.Small), CherryPlum(10, 0x6d8f1e, 0xe81c4b, FruitSprite.Small), Peach(10, 0x6d8f1e, 0xfaa023, FruitSprite.Average), @@ -393,22 +398,20 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider { @Override public boolean trySpawnFruitBlock(ITreeGenome genome, World world, int x, int y, int z) { - return pod != null - && world.rand.nextFloat() <= genome.getSappiness() - && Binnie.Genetics.getTreeRoot() - .setFruitBlock( - world, - (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), - genome.getSappiness(), - pod.getTextures(), - x, - y, - z); + return pod != null && world.rand.nextFloat() <= genome.getSappiness() + && Binnie.Genetics.getTreeRoot().setFruitBlock( + world, + (IAlleleFruit) genome.getActiveAllele(EnumTreeChromosome.FRUITS), + genome.getSappiness(), + pod.getTextures(), + x, + y, + z); } @Override - public short getIconIndex( - ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime, boolean fancy) { + public short getIconIndex(ITreeGenome genome, IBlockAccess world, int x, int y, int z, int ripeningTime, + boolean fancy) { return index.getIndex(); } diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java index 6f811a70..a2fd02a7 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java @@ -1,5 +1,12 @@ package binnie.extratrees.genetics; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; + import binnie.Binnie; import binnie.core.util.I18N; import forestry.api.arboriculture.IAlleleTreeSpecies; @@ -8,13 +15,9 @@ import forestry.api.arboriculture.ITreeMutation; import forestry.api.arboriculture.ITreeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public class ExtraTreeMutation implements ITreeMutation { + protected int chance; protected boolean isSecret; protected IAlleleTreeSpecies allele0; @@ -67,7 +70,10 @@ public class ExtraTreeMutation implements ITreeMutation { ExtraTreeSpecies.FloweringCrabapple, 10); new ExtraTreeMutation( - ExtraTreeSpecies.OrchardApple, getVanilla("Birch"), ExtraTreeSpecies.PrairieCrabapple, 10); + ExtraTreeSpecies.OrchardApple, + getVanilla("Birch"), + ExtraTreeSpecies.PrairieCrabapple, + 10); new ExtraTreeMutation(getVanilla("Plum"), ExtraTreeSpecies.OrchardApple, ExtraTreeSpecies.Blackthorn, 10); new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Cherry"), ExtraTreeSpecies.CherryPlum, 10); new ExtraTreeMutation(getVanilla("Plum"), getVanilla("Chestnut"), ExtraTreeSpecies.Peach, 10); @@ -132,15 +138,24 @@ public class ExtraTreeMutation implements ITreeMutation { new ExtraTreeMutation(getVanilla("Cherry"), ExtraTreeSpecies.Elder, ExtraTreeSpecies.Raspberry, 10); new ExtraTreeMutation(getVanilla("Cherry"), ExtraTreeSpecies.Elder, ExtraTreeSpecies.Redcurrant, 10); new ExtraTreeMutation( - ExtraTreeSpecies.BlackCherry, ExtraTreeSpecies.Redcurrant, ExtraTreeSpecies.Blackcurrant, 10); + ExtraTreeSpecies.BlackCherry, + ExtraTreeSpecies.Redcurrant, + ExtraTreeSpecies.Blackcurrant, + 10); new ExtraTreeMutation( - ExtraTreeSpecies.BlackCherry, ExtraTreeSpecies.Raspberry, ExtraTreeSpecies.Blackberry, 10); + ExtraTreeSpecies.BlackCherry, + ExtraTreeSpecies.Raspberry, + ExtraTreeSpecies.Blackberry, + 10); new ExtraTreeMutation(ExtraTreeSpecies.Blackberry, ExtraTreeSpecies.Raspberry, ExtraTreeSpecies.Blueberry, 10); new ExtraTreeMutation(ExtraTreeSpecies.Blackberry, ExtraTreeSpecies.CherryPlum, ExtraTreeSpecies.Cranberry, 10); new ExtraTreeMutation(ExtraTreeSpecies.Raspberry, ExtraTreeSpecies.Fir, ExtraTreeSpecies.Juniper, 10); new ExtraTreeMutation(ExtraTreeSpecies.Raspberry, ExtraTreeSpecies.Lime, ExtraTreeSpecies.Gooseberry, 10); new ExtraTreeMutation( - ExtraTreeSpecies.Raspberry, ExtraTreeSpecies.Orange, ExtraTreeSpecies.GoldenRaspberry, 10); + ExtraTreeSpecies.Raspberry, + ExtraTreeSpecies.Orange, + ExtraTreeSpecies.GoldenRaspberry, + 10); new ExtraTreeMutation(getVanilla("Teak"), ExtraTreeSpecies.Rosewood, ExtraTreeSpecies.Cinnamon, 10); new ExtraTreeMutation(getVanilla("Balsa"), ExtraTreeSpecies.Brazilnut, ExtraTreeSpecies.Coconut, 10); new ExtraTreeMutation(getVanilla("Teak"), getVanilla("Oak"), ExtraTreeSpecies.Cashew, 10); @@ -207,15 +222,8 @@ public class ExtraTreeMutation implements ITreeMutation { } @Override - public float getChance( - World world, - int x, - int y, - int z, - IAlleleTreeSpecies allele0, - IAlleleTreeSpecies allele1, - ITreeGenome genome0, - ITreeGenome genome1) { + public float getChance(World world, int x, int y, int z, IAlleleTreeSpecies allele0, IAlleleTreeSpecies allele1, + ITreeGenome genome0, ITreeGenome genome1) { int processedChance = chance; BiomeGenBase biome = world.getWorldChunkManager().getBiomeGenAt(x, z); if (biome.temperature < minTemperature || biome.temperature > maxTemperature) { @@ -227,12 +235,10 @@ public class ExtraTreeMutation implements ITreeMutation { if (height > 0.0f && y < height) { return 0.0f; } - if (this.allele0.getUID().equals(allele0.getUID()) - && this.allele1.getUID().equals(allele1.getUID())) { + if (this.allele0.getUID().equals(allele0.getUID()) && this.allele1.getUID().equals(allele1.getUID())) { return processedChance; } - if (this.allele1.getUID().equals(allele0.getUID()) - && this.allele0.getUID().equals(allele1.getUID())) { + if (this.allele1.getUID().equals(allele0.getUID()) && this.allele0.getUID().equals(allele1.getUID())) { return processedChance; } return 0.0f; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index 0371114b..ee32d271 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -1,5 +1,18 @@ package binnie.extratrees.genetics; +import java.awt.Color; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.EnumPlantType; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.util.I18N; @@ -65,7 +78,9 @@ import binnie.extratrees.worldgen.WorldGenWesternHemlock; import binnie.extratrees.worldgen.WorldGenWhitebeam; import binnie.extratrees.worldgen.WorldGenYew; import binnie.genetics.genetics.AlleleHelper; + import com.mojang.authlib.GameProfile; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeChromosome; @@ -93,46 +108,16 @@ import forestry.arboriculture.render.TextureLeaves; import forestry.core.genetics.alleles.EnumAllele; import forestry.core.render.TextureManager; import forestry.plugins.PluginArboriculture; -import java.awt.Color; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.EnumPlantType; public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGermlingIconProvider { - OrchardApple( - "malus", - "domestica", - 0x648830, - ILogType.ExtraTreeLog.Apple, - ExtraTreeFruitGene.Apple, + + OrchardApple("malus", "domestica", 0x648830, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Apple, WorldGenOrchardApple.class), - SweetCrabapple( - "malus", - "coronaria", - 0x7a9953, - ILogType.ExtraTreeLog.Apple, - ExtraTreeFruitGene.Crabapple, + SweetCrabapple("malus", "coronaria", 0x7a9953, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenSweetCrabapple.class), - FloweringCrabapple( - "malus", - "hopa", - 0x7a9953, - ILogType.ExtraTreeLog.Apple, - ExtraTreeFruitGene.Crabapple, + FloweringCrabapple("malus", "hopa", 0x7a9953, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenFloweringCrabapple.class), - PrairieCrabapple( - "malus", - "ioensis", - 0x7a9953, - ILogType.ExtraTreeLog.Apple, - ExtraTreeFruitGene.Crabapple, + PrairieCrabapple("malus", "ioensis", 0x7a9953, ILogType.ExtraTreeLog.Apple, ExtraTreeFruitGene.Crabapple, WorldGenPrairieCrabapple.class), Blackthorn("prunus", "spinosa ", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.Blackthorn), CherryPlum("prunus", "cerasifera", 0x6d8f1e, ILogType.ForestryLog.PLUM, ExtraTreeFruitGene.CherryPlum), @@ -156,73 +141,33 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm Citron("citrus", "medica", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.Citron), BuddhaHand("citrus", "sarcodactylus", 0x88af54, ILogType.ForestryLog.CITRUS, ExtraTreeFruitGene.BuddhaHand), Banana("musa", "sinensis", 0xa1cd8e, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Banana, WorldGenBanana.class), - RedBanana( - "musa", - "rubra", - 0xa1cd8e, - ILogType.ExtraTreeLog.Banana, - ExtraTreeFruitGene.RedBanana, + RedBanana("musa", "rubra", 0xa1cd8e, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.RedBanana, WorldGenBanana.class), - Plantain( - "musa", - "paradisiaca", - 0xa1cd8e, - ILogType.ExtraTreeLog.Banana, - ExtraTreeFruitGene.Plantain, + Plantain("musa", "paradisiaca", 0xa1cd8e, ILogType.ExtraTreeLog.Banana, ExtraTreeFruitGene.Plantain, WorldGenBanana.class), - Butternut( - "juglans", - "cinerea", - 0x82b58c, - ILogType.ExtraTreeLog.Butternut, - ExtraTreeFruitGene.Butternut, + Butternut("juglans", "cinerea", 0x82b58c, ILogType.ExtraTreeLog.Butternut, ExtraTreeFruitGene.Butternut, WorldGenButternut.class), Rowan("sorbus", "aucuparia", 0x9ec79b, ILogType.ExtraTreeLog.Rowan, null, WorldGenRowan.class), Hemlock("tsuga", "heterophylla", 0x5cac72, ILogType.ExtraTreeLog.Hemlock, null, WorldGenWesternHemlock.class), Ash("fraxinus", "excelsior", 0x488e2b, ILogType.ExtraTreeLog.Ash, null, WorldGenCommonAsh.class), Alder("alnus", "glutinosa", 0x698a33, ILogType.ExtraTreeLog.Alder, null, WorldGenCommonAlder.class), - Beech( - "fagus", - "sylvatica", - 0x83a04c, - ILogType.ExtraTreeLog.Beech, - ExtraTreeFruitGene.Beechnut, + Beech("fagus", "sylvatica", 0x83a04c, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenCommonBeech.class), - CopperBeech( - "fagus", - "purpurea", - 0x801318, - ILogType.ExtraTreeLog.Beech, - ExtraTreeFruitGene.Beechnut, + CopperBeech("fagus", "purpurea", 0x801318, ILogType.ExtraTreeLog.Beech, ExtraTreeFruitGene.Beechnut, WorldGenCopperBeech.class), Aspen("populus", "tremula", 0x8acc37, ILogType.ForestryLog.POPLAR, null, WorldGenAspen.class), Yew("taxus", "baccata", 0x948a4d, ILogType.ExtraTreeLog.Yew, null, WorldGenYew.class), Cypress("chamaecyparis", "lawsoniana", 0x89c9a7, ILogType.ExtraTreeLog.Cypress, null, WorldGenCypress.class), DouglasFir("pseudotsuga", "menziesii", 0x99b582, ILogType.ExtraTreeLog.Fir, null, WorldGenDouglasFir.class), - Hazel( - "Corylus", - "avellana", - 0x9bb552, - ILogType.ExtraTreeLog.Hazel, - ExtraTreeFruitGene.Hazelnut, + Hazel("Corylus", "avellana", 0x9bb552, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenHazel.class), Sycamore("ficus", "sycomorus", 0xa0a52f, ILogType.ExtraTreeLog.Fig, ExtraTreeFruitGene.Fig, WorldGenSycamore.class), Whitebeam("sorbus", "aria", 0xbace99, ILogType.ExtraTreeLog.Whitebeam, null, WorldGenWhitebeam.class), Hawthorn("crataegus", "monogyna", 0x6ba84a, ILogType.ExtraTreeLog.Hawthorn, null, WorldGenHawthorn.class), - Pecan( - "carya", - "illinoinensis", - 0x85b674, - ILogType.ExtraTreeLog.Hickory, - ExtraTreeFruitGene.Pecan, + Pecan("carya", "illinoinensis", 0x85b674, ILogType.ExtraTreeLog.Hickory, ExtraTreeFruitGene.Pecan, WorldGenPecan.class), Elm("ulmus", "procera", 0x7c9048, ILogType.ExtraTreeLog.Elm, null, WorldGenElm.class), - Elder( - "sambucus", - "nigra", - 0xaeb873, - ILogType.ExtraTreeLog.Elder, - ExtraTreeFruitGene.Elderberry, + Elder("sambucus", "nigra", 0xaeb873, ILogType.ExtraTreeLog.Elder, ExtraTreeFruitGene.Elderberry, WorldGenElder.class), Holly("ilex", "aquifolium", 0x254b4c, ILogType.ExtraTreeLog.Holly, null, WorldGenHolly.class), Hornbeam("carpinus", "betulus", 0x96a71b, ILogType.ExtraTreeLog.Hornbeam, null, WorldGenHornbeam.class), @@ -237,12 +182,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm Sweetgum("liquidambar", "styraciflua", 0x8b8762, ILogType.ExtraTreeLog.Sweetgum, null, WorldGenSweetgum.class), Locust("robinia", "pseudoacacia", 0x887300, ILogType.ExtraTreeLog.Locust, null, WorldGenLocust.class), Pear("pyrus", "communis", 0x5e8826, ILogType.ExtraTreeLog.Pear, ExtraTreeFruitGene.Pear, WorldGenPear.class), - OsangeOsange( - "maclura", - "pomifera", - 0x687a50, - ILogType.ExtraTreeLog.Maclura, - ExtraTreeFruitGene.OsangeOsange, + OsangeOsange("maclura", "pomifera", 0x687a50, ILogType.ExtraTreeLog.Maclura, ExtraTreeFruitGene.OsangeOsange, WorldGenOsangeOsange.class), OldFustic("maclura", "tinctoria", 0x687a50, ILogType.ExtraTreeLog.Maclura, null, WorldGenOldFustic.class), Brazilwood("caesalpinia", "echinata", 0x607459, ILogType.ExtraTreeLog.Brazilwood, null, WorldGenBrazilwood.class), @@ -250,29 +190,14 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm Rosewood("dalbergia", "latifolia", 0x879b22, ILogType.ExtraTreeLog.Rosewood, null, WorldGenRosewood.class), Purpleheart("peltogyne", "spp.", 0x778f55, ILogType.ExtraTreeLog.Purpleheart, null, WorldGenPurpleheart.class), Iroko("milicia", "excelsa", 0xafc86c, ILogType.ExtraTreeLog.Iroko, null, WorldGenIroko.class), - Gingko( - "ginkgo", - "biloba", - 0x719651, - ILogType.ExtraTreeLog.Gingko, - ExtraTreeFruitGene.GingkoNut, + Gingko("ginkgo", "biloba", 0x719651, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut, WorldGenGingko.class), - Brazilnut( - "bertholletia", - "excelsa", - 0x7c8f7b, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.BrazilNut, + Brazilnut("bertholletia", "excelsa", 0x7c8f7b, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut, WorldGenBrazilNut.class), RoseGum("eucalyptus", "grandis", 0x9ca258, ILogType.ExtraTreeLog.Eucalyptus, null, WorldGenRoseGum.class), SwampGum("eucalyptus", "grandis", 0xa2c686, ILogType.ExtraTreeLog.Eucalyptus2, null, WorldGenSwampGum.class), Box("boxus", "sempervirens", 0x72996d, ILogType.ExtraTreeLog.Box, null, WorldGenBox.class), - Clove( - "syzygium", - "aromaticum", - 0x7a821f, - ILogType.ExtraTreeLog.Syzgium, - ExtraTreeFruitGene.Clove, + Clove("syzygium", "aromaticum", 0x7a821f, ILogType.ExtraTreeLog.Syzgium, ExtraTreeFruitGene.Clove, WorldGenClove.class), Coffee("coffea", "arabica", 0x6f9065, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coffee, WorldGenCoffee.class), MonkeyPuzzle("araucaria", "araucana", 0x576158, ILogType.ForestryLog.PINE, null, WorldGenMonkeyPuzzle.class), @@ -288,65 +213,25 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm Gooseberry("ribes", "grossularia", 0x79bb00, null, ExtraTreeFruitGene.Gooseberry, WorldGenShrub.class), GoldenRaspberry("rubus", "occidentalis", 0x83b96e, null, ExtraTreeFruitGene.GoldenRaspberry, WorldGenShrub.class), Cinnamon("cinnamomum", "cassia", 0x738e0b, ILogType.ExtraTreeLog.Cinnamon, null, WorldGenLazy.class), - Coconut( - "cocous", - "nucifera", - 0x649923, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.Coconut, + Coconut("cocous", "nucifera", 0x649923, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Coconut, WorldGenCoconut.class), - Cashew( - "anacardium", - "occidentale", - 0xabb962, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.Cashew, + Cashew("anacardium", "occidentale", 0xabb962, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Cashew, WorldGenLazy.class), - Avacado( - "persea", - "americana", - 0x96a375, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.Avacado, + Avacado("persea", "americana", 0x96a375, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Avacado, WorldGenLazy.class), - Nutmeg( - "myristica", - "fragrans", - 0x488d4c, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.Nutmeg, + Nutmeg("myristica", "fragrans", 0x488d4c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Nutmeg, + WorldGenLazy.class), + Allspice("pimenta", "dioica", 0x7c9724, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Allspice, WorldGenLazy.class), - Allspice( - "pimenta", "dioica", 0x7c9724, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Allspice, WorldGenLazy.class), Chilli("capsicum", "annuum", 0x2a9f01, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Chilli, WorldGenLazy.class), - StarAnise( - "illicium", - "verum", - 0x7fc409, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.StarAnise, + StarAnise("illicium", "verum", 0x7fc409, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.StarAnise, WorldGenLazy.class), Mango("mangifera", "indica", 0x87b574, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Mango, WorldGenMango.class), - Starfruit( - "averrhoa", - "carambola", - 0x6da92d, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.Starfruit, + Starfruit("averrhoa", "carambola", 0x6da92d, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Starfruit, WorldGenLazy.class), - Candlenut( - "aleurites", - "moluccana", - 0x8aa36c, - ILogType.VanillaLog.Jungle, - ExtraTreeFruitGene.Candlenut, + Candlenut("aleurites", "moluccana", 0x8aa36c, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.Candlenut, WorldGenLazy.class), - DwarfHazel( - "Corylus", - "americana", - 0x9bb552, - ILogType.ExtraTreeLog.Hazel, - ExtraTreeFruitGene.Hazelnut, + DwarfHazel("Corylus", "americana", 0x9bb552, ILogType.ExtraTreeLog.Hazel, ExtraTreeFruitGene.Hazelnut, WorldGenShrub.class); public ILogType wood; @@ -370,12 +255,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm this(branch, binomial, color, wood, fruit, null); } - ExtraTreeSpecies( - String branch, - String binomial, - int color, - ILogType wood, - IAlleleFruit fruit, + ExtraTreeSpecies(String branch, String binomial, int color, ILogType wood, IAlleleFruit fruit, Class gen) { this.color = color; this.wood = wood; @@ -396,50 +276,34 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm species.preInit(); } - ExtraTreeSpecies[] pruneSpecies = new ExtraTreeSpecies[] { - ExtraTreeSpecies.Blackthorn, - ExtraTreeSpecies.CherryPlum, - ExtraTreeSpecies.Almond, - ExtraTreeSpecies.Apricot, - ExtraTreeSpecies.Peach, - ExtraTreeSpecies.Nectarine, - ExtraTreeSpecies.WildCherry, - ExtraTreeSpecies.SourCherry, - ExtraTreeSpecies.BlackCherry - }; + ExtraTreeSpecies[] pruneSpecies = new ExtraTreeSpecies[] { ExtraTreeSpecies.Blackthorn, + ExtraTreeSpecies.CherryPlum, ExtraTreeSpecies.Almond, ExtraTreeSpecies.Apricot, ExtraTreeSpecies.Peach, + ExtraTreeSpecies.Nectarine, ExtraTreeSpecies.WildCherry, ExtraTreeSpecies.SourCherry, + ExtraTreeSpecies.BlackCherry }; for (ExtraTreeSpecies species2 : pruneSpecies) { - IAlleleTreeSpecies citrus = - (IAlleleTreeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.treePlum"); - species2.setWorldGen(citrus.getGenerator() - .getWorldGenerator(TreeManager.treeRoot.templateAsIndividual( - citrus.getRoot().getDefaultTemplate())) + IAlleleTreeSpecies citrus = (IAlleleTreeSpecies) AlleleManager.alleleRegistry + .getAllele("forestry.treePlum"); + species2.setWorldGen( + citrus.getGenerator() + .getWorldGenerator( + TreeManager.treeRoot.templateAsIndividual(citrus.getRoot().getDefaultTemplate())) .getClass()) .setSaplingType(SaplingType.FRUIT); } - ExtraTreeSpecies[] citrusSpecies = new ExtraTreeSpecies[] { - ExtraTreeSpecies.Orange, - ExtraTreeSpecies.Manderin, - ExtraTreeSpecies.Satsuma, - ExtraTreeSpecies.Tangerine, - ExtraTreeSpecies.Lime, - ExtraTreeSpecies.KeyLime, - ExtraTreeSpecies.FingerLime, - ExtraTreeSpecies.Pomelo, - ExtraTreeSpecies.Grapefruit, - ExtraTreeSpecies.Kumquat, - ExtraTreeSpecies.Citron, - ExtraTreeSpecies.BuddhaHand - }; + ExtraTreeSpecies[] citrusSpecies = new ExtraTreeSpecies[] { ExtraTreeSpecies.Orange, ExtraTreeSpecies.Manderin, + ExtraTreeSpecies.Satsuma, ExtraTreeSpecies.Tangerine, ExtraTreeSpecies.Lime, ExtraTreeSpecies.KeyLime, + ExtraTreeSpecies.FingerLime, ExtraTreeSpecies.Pomelo, ExtraTreeSpecies.Grapefruit, + ExtraTreeSpecies.Kumquat, ExtraTreeSpecies.Citron, ExtraTreeSpecies.BuddhaHand }; for (ExtraTreeSpecies species3 : citrusSpecies) { - IAlleleTreeSpecies citrus2 = - (IAlleleTreeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.treeLemon"); - species3.setWorldGen(citrus2.getGenerator() - .getWorldGenerator(TreeManager.treeRoot.templateAsIndividual( - citrus2.getRoot().getDefaultTemplate())) + IAlleleTreeSpecies citrus2 = (IAlleleTreeSpecies) AlleleManager.alleleRegistry + .getAllele("forestry.treeLemon"); + species3.setWorldGen( + citrus2.getGenerator() + .getWorldGenerator( + TreeManager.treeRoot.templateAsIndividual(citrus2.getRoot().getDefaultTemplate())) .getClass()) - .setLeafType(LeafType.JUNGLE) - .setSaplingType(SaplingType.FRUIT); + .setLeafType(LeafType.JUNGLE).setSaplingType(SaplingType.FRUIT); } citrusSpecies = values(); @@ -449,8 +313,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm String uid = "trees." + species3.branchName.toLowerCase(); IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); if (branch == null) { - branch = AlleleManager.alleleRegistry.createAndRegisterClassification( - IClassification.EnumClassLevel.GENUS, uid, scientific); + branch = AlleleManager.alleleRegistry + .createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } species3.branch = branch; branch.addMemberSpecies(species3); @@ -463,683 +327,369 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm IFruitFamily familyBerry = ExtraTreeFruitFamily.Berry; IFruitFamily familyCitrus = ExtraTreeFruitFamily.Citrus; - ExtraTreeSpecies.OrchardApple.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setYield(EnumAllele.Yield.HIGHER) - .setSappiness(EnumAllele.Sappiness.LOW) + ExtraTreeSpecies.OrchardApple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setYield(EnumAllele.Yield.HIGHER).setSappiness(EnumAllele.Sappiness.LOW) .setMaturation(EnumAllele.Maturation.FASTER); - ExtraTreeSpecies.SweetCrabapple.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.AVERAGE) + ExtraTreeSpecies.SweetCrabapple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setYield(EnumAllele.Yield.HIGH).setSappiness(EnumAllele.Sappiness.AVERAGE) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.FloweringCrabapple.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setFertility(EnumAllele.Saplings.AVERAGE) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FAST); + ExtraTreeSpecies.FloweringCrabapple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setFertility(EnumAllele.Saplings.AVERAGE).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.PrairieCrabapple.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) + ExtraTreeSpecies.PrairieCrabapple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.AVERAGE); + + ExtraTreeSpecies.Blackthorn.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.LOW) + .setSappiness(EnumAllele.Sappiness.AVERAGE).setMaturation(EnumAllele.Maturation.FAST); + + ExtraTreeSpecies.CherryPlum.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.LOWER) + .setSappiness(EnumAllele.Sappiness.AVERAGE).setMaturation(EnumAllele.Maturation.FAST); + + ExtraTreeSpecies.Peach.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.AVERAGE); + + ExtraTreeSpecies.Nectarine.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.AVERAGE) .setSappiness(EnumAllele.Sappiness.AVERAGE); - ExtraTreeSpecies.Blackthorn.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.LOW) - .setSappiness(EnumAllele.Sappiness.AVERAGE) - .setMaturation(EnumAllele.Maturation.FAST); - - ExtraTreeSpecies.CherryPlum.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.AVERAGE) - .setMaturation(EnumAllele.Maturation.FAST); - - ExtraTreeSpecies.Peach.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) + ExtraTreeSpecies.Apricot.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.LOW) .setSappiness(EnumAllele.Sappiness.AVERAGE); - ExtraTreeSpecies.Nectarine.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.AVERAGE); - - ExtraTreeSpecies.Apricot.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.LOW) - .setSappiness(EnumAllele.Sappiness.AVERAGE); - - ExtraTreeSpecies.Almond.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.Almond.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setYield(EnumAllele.Yield.LOWER).setSappiness(EnumAllele.Sappiness.LOWER) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.WildCherry.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.LOW) + ExtraTreeSpecies.WildCherry.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.LOWER).setSappiness(EnumAllele.Sappiness.LOW) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.SourCherry.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.LOW); + ExtraTreeSpecies.SourCherry.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setYield(EnumAllele.Yield.LOWER).setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.BlackCherry.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOWEST) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.BlackCherry.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOWEST) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.LOWER) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Orange.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.AVERAGE) - .setMaturation(EnumAllele.Maturation.FAST); + ExtraTreeSpecies.Orange.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.AVERAGE).setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Manderin.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.LOW); + ExtraTreeSpecies.Manderin.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.HIGH).setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Satsuma.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.LOW) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FAST); + ExtraTreeSpecies.Satsuma.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.LOW) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Tangerine.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.AVERAGE) + ExtraTreeSpecies.Tangerine.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.AVERAGE) .setMaturation(EnumAllele.Maturation.FASTER); - ExtraTreeSpecies.Lime.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.AVERAGE) + ExtraTreeSpecies.Lime.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.AVERAGE) .setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.KeyLime.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOWEST) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW) + ExtraTreeSpecies.KeyLime.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOWEST) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.LOW) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.FingerLime.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.LOW) + ExtraTreeSpecies.FingerLime.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.HIGH) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FAST); + + ExtraTreeSpecies.Pomelo.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.LOWER); + + ExtraTreeSpecies.Grapefruit.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.LOW) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Pomelo.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER); - - ExtraTreeSpecies.Grapefruit.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FAST); - - ExtraTreeSpecies.Kumquat.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.HIGH) + ExtraTreeSpecies.Kumquat.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.HIGH) .setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Citron.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.HIGH) + ExtraTreeSpecies.Citron.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.HIGH) .setSappiness(EnumAllele.Sappiness.AVERAGE); - ExtraTreeSpecies.BuddhaHand.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW); + ExtraTreeSpecies.BuddhaHand.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setYield(EnumAllele.Yield.AVERAGE).setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Banana.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.PALM) - .setYield(EnumAllele.Yield.LOW) - .setSappiness(EnumAllele.Sappiness.LOW) + ExtraTreeSpecies.Banana.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.PALM) + .setYield(EnumAllele.Yield.LOW).setSappiness(EnumAllele.Sappiness.LOW) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.RedBanana.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.PALM) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOWER) + ExtraTreeSpecies.RedBanana.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.PALM) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.LOWER) .setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Plantain.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.PALM) - .setHeight(EnumAllele.Height.AVERAGE) + ExtraTreeSpecies.Plantain.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.PALM) + .setHeight(EnumAllele.Height.AVERAGE).setYield(EnumAllele.Yield.LOWER); + + ExtraTreeSpecies.Butternut.setGirth(2).addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts) + .addFamily(familyCitrus).setHeight(EnumAllele.Height.SMALLER).setYield(EnumAllele.Yield.LOW); + + ExtraTreeSpecies.Rowan.addFamily(familyNuts).addFamily(familyBerry).setHeight(EnumAllele.Height.LARGER) + .setFertility(EnumAllele.Saplings.LOW).setSappiness(EnumAllele.Sappiness.LOWER); + + ExtraTreeSpecies.Ash.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus) + .setFertility(EnumAllele.Saplings.LOW).setSappiness(EnumAllele.Sappiness.LOWER); + + ExtraTreeSpecies.Alder.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts) + .setHeight(EnumAllele.Height.AVERAGE).setSappiness(EnumAllele.Sappiness.LOWER); + + ExtraTreeSpecies.Beech.addFamily(familyPrune).addFamily(familyNuts).setHeight(EnumAllele.Height.AVERAGE) .setYield(EnumAllele.Yield.LOWER); - ExtraTreeSpecies.Butternut.setGirth(2) - .addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLER) - .setYield(EnumAllele.Yield.LOW); - - ExtraTreeSpecies.Rowan.addFamily(familyNuts) - .addFamily(familyBerry) - .setHeight(EnumAllele.Height.LARGER) - .setFertility(EnumAllele.Saplings.LOW) - .setSappiness(EnumAllele.Sappiness.LOWER); - - ExtraTreeSpecies.Ash.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) - .setFertility(EnumAllele.Saplings.LOW) - .setSappiness(EnumAllele.Sappiness.LOWER); - - ExtraTreeSpecies.Alder.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyNuts) - .setHeight(EnumAllele.Height.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER); - - ExtraTreeSpecies.Beech.addFamily(familyPrune) - .addFamily(familyNuts) - .setHeight(EnumAllele.Height.AVERAGE) - .setYield(EnumAllele.Yield.LOWER); - - ExtraTreeSpecies.CopperBeech.addFamily(familyPrune) - .addFamily(familyNuts) + ExtraTreeSpecies.CopperBeech.addFamily(familyPrune).addFamily(familyNuts) .setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.Aspen.addFamily(familyPome) - .addFamily(familyNuts) - .setFertility(EnumAllele.Saplings.AVERAGE) + ExtraTreeSpecies.Aspen.addFamily(familyPome).addFamily(familyNuts).setFertility(EnumAllele.Saplings.AVERAGE) .setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Hazel.addFamily(familyPrune) - .addFamily(familyNuts) - .setHeight(EnumAllele.Height.AVERAGE) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOW) + ExtraTreeSpecies.Hazel.addFamily(familyPrune).addFamily(familyNuts).setHeight(EnumAllele.Height.AVERAGE) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.LOW) .setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Sycamore.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) - .setFertility(EnumAllele.Saplings.LOWEST) - .setSappiness(EnumAllele.Sappiness.LOWER); + ExtraTreeSpecies.Sycamore.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus) + .setFertility(EnumAllele.Saplings.LOWEST).setSappiness(EnumAllele.Sappiness.LOWER); ExtraTreeSpecies.Whitebeam.addFamily(familyPome).addFamily(familyPrune).setHeight(EnumAllele.Height.SMALLER); ExtraTreeSpecies.Hawthorn.addFamily(familyPrune).addFamily(familyNuts).setHeight(EnumAllele.Height.AVERAGE); - ExtraTreeSpecies.Pecan.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.LARGE) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.Pecan.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts) + .addFamily(familyCitrus).setHeight(EnumAllele.Height.LARGE).setSappiness(EnumAllele.Sappiness.LOWER) .setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.Elm.addFamily(familyPome) - .addFamily(familyPrune) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setSappiness(EnumAllele.Sappiness.AVERAGE); + ExtraTreeSpecies.Elm.addFamily(familyPome).addFamily(familyPrune).setHeight(EnumAllele.Height.SMALLER) + .setFertility(EnumAllele.Saplings.LOW).setSappiness(EnumAllele.Sappiness.AVERAGE); - ExtraTreeSpecies.Elder.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) - .addFamily(familyBerry) - .setHeight(EnumAllele.Height.SMALLER) - .setSappiness(EnumAllele.Sappiness.LOW); + ExtraTreeSpecies.Elder.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus) + .addFamily(familyBerry).setHeight(EnumAllele.Height.SMALLER).setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Holly.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW); + ExtraTreeSpecies.Holly.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.AVERAGE).setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Hornbeam.addFamily(familyPrune) - .addFamily(familyNuts) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOWER) + ExtraTreeSpecies.Hornbeam.addFamily(familyPrune).addFamily(familyNuts).setHeight(EnumAllele.Height.SMALLER) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.LOWER) .setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.Sallow.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setLeafType(LeafType.WILLOW) - .setHeight(EnumAllele.Height.LARGE) - .setFertility(EnumAllele.Saplings.LOW); + ExtraTreeSpecies.Sallow.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setLeafType(LeafType.WILLOW).setHeight(EnumAllele.Height.LARGE).setFertility(EnumAllele.Saplings.LOW); - ExtraTreeSpecies.AcornOak.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyNuts) - .setHeight(EnumAllele.Height.LARGE) - .setYield(EnumAllele.Yield.LOW) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setGirth(2); + ExtraTreeSpecies.AcornOak.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts) + .setHeight(EnumAllele.Height.LARGE).setYield(EnumAllele.Yield.LOW) + .setSappiness(EnumAllele.Sappiness.LOWER).setGirth(2); - ExtraTreeSpecies.Fir.setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.LARGE) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.SLOW); + ExtraTreeSpecies.Fir.setLeafType(LeafType.CONIFER).setHeight(EnumAllele.Height.LARGE) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.Olive.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) + ExtraTreeSpecies.Olive.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus) .setYield(EnumAllele.Yield.AVERAGE); - ExtraTreeSpecies.Cedar.setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.SMALLER) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.SLOWER) - .setGirth(2); + ExtraTreeSpecies.Cedar.setLeafType(LeafType.CONIFER).setHeight(EnumAllele.Height.SMALLER) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.SLOWER).setGirth(2); - ExtraTreeSpecies.RedMaple.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setLeafType(LeafType.MAPLE) - .setFertility(EnumAllele.Saplings.AVERAGE) + ExtraTreeSpecies.RedMaple.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setLeafType(LeafType.MAPLE).setFertility(EnumAllele.Saplings.AVERAGE) .setSappiness(EnumAllele.Sappiness.HIGH); - ExtraTreeSpecies.BalsamFir.setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.SLOW); + ExtraTreeSpecies.BalsamFir.setLeafType(LeafType.CONIFER).setHeight(EnumAllele.Height.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.LoblollyPine.setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.SMALLER) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.SLOW); + ExtraTreeSpecies.LoblollyPine.setLeafType(LeafType.CONIFER).setHeight(EnumAllele.Height.SMALLER) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.Sweetgum.addFamily(familyNuts) - .setHeight(EnumAllele.Height.AVERAGE) - .setFertility(EnumAllele.Saplings.HIGH) - .setYield(EnumAllele.Yield.LOW) + ExtraTreeSpecies.Sweetgum.addFamily(familyNuts).setHeight(EnumAllele.Height.AVERAGE) + .setFertility(EnumAllele.Saplings.HIGH).setYield(EnumAllele.Yield.LOW) .setSappiness(EnumAllele.Sappiness.AVERAGE); - ExtraTreeSpecies.Locust.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) + ExtraTreeSpecies.Locust.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus) .setHeight(EnumAllele.Height.SMALLEST); - ExtraTreeSpecies.Pear.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.Pear.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLER).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.HIGH).setSappiness(EnumAllele.Sappiness.LOWER) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.OsangeOsange.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setYield(EnumAllele.Yield.LOWER); + ExtraTreeSpecies.OsangeOsange.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .addFamily(familyJungle).setLeafType(LeafType.JUNGLE).setYield(EnumAllele.Yield.LOWER); - ExtraTreeSpecies.OldFustic.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLER) + ExtraTreeSpecies.OldFustic.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.SMALLER).setSappiness(EnumAllele.Sappiness.LOWER); + + ExtraTreeSpecies.Brazilwood.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.SMALLER).setFertility(EnumAllele.Saplings.LOW) + .setYield(EnumAllele.Yield.LOWER).setSappiness(EnumAllele.Sappiness.LOWER); + + ExtraTreeSpecies.Logwood.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.AVERAGE).setFertility(EnumAllele.Saplings.LOW) .setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Brazilwood.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.LOWER); + ExtraTreeSpecies.Rosewood.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.AVERAGE).setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Logwood.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.AVERAGE) - .setFertility(EnumAllele.Saplings.LOW) - .setSappiness(EnumAllele.Sappiness.LOWER); + ExtraTreeSpecies.Purpleheart.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.LARGE).setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Rosewood.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER); - - ExtraTreeSpecies.Purpleheart.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.LARGE) - .setSappiness(EnumAllele.Sappiness.LOWER); - - ExtraTreeSpecies.Iroko.addFamily(familyNuts) - .addFamily(familyJungle) - .setHeight(EnumAllele.Height.AVERAGE) + ExtraTreeSpecies.Iroko.addFamily(familyNuts).addFamily(familyJungle).setHeight(EnumAllele.Height.AVERAGE) .setFertility(EnumAllele.Saplings.LOW); - ExtraTreeSpecies.Gingko.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.LARGE) - .setYield(EnumAllele.Yield.LOWER) + ExtraTreeSpecies.Gingko.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.LARGE).setYield(EnumAllele.Yield.LOWER) .setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Brazilnut.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.LARGER) - .setYield(EnumAllele.Yield.LOW) + ExtraTreeSpecies.Brazilnut.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.LARGER).setYield(EnumAllele.Yield.LOW) .setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.RoseGum.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.LARGEST) - .setFertility(EnumAllele.Saplings.LOWEST) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.LOW) + ExtraTreeSpecies.RoseGum.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.LARGEST).setFertility(EnumAllele.Saplings.LOWEST) + .setYield(EnumAllele.Yield.LOWER).setSappiness(EnumAllele.Sappiness.LOW) .setMaturation(EnumAllele.Maturation.SLOWEST); - ExtraTreeSpecies.SwampGum.addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOWEST) - .setMaturation(EnumAllele.Maturation.SLOWER) - .setGirth(2); + ExtraTreeSpecies.SwampGum.addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOWEST) + .setMaturation(EnumAllele.Maturation.SLOWER).setGirth(2); - ExtraTreeSpecies.Box.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyCitrus) - .setHeight(EnumAllele.Height.SMALLER) - .setMaturation(EnumAllele.Maturation.FASTER); + ExtraTreeSpecies.Box.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus) + .setHeight(EnumAllele.Height.SMALLER).setMaturation(EnumAllele.Maturation.FASTER); - ExtraTreeSpecies.Clove.addFamily(familyNuts) - .addFamily(familyJungle) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.Clove.addFamily(familyNuts).addFamily(familyJungle).setHeight(EnumAllele.Height.SMALLER) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.HIGH) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FAST); + + ExtraTreeSpecies.Coffee.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.LARGE).setYield(EnumAllele.Yield.AVERAGE) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Coffee.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.LARGE) - .setYield(EnumAllele.Yield.AVERAGE) - .setMaturation(EnumAllele.Maturation.FAST); + ExtraTreeSpecies.MonkeyPuzzle.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.CONIFER) + .setHeight(EnumAllele.Height.AVERAGE).setYield(EnumAllele.Yield.LOWER) + .setSappiness(EnumAllele.Sappiness.LOW).setGirth(2); - ExtraTreeSpecies.MonkeyPuzzle.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.AVERAGE) - .setYield(EnumAllele.Yield.LOWER) - .setSappiness(EnumAllele.Sappiness.LOW) - .setGirth(2); - - ExtraTreeSpecies.RainbowGum.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOWER); + ExtraTreeSpecies.RainbowGum.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.LOWER); ExtraTreeSpecies.PinkIvory.addFamily(familyNuts).addFamily(familyJungle).setHeight(EnumAllele.Height.SMALLEST); - ExtraTreeSpecies.Blackcurrant.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.Blackcurrant.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Redcurrant.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.AVERAGE).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Blackberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.HIGH) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Raspberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Blueberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.AVERAGE).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Cranberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.AVERAGE).setYield(EnumAllele.Yield.HIGH) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Juniper.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setLeafType(LeafType.CONIFER).setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.LOW) + .setSappiness(EnumAllele.Sappiness.LOW).setMaturation(EnumAllele.Maturation.FASTER); + + ExtraTreeSpecies.Gooseberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.HIGH).setYield(EnumAllele.Yield.HIGH) .setMaturation(EnumAllele.Maturation.FASTER); - ExtraTreeSpecies.Redcurrant.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.AVERAGE) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FASTER); + ExtraTreeSpecies.GoldenRaspberry.addFamily(familyPrune).addFamily(familyNuts).addFamily(familyBerry) + .setSaplingType(SaplingType.SHRUB).setHeight(EnumAllele.Height.SMALLER) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FASTEST); - ExtraTreeSpecies.Blackberry.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.FASTER); - - ExtraTreeSpecies.Raspberry.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.FASTER); - - ExtraTreeSpecies.Blueberry.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.AVERAGE) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FASTER); - - ExtraTreeSpecies.Cranberry.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.AVERAGE) - .setYield(EnumAllele.Yield.HIGH) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FASTER); - - ExtraTreeSpecies.Juniper.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setLeafType(LeafType.CONIFER) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.LOW) - .setSappiness(EnumAllele.Sappiness.LOW) - .setMaturation(EnumAllele.Maturation.FASTER); - - ExtraTreeSpecies.Gooseberry.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.HIGH) - .setYield(EnumAllele.Yield.HIGH) - .setMaturation(EnumAllele.Maturation.FASTER); - - ExtraTreeSpecies.GoldenRaspberry.addFamily(familyPrune) - .addFamily(familyNuts) - .addFamily(familyBerry) - .setSaplingType(SaplingType.SHRUB) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.FASTEST); - - ExtraTreeSpecies.Cinnamon.addFamily(familyNuts) - .setLeafType(LeafType.JUNGLE) - .addFamily(familyJungle) - .setHeight(EnumAllele.Height.AVERAGE) - .setYield(EnumAllele.Yield.LOWER) + ExtraTreeSpecies.Cinnamon.addFamily(familyNuts).setLeafType(LeafType.JUNGLE).addFamily(familyJungle) + .setHeight(EnumAllele.Height.AVERAGE).setYield(EnumAllele.Yield.LOWER) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Coconut.addFamily(familyJungle) - .setLeafType(LeafType.PALM) - .setHeight(EnumAllele.Height.LARGER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) + ExtraTreeSpecies.Coconut.addFamily(familyJungle).setLeafType(LeafType.PALM).setHeight(EnumAllele.Height.LARGER) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.AVERAGE) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.Cashew.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) + ExtraTreeSpecies.Cashew.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) .setYield(EnumAllele.Yield.LOW); - ExtraTreeSpecies.Avacado.addFamily(familyPrune) - .addFamily(familyCitrus) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLEST) - .setYield(EnumAllele.Yield.AVERAGE); + ExtraTreeSpecies.Avacado.addFamily(familyPrune).addFamily(familyCitrus).addFamily(familyJungle) + .setLeafType(LeafType.JUNGLE).setHeight(EnumAllele.Height.SMALLEST).setYield(EnumAllele.Yield.AVERAGE); - ExtraTreeSpecies.Nutmeg.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLER) - .setYield(EnumAllele.Yield.HIGH) + ExtraTreeSpecies.Nutmeg.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.SMALLER).setYield(EnumAllele.Yield.HIGH) .setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.Allspice.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOW) + ExtraTreeSpecies.Allspice.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOW) .setYield(EnumAllele.Yield.HIGH); - ExtraTreeSpecies.Chilli.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLER) - .setYield(EnumAllele.Yield.HIGHER) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.Chilli.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.SMALLER).setYield(EnumAllele.Yield.HIGHER) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FAST); + + ExtraTreeSpecies.StarAnise.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE) + .setHeight(EnumAllele.Height.AVERAGE).setYield(EnumAllele.Yield.HIGH); + + ExtraTreeSpecies.Mango.addFamily(familyPome).addFamily(familyPrune).addFamily(familyCitrus) + .addFamily(familyJungle).setLeafType(LeafType.JUNGLE).setHeight(EnumAllele.Height.SMALLER) + .setFertility(EnumAllele.Saplings.LOW).setYield(EnumAllele.Yield.AVERAGE) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.FAST); + + ExtraTreeSpecies.Starfruit.addFamily(familyPrune).addFamily(familyCitrus).addFamily(familyJungle) + .setLeafType(LeafType.JUNGLE).setYield(EnumAllele.Yield.AVERAGE) .setMaturation(EnumAllele.Maturation.FAST); - ExtraTreeSpecies.StarAnise.addFamily(familyNuts) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.AVERAGE) - .setYield(EnumAllele.Yield.HIGH); - - ExtraTreeSpecies.Mango.addFamily(familyPome) - .addFamily(familyPrune) - .addFamily(familyCitrus) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setYield(EnumAllele.Yield.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.FAST); - - ExtraTreeSpecies.Starfruit.addFamily(familyPrune) - .addFamily(familyCitrus) - .addFamily(familyJungle) - .setLeafType(LeafType.JUNGLE) - .setYield(EnumAllele.Yield.AVERAGE) - .setMaturation(EnumAllele.Maturation.FAST); - - ExtraTreeSpecies.Candlenut.addFamily(familyNuts) - .addFamily(familyJungle) - .setHeight(EnumAllele.Height.SMALLEST) - .setFertility(EnumAllele.Saplings.LOWEST) - .setYield(EnumAllele.Yield.LOW) + ExtraTreeSpecies.Candlenut.addFamily(familyNuts).addFamily(familyJungle).setHeight(EnumAllele.Height.SMALLEST) + .setFertility(EnumAllele.Saplings.LOWEST).setYield(EnumAllele.Yield.LOW) .setSappiness(EnumAllele.Sappiness.LOW); - ExtraTreeSpecies.DwarfHazel.addFamily(familyPrune) - .addFamily(familyNuts) - .setSaplingType(SaplingType.SHRUB) - .setFertility(EnumAllele.Saplings.AVERAGE) - .setSappiness(EnumAllele.Sappiness.LOWER) + ExtraTreeSpecies.DwarfHazel.addFamily(familyPrune).addFamily(familyNuts).setSaplingType(SaplingType.SHRUB) + .setFertility(EnumAllele.Saplings.AVERAGE).setSappiness(EnumAllele.Sappiness.LOWER) .setMaturation(EnumAllele.Maturation.FASTER); - ExtraTreeSpecies.Yew.setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.LARGE) + ExtraTreeSpecies.Yew.setLeafType(LeafType.CONIFER).setHeight(EnumAllele.Height.LARGE) .setSappiness(EnumAllele.Sappiness.LOWER); - ExtraTreeSpecies.Cypress.setLeafType(LeafType.CONIFER) - .setSaplingType(SaplingType.POPLAR) - .setHeight(EnumAllele.Height.LARGER) - .setFertility(EnumAllele.Saplings.LOW) - .setSappiness(EnumAllele.Sappiness.LOWER) - .setMaturation(EnumAllele.Maturation.SLOW); + ExtraTreeSpecies.Cypress.setLeafType(LeafType.CONIFER).setSaplingType(SaplingType.POPLAR) + .setHeight(EnumAllele.Height.LARGER).setFertility(EnumAllele.Saplings.LOW) + .setSappiness(EnumAllele.Sappiness.LOWER).setMaturation(EnumAllele.Maturation.SLOW); - ExtraTreeSpecies.DouglasFir.setLeafType(LeafType.CONIFER) - .setHeight(EnumAllele.Height.SMALLER) - .setFertility(EnumAllele.Saplings.LOW) - .setMaturation(EnumAllele.Maturation.SLOWER) - .setGirth(2); + ExtraTreeSpecies.DouglasFir.setLeafType(LeafType.CONIFER).setHeight(EnumAllele.Height.SMALLER) + .setFertility(EnumAllele.Saplings.LOW).setMaturation(EnumAllele.Maturation.SLOWER).setGirth(2); - ExtraTreeSpecies.Hemlock.setLeafType(LeafType.CONIFER) - .setGirth(2) - .setHeight(EnumAllele.Height.AVERAGE) - .setFertility(EnumAllele.Saplings.LOW) - .setMaturation(EnumAllele.Maturation.SLOWER); + ExtraTreeSpecies.Hemlock.setLeafType(LeafType.CONIFER).setGirth(2).setHeight(EnumAllele.Height.AVERAGE) + .setFertility(EnumAllele.Saplings.LOW).setMaturation(EnumAllele.Maturation.SLOWER); } // TODO unused method? @@ -1350,8 +900,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm @SideOnly(Side.CLIENT) public IIcon getGermlingIcon(EnumGermlingType type, int renderPass) { if (type == EnumGermlingType.POLLEN) { - return PluginArboriculture.items.pollenFertile.getIcon( - PluginArboriculture.items.pollenFertile.getItemStack(), renderPass); + return PluginArboriculture.items.pollenFertile + .getIcon(PluginArboriculture.items.pollenFertile.getItemStack(), renderPass); } return (renderPass == 0) ? saplingType.icon[1] : saplingType.icon[0]; } @@ -1370,10 +920,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm public void registerIcons(IIconRegister register) { for (SaplingType type : SaplingType.values()) { type.icon = new IIcon[2]; - type.icon[0] = ExtraTrees.proxy.getIcon( - register, "saplings/" + type.toString().toLowerCase() + ".trunk"); - type.icon[1] = ExtraTrees.proxy.getIcon( - register, "saplings/" + type.toString().toLowerCase() + ".leaves"); + type.icon[0] = ExtraTrees.proxy.getIcon(register, "saplings/" + type.toString().toLowerCase() + ".trunk"); + type.icon[1] = ExtraTrees.proxy.getIcon(register, "saplings/" + type.toString().toLowerCase() + ".leaves"); } } @@ -1410,8 +958,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm return 1.0f; } - for (Map.Entry entry : - getRoot().getResearchCatalysts().entrySet()) { + for (Map.Entry entry : getRoot().getResearchCatalysts().entrySet()) { if (entry.getKey().isItemEqual(itemstack)) { return entry.getValue(); } @@ -1427,8 +974,8 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm Collection combinations = getRoot().getCombinations(this); if (combinations.size() > 0) { IMutation[] candidates = combinations.toArray(new IMutation[0]); - research = AlleleManager.alleleRegistry.getMutationNoteStack( - researcher, candidates[world.rand.nextInt(candidates.length)]); + research = AlleleManager.alleleRegistry + .getMutationNoteStack(researcher, candidates[world.rand.nextInt(candidates.length)]); } } diff --git a/src/main/java/binnie/extratrees/genetics/FruitSprite.java b/src/main/java/binnie/extratrees/genetics/FruitSprite.java index e8e528e1..1033cf9f 100644 --- a/src/main/java/binnie/extratrees/genetics/FruitSprite.java +++ b/src/main/java/binnie/extratrees/genetics/FruitSprite.java @@ -1,15 +1,17 @@ package binnie.extratrees.genetics; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import binnie.Binnie; import binnie.core.resource.BinnieIcon; import binnie.extratrees.ExtraTrees; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IIconProvider; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public enum FruitSprite implements IIconProvider { + Tiny, Small, Average, @@ -36,7 +38,6 @@ public enum FruitSprite implements IIconProvider { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - icon = Binnie.Resource.getBlockIcon( - ExtraTrees.instance, "fruit/" + toString().toLowerCase()); + icon = Binnie.Resource.getBlockIcon(ExtraTrees.instance, "fruit/" + toString().toLowerCase()); } } diff --git a/src/main/java/binnie/extratrees/genetics/LeafType.java b/src/main/java/binnie/extratrees/genetics/LeafType.java index ad8c3d78..ade49619 100644 --- a/src/main/java/binnie/extratrees/genetics/LeafType.java +++ b/src/main/java/binnie/extratrees/genetics/LeafType.java @@ -1,6 +1,7 @@ package binnie.extratrees.genetics; public enum LeafType { + NORMAL((short) 10, (short) 11, (short) 12, "Deciduous"), CONIFER((short) 15, (short) 16, (short) 17, "Conifers"), JUNGLE((short) 20, (short) 21, (short) 22, "Jungle"), diff --git a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java index dfd345a8..7f2eb141 100644 --- a/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extratrees/genetics/ModuleGenetics.java @@ -1,26 +1,24 @@ package binnie.extratrees.genetics; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + 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; -import java.util.Locale; public class ModuleGenetics implements IInitializable { + protected String[] branches; protected List> classifications; public ModuleGenetics() { - branches = new String[] { - "Malus Maleae Amygdaloideae Rosaceae", - "Musa Musaceae Zingiberales Commelinids Angiosperms", - "Sorbus Maleae", - "Tsuga Pinaceae", - "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems" - }; + branches = new String[] { "Malus Maleae Amygdaloideae Rosaceae", + "Musa Musaceae Zingiberales Commelinids Angiosperms", "Sorbus Maleae", "Tsuga Pinaceae", + "Fraxinus Oleeae Oleaceae Lamiales Asterids Angiospems" }; classifications = new ArrayList<>(); } @@ -60,8 +58,8 @@ public class ModuleGenetics implements IInitializable { String uid = "trees." + species2.branchName.toLowerCase(); IClassification branch = AlleleManager.alleleRegistry.getClassification("genus." + uid); if (branch == null) { - branch = AlleleManager.alleleRegistry.createAndRegisterClassification( - IClassification.EnumClassLevel.GENUS, uid, scientific); + branch = AlleleManager.alleleRegistry + .createAndRegisterClassification(IClassification.EnumClassLevel.GENUS, uid, scientific); } (species2.branch = branch).addMemberSpecies(species2); } @@ -77,8 +75,9 @@ public class ModuleGenetics implements IInitializable { } for (ExtraTreeSpecies species : ExtraTreeSpecies.values()) { - IClassification branch = - getOrCreateClassification(IClassification.EnumClassLevel.GENUS, species.branchName); + IClassification branch = getOrCreateClassification( + IClassification.EnumClassLevel.GENUS, + species.branchName); branch.addMemberSpecies(species); species.branch = branch; IClassification clss = branch; @@ -99,7 +98,8 @@ public class ModuleGenetics implements IInitializable { } IClassification parent = getOrCreateClassification( - IClassification.EnumClassLevel.values()[currentLevel], nextLevel); + IClassification.EnumClassLevel.values()[currentLevel], + nextLevel); parent.addMemberGroup(clss); System.out.println("Went from " + clss.getScientific() + " to " + parent.getScientific()); clss = parent; diff --git a/src/main/java/binnie/extratrees/genetics/SaplingType.java b/src/main/java/binnie/extratrees/genetics/SaplingType.java index 9ea0746b..f8b01505 100644 --- a/src/main/java/binnie/extratrees/genetics/SaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/SaplingType.java @@ -3,6 +3,7 @@ package binnie.extratrees.genetics; import net.minecraft.util.IIcon; public enum SaplingType { + DEFAULT, JUNGLE, CONIFER, diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index a4dabbed..e8aadcd9 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -1,14 +1,17 @@ package binnie.extratrees.item; -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.item.IItemMisc; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; + public enum ExtraTreeItems implements IItemMisc { + CarpentryHammer("carpentryHammer"), Sawdust("sawdust"), Bark("bark"), diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java index f07b7dfd..bfe4eaed 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeLiquid.java @@ -1,15 +1,17 @@ package binnie.extratrees.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ILiquidType; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; public enum ExtraTreeLiquid implements ILiquidType { + Sap("sap", 0xbe7542), Resin("resin", 0xc96800), Latex("latex", 0xd8dbc9), @@ -69,8 +71,7 @@ public enum ExtraTreeLiquid implements ILiquidType { @Override public boolean showInCreative(FluidContainer container) { - return container == FluidContainer.Bucket - || container == FluidContainer.Can + return container == FluidContainer.Bucket || container == FluidContainer.Can || container == FluidContainer.Capsule; } diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index 690cea2c..ce98f71d 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -1,20 +1,23 @@ package binnie.extratrees.item; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.item.IItemMisc; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import forestry.api.recipes.RecipeManagers; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public enum Food implements IItemMisc { + Crabapple(2), Orange(4), Kumquat(2), @@ -192,7 +195,7 @@ public enum Food implements IItemMisc { public void addJuice(int time, int amount, int mulch) { RecipeManagers.squeezerManager.addRecipe( time, - new ItemStack[] {get(1)}, + new ItemStack[] { get(1) }, Binnie.Liquid.getLiquidStack("juice", amount), Mods.forestry.stack("mulch"), mulch); @@ -201,7 +204,7 @@ public enum Food implements IItemMisc { public void addOil(int time, int amount, int mulch) { RecipeManagers.squeezerManager.addRecipe( time, - new ItemStack[] {get(1)}, + new ItemStack[] { get(1) }, Binnie.Liquid.getLiquidStack("seedoil", amount), Mods.forestry.stack("mulch"), mulch); diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index cdf9bc09..6252ae06 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -1,12 +1,7 @@ package binnie.extratrees.item; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.core.ExtraTreesGUID; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.core.ExtraTreesGUID; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemDictionary extends Item { + protected IIcon iconMaster; public ItemDictionary() { @@ -56,19 +59,22 @@ public class ItemDictionary extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 0) { - ExtraTrees.proxy.openGui( - ExtraTreesGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); + ExtraTrees.proxy + .openGui(ExtraTreesGUID.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); } else { ExtraTrees.proxy.openGui( - ExtraTreesGUID.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); + ExtraTreesGUID.DatabaseNEI, + player, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } return stack; } @Override public String getItemStackDisplayName(ItemStack i) { - return (i.getItemDamage() == 0) - ? I18N.localise("extratrees.item.database") + return (i.getItemDamage() == 0) ? I18N.localise("extratrees.item.database") : I18N.localise("extratrees.item.masterDatabase"); } } diff --git a/src/main/java/binnie/extratrees/item/ItemFood.java b/src/main/java/binnie/extratrees/item/ItemFood.java index 6dcbc34c..e08f075d 100644 --- a/src/main/java/binnie/extratrees/item/ItemFood.java +++ b/src/main/java/binnie/extratrees/item/ItemFood.java @@ -1,10 +1,7 @@ package binnie.extratrees.item; -import binnie.core.item.IItemMisc; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -12,7 +9,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.item.IItemMisc; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemFood extends net.minecraft.item.ItemFood { + protected IItemMisc[] items; public ItemFood() { diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index eb3e7d83..9f31e700 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,17 +1,19 @@ package binnie.extratrees.item; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.api.IToolHammer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.api.IToolHammer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemHammer extends Item implements IToolHammer { + protected boolean isDurableHammer; public ItemHammer(boolean durable) { @@ -31,8 +33,7 @@ public class ItemHammer extends Item implements IToolHammer { @Override public String getItemStackDisplayName(ItemStack i) { - return isDurableHammer - ? I18N.localise("extratrees.item.masterCarpentryHammer") + return isDurableHammer ? I18N.localise("extratrees.item.masterCarpentryHammer") : I18N.localise("extratrees.item.carpentryHammer"); } diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index b95aee8e..978d33f3 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,12 +1,7 @@ package binnie.extratrees.item; -import binnie.core.util.I18N; -import binnie.extratrees.ExtraTrees; -import binnie.extratrees.core.ExtraTreesGUID; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.Tabs; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.core.util.I18N; +import binnie.extratrees.ExtraTrees; +import binnie.extratrees.core.ExtraTreesGUID; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.core.Tabs; + public class ItemMothDatabase extends Item { + protected IIcon iconMaster; public ItemMothDatabase() { @@ -57,18 +60,25 @@ public class ItemMothDatabase extends Item { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 0) { ExtraTrees.proxy.openGui( - ExtraTreesGUID.MothDatabase, player, (int) player.posX, (int) player.posY, (int) player.posZ); + ExtraTreesGUID.MothDatabase, + player, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } else { ExtraTrees.proxy.openGui( - ExtraTreesGUID.MothDatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); + ExtraTreesGUID.MothDatabaseNEI, + player, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } return stack; } @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) - ? I18N.localise("extratrees.item.mothDatabase") + return (stack.getItemDamage() == 0) ? I18N.localise("extratrees.item.mothDatabase") : I18N.localise("extratrees.item.mothMasterDatabase"); } } diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index acb793c3..a884aefd 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -1,5 +1,15 @@ package binnie.extratrees.item; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.IInitializable; @@ -13,17 +23,9 @@ import forestry.api.core.Tabs; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItems implements IInitializable { + @Override public void preInit() { ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture); @@ -100,40 +102,47 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ExtraTrees.itemDurableHammer, 1, 0), - "wiw", - " s ", - " s ", - 'w', - Blocks.obsidian, - 'i', - Items.gold_ingot, - 's', - Items.stick)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(ExtraTrees.itemDurableHammer, 1, 0), + "wiw", + " s ", + " s ", + 'w', + Blocks.obsidian, + 'i', + Items.gold_ingot, + 's', + Items.stick)); - GameRegistry.addRecipe(new ShapedOreRecipe( - new ItemStack(ExtraTrees.itemHammer, 1, 0), - "wiw", - " s ", - " s ", - 'w', - "plankWood", + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(ExtraTrees.itemHammer, 1, 0), + "wiw", + " s ", + " s ", + 'w', + "plankWood", + 'i', + Items.iron_ingot, + 's', + Items.stick)); + + GameRegistry + .addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.forestry.stack("oakStick")); + + GameRegistry.addRecipe( + ExtraTreeItems.GlassFitting.get(6), + "s s", + " i ", + "s s", 'i', Items.iron_ingot, 's', - Items.stick)); - - GameRegistry.addRecipe( - ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.forestry.stack("oakStick")); - - GameRegistry.addRecipe( - ExtraTreeItems.GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.iron_ingot, 's', Items.stick); + Items.stick); try { - Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds") - .getField("miniumShard") - .get(null); + Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null); GameRegistry.addRecipe(new ShapelessOreRecipe(Food.Papayimar.get(1), minium, "cropPapaya")); } catch (Exception ex) { // ignored @@ -203,19 +212,18 @@ public class ModuleItems implements IInitializable { Mods.forestry.stack("beeswax")); } - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.fluid.isFluidEqual(Binnie.Liquid.getLiquidStack("water", 0)) && data.fluid.amount == 1000) { - CraftingManager.getInstance() - .addRecipe( - Mods.forestry.stack("mulch"), - " b ", - "bwb", - " b ", - 'b', - ExtraTreeItems.Bark.get(1), - 'w', - data.filledContainer.copy()); + CraftingManager.getInstance().addRecipe( + Mods.forestry.stack("mulch"), + " b ", + "bwb", + " b ", + 'b', + ExtraTreeItems.Bark.get(1), + 'w', + data.filledContainer.copy()); } } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index c00244d7..5d63c9ca 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,5 +1,11 @@ package binnie.extratrees.machines; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.machines.IMachineType; @@ -17,13 +23,9 @@ import binnie.extratrees.machines.designer.PanelworkerPackage; import binnie.extratrees.machines.designer.TileworkerPackage; import binnie.extratrees.machines.designer.WoodworkerPackage; import binnie.extratrees.machines.lumbermill.LumbermillPackage; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public enum ExtraTreeMachine implements IMachineType { + Lumbermill(LumbermillPackage.class), Woodworker(WoodworkerPackage.class), Panelworker(PanelworkerPackage.class), @@ -54,6 +56,7 @@ public enum ExtraTreeMachine implements IMachineType { } public static class ComponentExtraTreeGUI extends MachineComponent implements IInteraction.RightClick { + protected ExtraTreesGUID id; public ComponentExtraTreeGUI(Machine machine, ExtraTreesGUID id) { @@ -68,6 +71,7 @@ public enum ExtraTreeMachine implements IMachineType { } public abstract static class PackageExtraTreeMachine extends MachinePackage { + protected BinnieResource textureName; protected PackageExtraTreeMachine(String uid, String textureName, boolean powered) { @@ -86,8 +90,8 @@ public enum ExtraTreeMachine implements IMachineType { } @Override - public void renderMachine( - Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick, + RenderBlocks renderer) { MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z, partialTick); } } diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java index 4f891ed2..84127f10 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererForestry.java @@ -1,12 +1,15 @@ package binnie.extratrees.machines; -import forestry.core.render.TankRenderInfo; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; + import net.minecraftforge.common.util.ForgeDirection; +import forestry.core.render.TankRenderInfo; + public class MachineRendererForestry { + static Map instances = new HashMap<>(); static Method renderMethod; diff --git a/src/main/java/binnie/extratrees/machines/ModuleMachine.java b/src/main/java/binnie/extratrees/machines/ModuleMachine.java index 76cedbd7..9fc5adc8 100644 --- a/src/main/java/binnie/extratrees/machines/ModuleMachine.java +++ b/src/main/java/binnie/extratrees/machines/ModuleMachine.java @@ -1,5 +1,9 @@ package binnie.extratrees.machines; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraftforge.oredict.ShapedOreRecipe; + import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.machines.MachineGroup; @@ -7,15 +11,16 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.core.Tabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { + @Override public void preInit() { - MachineGroup machineGroup = - new MachineGroup(ExtraTrees.instance, "machine", "machine", ExtraTreeMachine.values()); + MachineGroup machineGroup = new MachineGroup( + ExtraTrees.instance, + "machine", + "machine", + ExtraTreeMachine.values()); machineGroup.setCreativeTab(Tabs.tabArboriculture); ExtraTrees.blockMachine = machineGroup.getBlock(); } @@ -27,76 +32,70 @@ public class ModuleMachine implements IInitializable { @Override public void postInit() { - GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeMachine.Lumbermill.get(1), new Object[] { - "gAg", - "GsG", - "gPg", - 'G', - Blocks.glass, - 'g', - ExtraTreeItems.ProvenGear.get(1), - 'A', - Items.iron_axe, - 's', - Mods.forestry.stack("sturdyMachine"), - 'P', - "gearBronze" - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + ExtraTreeMachine.Lumbermill.get(1), + new Object[] { "gAg", "GsG", "gPg", 'G', Blocks.glass, 'g', ExtraTreeItems.ProvenGear.get(1), + 'A', Items.iron_axe, 's', Mods.forestry.stack("sturdyMachine"), 'P', "gearBronze" })); - GameRegistry.addRecipe(new ShapedOreRecipe( - ExtraTreeMachine.Woodworker.get(1), - "wGw", - "GsG", - "ggg", - 'G', - Blocks.glass, - 'g', - ExtraTreeItems.ProvenGear.get(1), - 'w', - Blocks.planks, - 's', - Mods.forestry.stack("impregnatedCasing"))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + ExtraTreeMachine.Woodworker.get(1), + "wGw", + "GsG", + "ggg", + 'G', + Blocks.glass, + 'g', + ExtraTreeItems.ProvenGear.get(1), + 'w', + Blocks.planks, + 's', + Mods.forestry.stack("impregnatedCasing"))); - GameRegistry.addRecipe(new ShapedOreRecipe( - ExtraTreeMachine.Panelworker.get(1), - "wGw", - "GsG", - "ggg", - 'G', - Blocks.glass, - 'g', - ExtraTreeItems.ProvenGear.get(1), - 'w', - Blocks.wooden_slab, - 's', - Mods.forestry.stack("impregnatedCasing"))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + ExtraTreeMachine.Panelworker.get(1), + "wGw", + "GsG", + "ggg", + 'G', + Blocks.glass, + 'g', + ExtraTreeItems.ProvenGear.get(1), + 'w', + Blocks.wooden_slab, + 's', + Mods.forestry.stack("impregnatedCasing"))); - GameRegistry.addRecipe(new ShapedOreRecipe( - ExtraTreeMachine.Glassworker.get(1), - "wGw", - "GsG", - "ggg", - 'G', - Blocks.glass, - 'g', - ExtraTreeItems.ProvenGear.get(1), - 'w', - Blocks.glass, - 's', - Mods.forestry.stack("impregnatedCasing"))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + ExtraTreeMachine.Glassworker.get(1), + "wGw", + "GsG", + "ggg", + 'G', + Blocks.glass, + 'g', + ExtraTreeItems.ProvenGear.get(1), + 'w', + Blocks.glass, + 's', + Mods.forestry.stack("impregnatedCasing"))); - GameRegistry.addRecipe(new ShapedOreRecipe( - ExtraTreeMachine.Tileworker.get(1), - "wGw", - "GsG", - "ggg", - 'G', - Blocks.glass, - 'g', - ExtraTreeItems.ProvenGear.get(1), - 'w', - Items.clay_ball, - 's', - Mods.forestry.stack("impregnatedCasing"))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + ExtraTreeMachine.Tileworker.get(1), + "wGw", + "GsG", + "ggg", + 'G', + Blocks.glass, + 'g', + ExtraTreeItems.ProvenGear.get(1), + 'w', + Items.clay_ball, + 's', + Mods.forestry.stack("impregnatedCasing"))); } } diff --git a/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java b/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java index 747082b8..f1dccdaa 100644 --- a/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java +++ b/src/main/java/binnie/extratrees/machines/designer/CarpenterPackage.java @@ -7,6 +7,7 @@ import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; public abstract class CarpenterPackage extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { + private DesignerType type; public CarpenterPackage(DesignerType type) { diff --git a/src/main/java/binnie/extratrees/machines/designer/Designer.java b/src/main/java/binnie/extratrees/machines/designer/Designer.java index daa8a91c..b9cacba0 100644 --- a/src/main/java/binnie/extratrees/machines/designer/Designer.java +++ b/src/main/java/binnie/extratrees/machines/designer/Designer.java @@ -1,6 +1,7 @@ package binnie.extratrees.machines.designer; public abstract class Designer { + public static final int GLUE_SLOT = 0; public static final int DESIGN_1_SLOT = 1; public static final int DESIGN_2_SLOT = 2; diff --git a/src/main/java/binnie/extratrees/machines/designer/DesignerType.java b/src/main/java/binnie/extratrees/machines/designer/DesignerType.java index e6cd406b..2f9bc4f5 100644 --- a/src/main/java/binnie/extratrees/machines/designer/DesignerType.java +++ b/src/main/java/binnie/extratrees/machines/designer/DesignerType.java @@ -1,5 +1,9 @@ package binnie.extratrees.machines.designer; +import java.util.Locale; + +import net.minecraft.item.ItemStack; + import binnie.botany.Botany; import binnie.botany.ceramic.CeramicDesignSystem; import binnie.core.util.I18N; @@ -12,10 +16,9 @@ import binnie.extratrees.carpentry.DesignSystem; import binnie.extratrees.carpentry.EnumDesign; import binnie.extratrees.carpentry.ModuleCarpentry; import binnie.extratrees.core.ExtraTreeTexture; -import java.util.Locale; -import net.minecraft.item.ItemStack; public enum DesignerType { + WOODWORKER(ExtraTreeTexture.carpenterTexture), PANELWORKER(ExtraTreeTexture.panelerTexture), GLASSWORKER(ExtraTreeTexture.panelerTexture), diff --git a/src/main/java/binnie/extratrees/machines/designer/GlassworkerPackage.java b/src/main/java/binnie/extratrees/machines/designer/GlassworkerPackage.java index a4d326bf..f8ba0ec4 100644 --- a/src/main/java/binnie/extratrees/machines/designer/GlassworkerPackage.java +++ b/src/main/java/binnie/extratrees/machines/designer/GlassworkerPackage.java @@ -1,6 +1,7 @@ package binnie.extratrees.machines.designer; public class GlassworkerPackage extends CarpenterPackage { + public GlassworkerPackage() { super(DesignerType.GLASSWORKER); } diff --git a/src/main/java/binnie/extratrees/machines/designer/PanelworkerPackage.java b/src/main/java/binnie/extratrees/machines/designer/PanelworkerPackage.java index 6d87e6ed..e93b7ba5 100644 --- a/src/main/java/binnie/extratrees/machines/designer/PanelworkerPackage.java +++ b/src/main/java/binnie/extratrees/machines/designer/PanelworkerPackage.java @@ -1,6 +1,7 @@ package binnie.extratrees.machines.designer; public class PanelworkerPackage extends CarpenterPackage { + public PanelworkerPackage() { super(DesignerType.PANELWORKER); } diff --git a/src/main/java/binnie/extratrees/machines/designer/PlanksSlotValidator.java b/src/main/java/binnie/extratrees/machines/designer/PlanksSlotValidator.java index 7629cb05..9a27cd76 100644 --- a/src/main/java/binnie/extratrees/machines/designer/PlanksSlotValidator.java +++ b/src/main/java/binnie/extratrees/machines/designer/PlanksSlotValidator.java @@ -1,10 +1,12 @@ package binnie.extratrees.machines.designer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.extratrees.api.IDesignMaterial; -import net.minecraft.item.ItemStack; public class PlanksSlotValidator extends SlotValidator { + protected DesignerType type; public PlanksSlotValidator(DesignerType type) { diff --git a/src/main/java/binnie/extratrees/machines/designer/PolishSlotValidator.java b/src/main/java/binnie/extratrees/machines/designer/PolishSlotValidator.java index f233d871..bbfc2596 100644 --- a/src/main/java/binnie/extratrees/machines/designer/PolishSlotValidator.java +++ b/src/main/java/binnie/extratrees/machines/designer/PolishSlotValidator.java @@ -1,11 +1,13 @@ package binnie.extratrees.machines.designer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.inventory.ValidatorIcon; import binnie.extratrees.ExtraTrees; -import net.minecraft.item.ItemStack; public class PolishSlotValidator extends SlotValidator { + protected DesignerType type; public PolishSlotValidator(DesignerType type) { diff --git a/src/main/java/binnie/extratrees/machines/designer/TileworkerPackage.java b/src/main/java/binnie/extratrees/machines/designer/TileworkerPackage.java index 086cd9ae..d539d1a3 100644 --- a/src/main/java/binnie/extratrees/machines/designer/TileworkerPackage.java +++ b/src/main/java/binnie/extratrees/machines/designer/TileworkerPackage.java @@ -1,6 +1,7 @@ package binnie.extratrees.machines.designer; public class TileworkerPackage extends CarpenterPackage { + public TileworkerPackage() { super(DesignerType.TILEWORKER); } diff --git a/src/main/java/binnie/extratrees/machines/designer/WoodworkerPackage.java b/src/main/java/binnie/extratrees/machines/designer/WoodworkerPackage.java index 289568dc..512af7ba 100644 --- a/src/main/java/binnie/extratrees/machines/designer/WoodworkerPackage.java +++ b/src/main/java/binnie/extratrees/machines/designer/WoodworkerPackage.java @@ -1,6 +1,7 @@ package binnie.extratrees.machines.designer; public class WoodworkerPackage extends CarpenterPackage { + public WoodworkerPackage() { super(DesignerType.WOODWORKER); } diff --git a/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java b/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java index 3b1f4591..1278c242 100644 --- a/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java +++ b/src/main/java/binnie/extratrees/machines/designer/WoodworkerRecipeComponent.java @@ -1,5 +1,13 @@ package binnie.extratrees.machines.designer; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.machines.Machine; import binnie.core.machines.component.ComponentRecipe; import binnie.core.machines.component.IComponentRecipe; @@ -12,15 +20,10 @@ import binnie.extratrees.api.IDesign; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.carpentry.EnumDesign; import cpw.mods.fml.relauncher.Side; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class WoodworkerRecipeComponent extends ComponentRecipe implements IComponentRecipe, INetwork.GuiNBT, IErrorStateSource { + public DesignerType type; private IDesign design; @@ -103,14 +106,14 @@ public class WoodworkerRecipeComponent extends ComponentRecipe playerInv.setItemStack(doRecipe(true)); } else if (playerInv.getItemStack().isItemEqual(recipe) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), recipe)) { - int fit = recipe.getMaxStackSize() - (recipe.stackSize + playerInv.getItemStack().stackSize); - if (fit >= 0) { - ItemStack doRecipe; - ItemStack rec = doRecipe = doRecipe(true); - doRecipe.stackSize += playerInv.getItemStack().stackSize; - playerInv.setItemStack(rec); - } - } + int fit = recipe.getMaxStackSize() - (recipe.stackSize + playerInv.getItemStack().stackSize); + if (fit >= 0) { + ItemStack doRecipe; + ItemStack rec = doRecipe = doRecipe(true); + doRecipe.stackSize += playerInv.getItemStack().stackSize; + playerInv.setItemStack(rec); + } + } player.openContainer.detectAndSendChanges(); if (player instanceof EntityPlayerMP) { @@ -125,7 +128,8 @@ public class WoodworkerRecipeComponent extends ComponentRecipe public ErrorState canWork() { if (getUtil().isSlotEmpty(Designer.GLUE_SLOT)) { return new ErrorState.NoItem( - I18N.localise("extratrees.machine.worker.error.glueRequired"), Designer.GLUE_SLOT); + I18N.localise("extratrees.machine.worker.error.glueRequired"), + Designer.GLUE_SLOT); } return null; } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LogSlotValidator.java b/src/main/java/binnie/extratrees/machines/lumbermill/LogSlotValidator.java index 2d226e04..78f0f338 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LogSlotValidator.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LogSlotValidator.java @@ -1,11 +1,13 @@ package binnie.extratrees.machines.lumbermill; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.util.I18N; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.util.I18N; + public class LogSlotValidator extends SlotValidator { + public LogSlotValidator() { super(SlotValidator.IconBlock); } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java b/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java index a0d2b8d5..9978b291 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java @@ -1,19 +1,22 @@ package binnie.extratrees.machines.lumbermill; -import binnie.extratrees.block.IPlankType; -import binnie.extratrees.block.WoodManager; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapelessOreRecipe; +import binnie.extratrees.block.IPlankType; +import binnie.extratrees.block.WoodManager; + public class Lumbermill { + public static final int SLOT_WOOD = 0; public static final int SLOT_PLANKS = 1; public static final int SLOT_BARK = 2; @@ -71,8 +74,7 @@ public class Lumbermill { } ItemStack input = recipe2.recipeItems[0]; - if (recipe2.getRecipeOutput() != null - && recipe2.getRecipeOutput().isItemEqual(output)) { + if (recipe2.getRecipeOutput() != null && recipe2.getRecipeOutput().isItemEqual(output)) { list.add(input); } } @@ -84,8 +86,7 @@ public class Lumbermill { } ItemStack input = (ItemStack) recipe3.getInput().get(0); - if (recipe3.getRecipeOutput() == null - || !recipe3.getRecipeOutput().isItemEqual(output)) { + if (recipe3.getRecipeOutput() == null || !recipe3.getRecipeOutput().isItemEqual(output)) { continue; } list.add(input); diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java index 5a989a5e..4984a223 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillComponentLogic.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines.lumbermill; +import net.minecraft.item.ItemStack; + import binnie.core.item.ItemMisc; import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; @@ -8,9 +10,9 @@ import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; import binnie.extratrees.item.ExtraTreeItems; -import net.minecraft.item.ItemStack; public class LumbermillComponentLogic extends ComponentProcessSetCost implements IProcess { + public LumbermillComponentLogic(Machine machine) { super(machine, Lumbermill.RF_COST, Lumbermill.TIME_PERIOD); } @@ -19,7 +21,8 @@ public class LumbermillComponentLogic extends ComponentProcessSetCost implements public ErrorState canWork() { if (getUtil().isSlotEmpty(Lumbermill.SLOT_WOOD)) { return new ErrorState.NoItem( - I18N.localise("extratrees.machine.lumbermill.error.noWood"), Lumbermill.SLOT_WOOD); + I18N.localise("extratrees.machine.lumbermill.error.noWood"), + Lumbermill.SLOT_WOOD); } ItemStack result = Lumbermill.getPlankProduct(getUtil().getStack(Lumbermill.SLOT_WOOD)); @@ -28,7 +31,8 @@ public class LumbermillComponentLogic extends ComponentProcessSetCost implements if (!result.isItemEqual(currentPlank) || result.stackSize + currentPlank.stackSize > currentPlank.getMaxStackSize()) { return new ErrorState.NoSpace( - I18N.localise("extratrees.machine.lumbermill.error.noRoom"), Lumbermill.SLOT_PLANKS); + I18N.localise("extratrees.machine.lumbermill.error.noRoom"), + Lumbermill.SLOT_PLANKS); } } return super.canWork(); @@ -38,7 +42,8 @@ public class LumbermillComponentLogic extends ComponentProcessSetCost implements public ErrorState canProgress() { if (!getUtil().liquidInTank(Lumbermill.TANK_WATER, 5)) { return new ErrorState.InsufficientLiquid( - I18N.localise("extratrees.machine.lumbermill.error.noWater"), Lumbermill.TANK_WATER); + I18N.localise("extratrees.machine.lumbermill.error.noWater"), + Lumbermill.TANK_WATER); } return super.canProgress(); } @@ -51,9 +56,9 @@ public class LumbermillComponentLogic extends ComponentProcessSetCost implements } getUtil().addStack(Lumbermill.SLOT_PLANKS, result); - getUtil() - .addStack( - Lumbermill.SLOT_SAWDUST, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Sawdust, 1)); + getUtil().addStack( + Lumbermill.SLOT_SAWDUST, + ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Sawdust, 1)); getUtil().addStack(Lumbermill.SLOT_BARK, ((ItemMisc) ExtraTrees.itemMisc).getStack(ExtraTreeItems.Bark, 1)); getUtil().decreaseStack(Lumbermill.SLOT_WOOD, 1); } diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java index 29dfc7a1..a8b76632 100644 --- a/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java +++ b/src/main/java/binnie/extratrees/machines/lumbermill/LumbermillPackage.java @@ -1,5 +1,7 @@ package binnie.extratrees.machines.lumbermill; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -12,9 +14,9 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.machines.ExtraTreeMachine; -import net.minecraft.tileentity.TileEntity; public class LumbermillPackage extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation { + public LumbermillPackage() { super("lumbermill", ExtraTreeTexture.lumbermillTexture, true); } diff --git a/src/main/java/binnie/extratrees/nei/IMCForNEI.java b/src/main/java/binnie/extratrees/nei/IMCForNEI.java index 46e73f0c..30653ac3 100644 --- a/src/main/java/binnie/extratrees/nei/IMCForNEI.java +++ b/src/main/java/binnie/extratrees/nei/IMCForNEI.java @@ -1,9 +1,11 @@ package binnie.extratrees.nei; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.event.FMLInterModComms; + public class IMCForNEI { + public static void IMCSender() { sendHandler("binnie.extratrees.nei.NEIHandlerLumbermill", "ExtraTrees:machine:0"); diff --git a/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java b/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java index 04db97dd..fe3b63a8 100644 --- a/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java +++ b/src/main/java/binnie/extratrees/nei/NEIExtraTreesConfig.java @@ -6,6 +6,7 @@ import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; public class NEIExtraTreesConfig implements IConfigureNEI { + protected static void registerHandler(RecipeHandlerBase handler) { handler.prepare(); API.registerRecipeHandler(handler); diff --git a/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java b/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java index f771cf07..b409024c 100644 --- a/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java +++ b/src/main/java/binnie/extratrees/nei/NEIHandlerLumbermill.java @@ -1,5 +1,14 @@ package binnie.extratrees.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; @@ -9,13 +18,6 @@ import binnie.extratrees.machines.lumbermill.Lumbermill; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; public class NEIHandlerLumbermill extends RecipeHandlerBase { @@ -87,16 +89,18 @@ public class NEIHandlerLumbermill extends RecipeHandlerBase { public void loadUsageRecipes(ItemStack ingredient) { for (Map.Entry entry : Lumbermill.recipes.entrySet()) { if (NEIServerUtils.areStacksSameTypeCrafting(entry.getKey(), ingredient)) { - this.arecipes.add( - new CachedLumbermillRecipe(entry.getKey(), Lumbermill.getPlankProduct(entry.getKey()))); + this.arecipes + .add(new CachedLumbermillRecipe(entry.getKey(), Lumbermill.getPlankProduct(entry.getKey()))); } } } public class CachedLumbermillRecipe extends CachedBaseRecipe { - public PositionedFluidTank waterTank = - new PositionedFluidTank(Binnie.Liquid.getLiquidStack("water", 300), 1000, new Rectangle(28, 6, 16, 58)); + public PositionedFluidTank waterTank = new PositionedFluidTank( + Binnie.Liquid.getLiquidStack("water", 300), + 1000, + new Rectangle(28, 6, 16, 58)); public PositionedStack bark = new PositionedStack(ExtraTreeItems.Sawdust.get(1), 123, 6); public PositionedStack sawDust = new PositionedStack(ExtraTreeItems.Bark.get(1), 123, 48); public PositionedStack wood; diff --git a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java b/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java index f9f12246..817d9923 100644 --- a/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java +++ b/src/main/java/binnie/extratrees/proxy/IExtraTreeProxy.java @@ -2,4 +2,5 @@ package binnie.extratrees.proxy; import binnie.core.proxy.IProxyCore; -public interface IExtraTreeProxy extends IProxyCore {} +public interface IExtraTreeProxy extends IProxyCore { +} diff --git a/src/main/java/binnie/extratrees/proxy/Proxy.java b/src/main/java/binnie/extratrees/proxy/Proxy.java index 5ad231d9..664b3826 100644 --- a/src/main/java/binnie/extratrees/proxy/Proxy.java +++ b/src/main/java/binnie/extratrees/proxy/Proxy.java @@ -4,6 +4,7 @@ import binnie.core.proxy.BinnieModProxy; import binnie.extratrees.ExtraTrees; public class Proxy extends BinnieModProxy implements IExtraTreeProxy { + public Proxy() { super(ExtraTrees.instance); } diff --git a/src/main/java/binnie/extratrees/proxy/ProxyClient.java b/src/main/java/binnie/extratrees/proxy/ProxyClient.java index b8d2da30..23325722 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyClient.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyClient.java @@ -4,6 +4,7 @@ import binnie.extratrees.genetics.FruitSprite; import forestry.api.core.ForestryAPI; public class ProxyClient extends Proxy implements IExtraTreeProxy { + @Override public void init() { ForestryAPI.textureManager.registerIconProvider(FruitSprite.Average); diff --git a/src/main/java/binnie/extratrees/proxy/ProxyServer.java b/src/main/java/binnie/extratrees/proxy/ProxyServer.java index 7ebcf7f9..bce8deda 100644 --- a/src/main/java/binnie/extratrees/proxy/ProxyServer.java +++ b/src/main/java/binnie/extratrees/proxy/ProxyServer.java @@ -1,3 +1,4 @@ package binnie.extratrees.proxy; -public class ProxyServer extends Proxy implements IExtraTreeProxy {} +public class ProxyServer extends Proxy implements IExtraTreeProxy { +} diff --git a/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java b/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java index d2e2ae35..d0a500c7 100644 --- a/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java +++ b/src/main/java/binnie/extratrees/village/ComponentVillageGrove.java @@ -1,55 +1,40 @@ package binnie.extratrees.village; -import forestry.apiculture.worldgen.ComponentVillageBeeHouse; import java.util.List; import java.util.Random; + import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; +import forestry.apiculture.worldgen.ComponentVillageBeeHouse; + public class ComponentVillageGrove extends StructureVillagePieces.Village { + public ComponentVillageGrove() {} - public ComponentVillageGrove( - StructureVillagePieces.Start start, - int type, - Random rand, - StructureBoundingBox boundingBox, - int coordBaseMode) { + public ComponentVillageGrove(StructureVillagePieces.Start start, int type, Random rand, + StructureBoundingBox boundingBox, int coordBaseMode) { super(start, type); this.coordBaseMode = coordBaseMode; this.boundingBox = boundingBox; } - public static StructureBoundingBox func_74904_a( - StructureVillagePieces.Start start, - List pieces, - Random rand, - int p_74904_3_, - int p_74904_4_, - int p_74904_5_, - int p_74904_6_) { - StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox( - p_74904_3_, p_74904_4_, p_74904_5_, 0, 0, 0, 3, 3, 3, p_74904_6_); - return (StructureComponent.findIntersecting(pieces, structureboundingbox) != null) - ? null + public static StructureBoundingBox func_74904_a(StructureVillagePieces.Start start, List pieces, Random rand, + int p_74904_3_, int p_74904_4_, int p_74904_5_, int p_74904_6_) { + StructureBoundingBox structureboundingbox = StructureBoundingBox + .getComponentToAddBoundingBox(p_74904_3_, p_74904_4_, p_74904_5_, 0, 0, 0, 3, 3, 3, p_74904_6_); + return (StructureComponent.findIntersecting(pieces, structureboundingbox) != null) ? null : structureboundingbox; } - public static ComponentVillageBeeHouse buildComponent( - StructureVillagePieces.Start startPiece, - List par1List, - Random random, - int par3, - int par4, - int par5, - int par6, - int par7) { + public static ComponentVillageBeeHouse buildComponent(StructureVillagePieces.Start startPiece, List par1List, + Random random, int par3, int par4, int par5, int par6, int par7) { System.out.println("GROVE1"); - StructureBoundingBox bbox = - StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 9, 10, par6); + StructureBoundingBox bbox = StructureBoundingBox + .getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 9, 10, par6); return (canVillageGoDeeper(bbox) && StructureComponent.findIntersecting(par1List, bbox) == null) ? new ComponentVillageBeeHouse(startPiece, par7, random, bbox, par6) : null; diff --git a/src/main/java/binnie/extratrees/worldgen/BlockType.java b/src/main/java/binnie/extratrees/worldgen/BlockType.java index de75c43b..0cb6cfe8 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockType.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockType.java @@ -1,10 +1,12 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; import net.minecraft.block.Block; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; + public class BlockType { + protected int meta; protected Block block; diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java index bbc65247..3f426f1d 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLeaf.java @@ -1,11 +1,13 @@ package binnie.extratrees.worldgen; +import net.minecraft.world.World; + import binnie.core.Mods; import binnie.extratrees.ExtraTrees; import forestry.api.world.ITreeGenData; -import net.minecraft.world.World; public class BlockTypeLeaf extends BlockType { + public BlockTypeLeaf(boolean decay) { super(decay ? Mods.forestry.block("leaves") : ExtraTrees.blockShrubLeaves, 0); } diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java index 899e9db8..159f21f6 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeLog.java @@ -1,10 +1,12 @@ package binnie.extratrees.worldgen; +import net.minecraft.world.World; + import binnie.extratrees.block.ILogType; import forestry.api.world.ITreeGenData; -import net.minecraft.world.World; public class BlockTypeLog extends BlockType { + protected ILogType log; public BlockTypeLog(ILogType log) { diff --git a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java index 6ece11a3..6efd6b0f 100644 --- a/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java +++ b/src/main/java/binnie/extratrees/worldgen/BlockTypeVoid.java @@ -1,9 +1,11 @@ package binnie.extratrees.worldgen; -import forestry.api.world.ITreeGenData; import net.minecraft.world.World; +import forestry.api.world.ITreeGenData; + public class BlockTypeVoid extends BlockType { + public BlockTypeVoid() { super(null, 0); } diff --git a/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java b/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java index af367bde..967846aa 100644 --- a/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java +++ b/src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java @@ -1,7 +1,14 @@ package binnie.extratrees.worldgen; +import net.minecraft.block.Block; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.extratrees.genetics.ExtraTreeSpecies; + import com.mojang.authlib.GameProfile; + import forestry.api.arboriculture.ITreeGenerator; import forestry.api.arboriculture.ITreeGenome; import forestry.api.world.ITreeGenData; @@ -10,12 +17,9 @@ import forestry.arboriculture.genetics.Tree; import forestry.arboriculture.tiles.TileLeaves; import forestry.core.config.Constants; import forestry.plugins.PluginArboriculture; -import net.minecraft.block.Block; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.util.ForgeDirection; public class DefaultTreeGenerator implements ITreeGenerator { + private ExtraTreeSpecies extraTreeSpecies; public DefaultTreeGenerator(ExtraTreeSpecies extraTreeSpecies) { @@ -31,8 +35,8 @@ public class DefaultTreeGenerator implements ITreeGenerator { @Override public void setLeaves(ITreeGenome genome, World world, GameProfile owner, int x, int y, int z, boolean decorative) { - boolean placed = - world.setBlock(x, y, z, PluginArboriculture.blocks.leaves, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); + boolean placed = world + .setBlock(x, y, z, PluginArboriculture.blocks.leaves, 0, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE); if (!placed) { return; } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenAcornOak.java b/src/main/java/binnie/extratrees/worldgen/WorldGenAcornOak.java index 005a5d30..47d2faf3 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenAcornOak.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenAcornOak.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenAcornOak extends WorldGenTree { + public WorldGenAcornOak(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenAspen.java b/src/main/java/binnie/extratrees/worldgen/WorldGenAspen.java index 3275a6e0..c4ba714d 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenAspen.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenAspen.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenAspen extends WorldGenTree { + public WorldGenAspen(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBalsamFir.java b/src/main/java/binnie/extratrees/worldgen/WorldGenBalsamFir.java index 9dfc9389..65debec8 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenBalsamFir.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenBalsamFir.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenBalsamFir extends WorldGenTree { + public WorldGenBalsamFir(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBanana.java b/src/main/java/binnie/extratrees/worldgen/WorldGenBanana.java index a99227ff..0713f093 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenBanana.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenBanana.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenBanana extends WorldGenTree { + public WorldGenBanana(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBox.java b/src/main/java/binnie/extratrees/worldgen/WorldGenBox.java index 7d1b255a..cd618af5 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenBox.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenBox.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenBox extends WorldGenTree { + public WorldGenBox(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilNut.java b/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilNut.java index e16236f6..b440cf46 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilNut.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilNut.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenBrazilNut extends WorldGenTree { + public WorldGenBrazilNut(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilwood.java b/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilwood.java index 1a51e9f9..0b977327 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilwood.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenBrazilwood.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenBrazilwood extends WorldGenTree { + public WorldGenBrazilwood(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenButternut.java b/src/main/java/binnie/extratrees/worldgen/WorldGenButternut.java index cdb9e982..d24c0647 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenButternut.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenButternut.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenButternut extends WorldGenTree { + public WorldGenButternut(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCedar.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCedar.java index 92666eb3..f9fcdaca 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCedar.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCedar.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCedar extends WorldGenTree { + public WorldGenCedar(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenClove.java b/src/main/java/binnie/extratrees/worldgen/WorldGenClove.java index 08c92016..794756e9 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenClove.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenClove.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenClove extends WorldGenTree { + public WorldGenClove(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCoconut.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCoconut.java index d12ee358..e18e045f 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCoconut.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCoconut.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCoconut extends WorldGenTree { + public WorldGenCoconut(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCoffee.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCoffee.java index 632919ab..31f6b615 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCoffee.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCoffee.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCoffee extends WorldGenTree { + public WorldGenCoffee(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAlder.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAlder.java index 08cdf28f..4a3a443c 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAlder.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAlder.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCommonAlder extends WorldGenTree { + public WorldGenCommonAlder(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAsh.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAsh.java index 7896c007..98feecf9 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAsh.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCommonAsh.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCommonAsh extends WorldGenTree { + public WorldGenCommonAsh(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCommonBeech.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCommonBeech.java index 710a3050..bf76e616 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCommonBeech.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCommonBeech.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCommonBeech extends WorldGenTree { + public WorldGenCommonBeech(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCopperBeech.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCopperBeech.java index 1919bbfe..ff68001b 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCopperBeech.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCopperBeech.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCopperBeech extends WorldGenCommonBeech { + public WorldGenCopperBeech(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenCypress.java b/src/main/java/binnie/extratrees/worldgen/WorldGenCypress.java index bda26539..4d061eac 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenCypress.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenCypress.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenCypress extends WorldGenTree { + public WorldGenCypress(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java b/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java index d345381c..31cd3011 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenDefault.java @@ -4,6 +4,7 @@ import binnie.extratrees.genetics.ExtraTreeSpecies; import forestry.api.world.ITreeGenData; public class WorldGenDefault extends WorldGenTree { + public WorldGenDefault(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenDouglasFir.java b/src/main/java/binnie/extratrees/worldgen/WorldGenDouglasFir.java index 23ce45d2..63bc75df 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenDouglasFir.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenDouglasFir.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenDouglasFir extends WorldGenTree { + public WorldGenDouglasFir(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenElder.java b/src/main/java/binnie/extratrees/worldgen/WorldGenElder.java index 03e92a39..893284d6 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenElder.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenElder.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenElder extends WorldGenTree { + public WorldGenElder(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenElm.java b/src/main/java/binnie/extratrees/worldgen/WorldGenElm.java index edcfe69d..b086d2e1 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenElm.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenElm.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenElm extends WorldGenTree { + public WorldGenElm(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenFloweringCrabapple.java b/src/main/java/binnie/extratrees/worldgen/WorldGenFloweringCrabapple.java index 8d9f64b5..30e5a29a 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenFloweringCrabapple.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenFloweringCrabapple.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenFloweringCrabapple extends WorldGenTree { + public WorldGenFloweringCrabapple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenGingko.java b/src/main/java/binnie/extratrees/worldgen/WorldGenGingko.java index 86ffe211..b2bd26db 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenGingko.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenGingko.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenGingko extends WorldGenTree { + public WorldGenGingko(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenHawthorn.java b/src/main/java/binnie/extratrees/worldgen/WorldGenHawthorn.java index de653e9b..be78c04b 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenHawthorn.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenHawthorn.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenHawthorn extends WorldGenTree { + public WorldGenHawthorn(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenHazel.java b/src/main/java/binnie/extratrees/worldgen/WorldGenHazel.java index 70b3dfd1..23eae568 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenHazel.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenHazel.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenHazel extends WorldGenTree { + public WorldGenHazel(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenHolly.java b/src/main/java/binnie/extratrees/worldgen/WorldGenHolly.java index b59ecc83..b8f4b244 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenHolly.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenHolly.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenHolly extends WorldGenTree { + public WorldGenHolly(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenHornbeam.java b/src/main/java/binnie/extratrees/worldgen/WorldGenHornbeam.java index 759a41b8..54af6a90 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenHornbeam.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenHornbeam.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenHornbeam extends WorldGenTree { + public WorldGenHornbeam(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenIroko.java b/src/main/java/binnie/extratrees/worldgen/WorldGenIroko.java index 436d41a5..19ac7234 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenIroko.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenIroko.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenIroko extends WorldGenTree { + public WorldGenIroko(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenLazy.java b/src/main/java/binnie/extratrees/worldgen/WorldGenLazy.java index 44b4843b..9084a2ff 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenLazy.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenLazy.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenLazy extends WorldGenTree { + public WorldGenLazy(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenLoblollyPine.java b/src/main/java/binnie/extratrees/worldgen/WorldGenLoblollyPine.java index e13c8dbe..90d126bc 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenLoblollyPine.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenLoblollyPine.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenLoblollyPine extends WorldGenTree { + public WorldGenLoblollyPine(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenLocust.java b/src/main/java/binnie/extratrees/worldgen/WorldGenLocust.java index b456cd99..8879d1bb 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenLocust.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenLocust.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenLocust extends WorldGenTree { + public WorldGenLocust(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenLogwood.java b/src/main/java/binnie/extratrees/worldgen/WorldGenLogwood.java index d1500015..2342e00f 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenLogwood.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenLogwood.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenLogwood extends WorldGenTree { + public WorldGenLogwood(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenMango.java b/src/main/java/binnie/extratrees/worldgen/WorldGenMango.java index 09aa2c0f..91271859 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenMango.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenMango.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenMango extends WorldGenTree { + public WorldGenMango(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenMonkeyPuzzle.java b/src/main/java/binnie/extratrees/worldgen/WorldGenMonkeyPuzzle.java index 79b3b9d5..d45f32c1 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenMonkeyPuzzle.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenMonkeyPuzzle.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenMonkeyPuzzle extends WorldGenTree { + public WorldGenMonkeyPuzzle(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenOldFustic.java b/src/main/java/binnie/extratrees/worldgen/WorldGenOldFustic.java index c589b212..f4173db0 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenOldFustic.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenOldFustic.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenOldFustic extends WorldGenTree { + public WorldGenOldFustic(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenOlive.java b/src/main/java/binnie/extratrees/worldgen/WorldGenOlive.java index 6f9ee0d1..ad890ea3 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenOlive.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenOlive.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenOlive extends WorldGenTree { + public WorldGenOlive(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenOrchardApple.java b/src/main/java/binnie/extratrees/worldgen/WorldGenOrchardApple.java index 5192cb8a..6af0436d 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenOrchardApple.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenOrchardApple.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenOrchardApple extends WorldGenTree { + public WorldGenOrchardApple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenOsangeOsange.java b/src/main/java/binnie/extratrees/worldgen/WorldGenOsangeOsange.java index 97ced63c..7cf1448e 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenOsangeOsange.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenOsangeOsange.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenOsangeOsange extends WorldGenTree { + public WorldGenOsangeOsange(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenPear.java b/src/main/java/binnie/extratrees/worldgen/WorldGenPear.java index 4a370343..babaef10 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenPear.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenPear.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenPear extends WorldGenTree { + public WorldGenPear(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenPecan.java b/src/main/java/binnie/extratrees/worldgen/WorldGenPecan.java index 0f4553bb..fc312bbd 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenPecan.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenPecan.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenPecan extends WorldGenTree { + public WorldGenPecan(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenPrairieCrabapple.java b/src/main/java/binnie/extratrees/worldgen/WorldGenPrairieCrabapple.java index 9009c85b..dd8248c3 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenPrairieCrabapple.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenPrairieCrabapple.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenPrairieCrabapple extends WorldGenTree { + public WorldGenPrairieCrabapple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenPurpleheart.java b/src/main/java/binnie/extratrees/worldgen/WorldGenPurpleheart.java index 77c58765..73af0f13 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenPurpleheart.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenPurpleheart.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenPurpleheart extends WorldGenTree { + public WorldGenPurpleheart(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenRainbowGum.java b/src/main/java/binnie/extratrees/worldgen/WorldGenRainbowGum.java index a944c683..8f3e1425 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenRainbowGum.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenRainbowGum.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenRainbowGum extends WorldGenTree { + public WorldGenRainbowGum(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java b/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java index 1a6375cb..ab4dfc96 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenRedMaple.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenRedMaple extends WorldGenTree { + public WorldGenRedMaple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenRoseGum.java b/src/main/java/binnie/extratrees/worldgen/WorldGenRoseGum.java index 556bf46e..638934e7 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenRoseGum.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenRoseGum.java @@ -4,6 +4,7 @@ import binnie.extratrees.block.ILogType; import forestry.api.world.ITreeGenData; public class WorldGenRoseGum extends WorldGenTree { + public WorldGenRoseGum(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenRosewood.java b/src/main/java/binnie/extratrees/worldgen/WorldGenRosewood.java index 70980244..d0ae11bf 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenRosewood.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenRosewood.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenRosewood extends WorldGenTree { + public WorldGenRosewood(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenRowan.java b/src/main/java/binnie/extratrees/worldgen/WorldGenRowan.java index 25f9775f..86b6ee2c 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenRowan.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenRowan.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenRowan extends WorldGenTree { + public WorldGenRowan(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenSallow.java b/src/main/java/binnie/extratrees/worldgen/WorldGenSallow.java index ae96e648..7cfc74ec 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenSallow.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenSallow.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenSallow extends WorldGenTree { + public WorldGenSallow(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenShrub.java b/src/main/java/binnie/extratrees/worldgen/WorldGenShrub.java index 51728483..2b487566 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenShrub.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenShrub.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenShrub extends WorldGenTree { + public WorldGenShrub(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenSilverFir.java b/src/main/java/binnie/extratrees/worldgen/WorldGenSilverFir.java index fc5bce0e..17fd29c3 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenSilverFir.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenSilverFir.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenSilverFir extends WorldGenTree { + public WorldGenSilverFir(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenSwampGum.java b/src/main/java/binnie/extratrees/worldgen/WorldGenSwampGum.java index 44787a0b..514c2f64 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenSwampGum.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenSwampGum.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenSwampGum extends WorldGenTree { + public WorldGenSwampGum(ITreeGenData tree) { super(tree); } @@ -34,7 +35,10 @@ public class WorldGenSwampGum extends WorldGenTree { generateCylinder(new Vector(0.0f, leafSpawn--, 0.0f), 0.5f * width, 1, leaf, false); for (int i = 0; i < 5; ++i) { generateSphere( - new Vector(randBetween(-1, 1), leafSpawn--, randBetween(-1, 1)), randBetween(1, 2), leaf, false); + new Vector(randBetween(-1, 1), leafSpawn--, randBetween(-1, 1)), + randBetween(1, 2), + leaf, + false); } } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenSweetCrabapple.java b/src/main/java/binnie/extratrees/worldgen/WorldGenSweetCrabapple.java index 001f249b..7b391a0c 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenSweetCrabapple.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenSweetCrabapple.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenSweetCrabapple extends WorldGenTree { + public WorldGenSweetCrabapple(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenSweetgum.java b/src/main/java/binnie/extratrees/worldgen/WorldGenSweetgum.java index d67676f1..053e1fc5 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenSweetgum.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenSweetgum.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenSweetgum extends WorldGenTree { + public WorldGenSweetgum(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenSycamore.java b/src/main/java/binnie/extratrees/worldgen/WorldGenSycamore.java index a417ef05..16439544 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenSycamore.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenSycamore.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenSycamore extends WorldGenTree { + public WorldGenSycamore(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java b/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java index ca4d3aa4..c233d6d6 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenTree.java @@ -1,13 +1,16 @@ package binnie.extratrees.worldgen; -import binnie.extratrees.genetics.ExtraTreeSpecies; -import forestry.api.world.ITreeGenData; import java.util.Random; + import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import binnie.extratrees.genetics.ExtraTreeSpecies; +import forestry.api.world.ITreeGenData; + public abstract class WorldGenTree extends WorldGenerator { + protected ITreeGenData treeGen; protected World world; protected Random rand; @@ -201,6 +204,7 @@ public abstract class WorldGenTree extends WorldGenerator { } static class Vector { + float x; float y; float z; diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenWesternHemlock.java b/src/main/java/binnie/extratrees/worldgen/WorldGenWesternHemlock.java index 90e746ac..e8db75d4 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenWesternHemlock.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenWesternHemlock.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenWesternHemlock extends WorldGenTree { + public WorldGenWesternHemlock(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenWhitebeam.java b/src/main/java/binnie/extratrees/worldgen/WorldGenWhitebeam.java index 1701f9e7..1af60b28 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenWhitebeam.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenWhitebeam.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenWhitebeam extends WorldGenTree { + public WorldGenWhitebeam(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/extratrees/worldgen/WorldGenYew.java b/src/main/java/binnie/extratrees/worldgen/WorldGenYew.java index cc005163..2e3528b5 100644 --- a/src/main/java/binnie/extratrees/worldgen/WorldGenYew.java +++ b/src/main/java/binnie/extratrees/worldgen/WorldGenYew.java @@ -3,6 +3,7 @@ package binnie.extratrees.worldgen; import forestry.api.world.ITreeGenData; public class WorldGenYew extends WorldGenTree { + public WorldGenYew(ITreeGenData tree) { super(tree); } diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index ab509e5d..7f299d79 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,5 +1,7 @@ package binnie.genetics; +import net.minecraft.item.Item; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.IBinnieGUID; @@ -21,7 +23,6 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.item.Item; @Mod( modid = "Genetics", @@ -30,6 +31,7 @@ import net.minecraft.item.Item; useMetadata = true, dependencies = "after:BinnieCore") public class Genetics extends AbstractMod { + @Mod.Instance("Genetics") public static Genetics instance; @@ -107,6 +109,7 @@ public class Genetics extends AbstractMod { } public static class PacketHandler extends BinniePacketHandler { + public PacketHandler() { super(Genetics.instance); } diff --git a/src/main/java/binnie/genetics/GeneticsCreativeTab.java b/src/main/java/binnie/genetics/GeneticsCreativeTab.java index 19fa23d3..3448fc68 100644 --- a/src/main/java/binnie/genetics/GeneticsCreativeTab.java +++ b/src/main/java/binnie/genetics/GeneticsCreativeTab.java @@ -1,14 +1,16 @@ package binnie.genetics; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class GeneticsCreativeTab extends CreativeTabs { + public static CreativeTabs instance; static { diff --git a/src/main/java/binnie/genetics/api/IGene.java b/src/main/java/binnie/genetics/api/IGene.java index 2fa7da37..11b58b2a 100644 --- a/src/main/java/binnie/genetics/api/IGene.java +++ b/src/main/java/binnie/genetics/api/IGene.java @@ -1,12 +1,14 @@ package binnie.genetics.api; +import net.minecraft.nbt.NBTTagCompound; + import forestry.api.core.INBTTagable; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.nbt.NBTTagCompound; public interface IGene extends INBTTagable { + IChromosomeType getChromosome(); String getName(); diff --git a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java index 7b6e298e..07db0394 100644 --- a/src/main/java/binnie/genetics/api/IIncubatorRecipe.java +++ b/src/main/java/binnie/genetics/api/IIncubatorRecipe.java @@ -1,11 +1,14 @@ package binnie.genetics.api; -import binnie.core.machines.MachineUtil; import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import binnie.core.machines.MachineUtil; + public interface IIncubatorRecipe { + boolean isInputLiquid(FluidStack liquid); boolean isInputLiquidSufficient(FluidStack liquid); diff --git a/src/main/java/binnie/genetics/api/IItemAnalysable.java b/src/main/java/binnie/genetics/api/IItemAnalysable.java index 0e3d6ef6..144c0b87 100644 --- a/src/main/java/binnie/genetics/api/IItemAnalysable.java +++ b/src/main/java/binnie/genetics/api/IItemAnalysable.java @@ -3,6 +3,7 @@ package binnie.genetics.api; import net.minecraft.item.ItemStack; public interface IItemAnalysable { + boolean isAnalysed(ItemStack stack); ItemStack analyse(ItemStack stack); diff --git a/src/main/java/binnie/genetics/api/IItemChargable.java b/src/main/java/binnie/genetics/api/IItemChargable.java index 8fe73871..6760139c 100644 --- a/src/main/java/binnie/genetics/api/IItemChargable.java +++ b/src/main/java/binnie/genetics/api/IItemChargable.java @@ -3,5 +3,6 @@ package binnie.genetics.api; import net.minecraft.item.ItemStack; public interface IItemChargable { + int getCharges(ItemStack stack); } diff --git a/src/main/java/binnie/genetics/api/IItemSerum.java b/src/main/java/binnie/genetics/api/IItemSerum.java index 27557182..efb5fc68 100644 --- a/src/main/java/binnie/genetics/api/IItemSerum.java +++ b/src/main/java/binnie/genetics/api/IItemSerum.java @@ -1,9 +1,11 @@ package binnie.genetics.api; -import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; +import forestry.api.genetics.ISpeciesRoot; + public interface IItemSerum extends IItemChargable { + IGene[] getGenes(ItemStack stack); ISpeciesRoot getSpeciesRoot(ItemStack stack); diff --git a/src/main/java/binnie/genetics/config/ConfigurationMain.java b/src/main/java/binnie/genetics/config/ConfigurationMain.java index 6fb9a907..3a03a762 100644 --- a/src/main/java/binnie/genetics/config/ConfigurationMain.java +++ b/src/main/java/binnie/genetics/config/ConfigurationMain.java @@ -3,4 +3,5 @@ package binnie.genetics.config; import binnie.core.mod.config.ConfigFile; @ConfigFile(filename = "/config/forestry/genetics/main.conf") -public class ConfigurationMain {} +public class ConfigurationMain { +} diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index 76749eec..cd2e57d8 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -1,5 +1,12 @@ package binnie.genetics.core; +import java.lang.reflect.Constructor; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.core.craftgui.minecraft.Window; import binnie.core.gui.IBinnieGUID; import binnie.genetics.craftgui.WindowAcclimatiser; @@ -15,13 +22,9 @@ import binnie.genetics.craftgui.WindowSequencer; import binnie.genetics.craftgui.WindowSplicer; import binnie.genetics.gui.WindowAnalyst; import cpw.mods.fml.relauncher.Side; -import java.lang.reflect.Constructor; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public enum GeneticsGUI implements IBinnieGUID { + Genepool(WindowGenepool.class), Isolator(WindowIsolator.class), Sequencer(WindowSequencer.class), diff --git a/src/main/java/binnie/genetics/core/GeneticsPacket.java b/src/main/java/binnie/genetics/core/GeneticsPacket.java index 08f67805..c732fad6 100644 --- a/src/main/java/binnie/genetics/core/GeneticsPacket.java +++ b/src/main/java/binnie/genetics/core/GeneticsPacket.java @@ -1,5 +1,7 @@ package binnie.genetics.core; +import net.minecraft.entity.player.EntityPlayer; + import binnie.core.BinnieCore; import binnie.core.network.IPacketID; import binnie.core.network.packet.MessageBinnie; @@ -7,9 +9,9 @@ import binnie.core.network.packet.MessageNBT; import binnie.genetics.genetics.GeneTracker; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; public enum GeneticsPacket implements IPacketID { + GeneTrackerSync; @Override diff --git a/src/main/java/binnie/genetics/core/GeneticsTexture.java b/src/main/java/binnie/genetics/core/GeneticsTexture.java index e1db6144..5f23af4a 100644 --- a/src/main/java/binnie/genetics/core/GeneticsTexture.java +++ b/src/main/java/binnie/genetics/core/GeneticsTexture.java @@ -8,6 +8,7 @@ import binnie.core.resource.ResourceType; import binnie.genetics.Genetics; public enum GeneticsTexture implements IBinnieTexture { + GeneticMachine(ResourceType.Tile, "GeneticMachine"), Genepool(ResourceType.Tile, "Genepool"), Incubator(ResourceType.Tile, "Incubator"), diff --git a/src/main/java/binnie/genetics/craftgui/ControlGene.java b/src/main/java/binnie/genetics/craftgui/ControlGene.java index 24ec6ef0..a701e1e3 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGene.java @@ -1,5 +1,9 @@ package binnie.genetics.craftgui; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -16,11 +20,9 @@ import binnie.genetics.api.IGene; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.genetics.Engineering; import forestry.api.genetics.IAlleleSpecies; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public class ControlGene extends Control implements IControlValue, ITooltip { + protected IGene gene; protected ControlGene(IWidget parent, float x, float y) { @@ -34,14 +36,15 @@ public class ControlGene extends Control implements IControlValue, IToolt String cName = Binnie.Genetics.getSystem(gene.getSpeciesRoot()).getChromosomeName(gene.getChromosome()); tooltip.add(cName + ": " + gene.getName()); if (gene.getAllele() instanceof IAlleleSpecies) { - tooltip.add(I18N.localise( - "binniecore.gui.database.branch.discoveredBy", - ((IAlleleSpecies) gene.getAllele()).getAuthority() + EnumChatFormatting.RESET)); + tooltip.add( + I18N.localise( + "binniecore.gui.database.branch.discoveredBy", + ((IAlleleSpecies) gene.getAllele()).getAuthority() + EnumChatFormatting.RESET)); } if (isMouseOver() && canFill(Window.get(this).getHeldItemStack())) { tooltip.add("Left click to assign gene"); - IGene existingGene = Engineering.getGene( - Window.get(this).getHeldItemStack(), gene.getChromosome().ordinal()); + IGene existingGene = Engineering + .getGene(Window.get(this).getHeldItemStack(), gene.getChromosome().ordinal()); if (existingGene == null) { return; } @@ -52,8 +55,7 @@ public class ControlGene extends Control implements IControlValue, IToolt } private boolean canFill(ItemStack stack) { - return stack != null - && stack.stackSize == 1 + return stack != null && stack.stackSize == 1 && Engineering.isGeneAcceptor(stack) && Engineering.canAcceptGene(stack, getValue()); } @@ -85,6 +87,7 @@ public class ControlGene extends Control implements IControlValue, IToolt } private class MouseDownHandler extends EventMouse.Down.Handler { + @Override public void onEvent(EventMouse.Down event) { if (!canFill(Window.get(getWidget()).getHeldItemStack())) { diff --git a/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java index 964727ae..e50f5f59 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/craftgui/ControlGeneScroll.java @@ -1,5 +1,9 @@ package binnie.genetics.craftgui; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -12,11 +16,9 @@ import binnie.core.genetics.Gene; import binnie.genetics.genetics.GeneTracker; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; public class ControlGeneScroll extends Control implements IControlValue { + private String filter; private BreedingSystem system; @@ -38,8 +40,7 @@ public class ControlGeneScroll extends Control implements IControlValue> genes = Binnie.Genetics.getChromosomeMap(system.getSpeciesRoot()); int x; int y = 0; diff --git a/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java b/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java index 37c7d560..4d149c72 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java +++ b/src/main/java/binnie/genetics/craftgui/ControlSequencerProgress.java @@ -1,5 +1,10 @@ package binnie.genetics.craftgui; +import java.util.Random; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.IArea; @@ -9,11 +14,9 @@ import binnie.core.craftgui.minecraft.Window; import binnie.core.craftgui.minecraft.control.ControlProgressBase; import binnie.core.craftgui.window.Panel; import binnie.core.machines.Machine; -import java.util.Random; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class ControlSequencerProgress extends ControlProgressBase { + protected ControlText textControl; public ControlSequencerProgress(IWidget parent, int x, int y) { @@ -25,9 +28,7 @@ public class ControlSequencerProgress extends ControlProgressBase { @Override public void onUpdateClient() { super.onUpdateClient(); - ItemStack stack = Machine.getMachine(Window.get(this).getInventory()) - .getMachineUtil() - .getStack(5); + ItemStack stack = Machine.getMachine(Window.get(this).getInventory()).getMachineUtil().getStack(5); if (stack == null) { textControl.setValue(""); return; @@ -35,26 +36,19 @@ public class ControlSequencerProgress extends ControlProgressBase { Random rand = new Random(stack.getDisplayName().length()); StringBuilder text = new StringBuilder(); - String[] codes = {"A", "T", "G", "C"}; - EnumChatFormatting[] colors = { - EnumChatFormatting.GREEN, EnumChatFormatting.LIGHT_PURPLE, EnumChatFormatting.AQUA, EnumChatFormatting.RED - }; + String[] codes = { "A", "T", "G", "C" }; + EnumChatFormatting[] colors = { EnumChatFormatting.GREEN, EnumChatFormatting.LIGHT_PURPLE, + EnumChatFormatting.AQUA, EnumChatFormatting.RED }; for (int i = 0; i < 65; ++i) { int k = rand.nextInt(4); String code = codes[k]; if (rand.nextFloat() < progress) { String col = colors[k].toString(); - text.append(EnumChatFormatting.RESET) - .append(col) - .append(EnumChatFormatting.BOLD) - .append(code); + text.append(EnumChatFormatting.RESET).append(col).append(EnumChatFormatting.BOLD).append(code); } else { - text.append(EnumChatFormatting.RESET) - .append(EnumChatFormatting.GRAY) - .append(EnumChatFormatting.OBFUSCATED) - .append(EnumChatFormatting.BOLD) - .append(code); + text.append(EnumChatFormatting.RESET).append(EnumChatFormatting.GRAY) + .append(EnumChatFormatting.OBFUSCATED).append(EnumChatFormatting.BOLD).append(code); } } textControl.setValue(text.toString()); diff --git a/src/main/java/binnie/genetics/craftgui/ControlSplicerProgress.java b/src/main/java/binnie/genetics/craftgui/ControlSplicerProgress.java index 07b9fdec..2b143f68 100644 --- a/src/main/java/binnie/genetics/craftgui/ControlSplicerProgress.java +++ b/src/main/java/binnie/genetics/craftgui/ControlSplicerProgress.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.minecraft.control.ControlProgressBase; public class ControlSplicerProgress extends ControlProgressBase { + float strength; public ControlSplicerProgress(IWidget parent, float x, float y, float w, float h) { @@ -27,7 +28,7 @@ public class ControlSplicerProgress extends ControlProgressBase { for (int i = 0; i < n; ++i) { int seed = 432523; - int[] colours = {0x990000, 0x007700, 0x0000ff, 0x997700}; + int[] colours = { 0x990000, 0x007700, 0x0000ff, 0x997700 }; int c1 = colours[(int) Math.abs(13.0 * Math.sin(i) + 48.0 * Math.cos(i) + 25.0 * Math.sin(7 * i)) % 4]; int c2 = colours[(int) Math.abs(23.0 * Math.sin(i) + 28.0 * Math.cos(i) + 15.0 * Math.sin(7 * i)) % 4]; int c3 = colours[(int) Math.abs(43.0 * Math.sin(i) + 38.0 * Math.cos(i) + 55.0 * Math.sin(7 * i)) % 4]; @@ -50,7 +51,8 @@ public class ControlSplicerProgress extends ControlProgressBase { new IArea(w() / 2.0f + y, h() - offMovement * percentView - 8.0f, 4.0f, h / 2.0f), (y < 0.0f) ? c3 : c2); CraftGUI.render.solidAlpha( - new IArea(w() / 2.0f + y, h() - offMovement * percentView - 4.0f, 4.0f, h / 2.0f), c4); + new IArea(w() / 2.0f + y, h() - offMovement * percentView - 4.0f, 4.0f, h / 2.0f), + c4); } } } diff --git a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java index 03b52eca..a66bdcd0 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.Window; @@ -15,12 +18,15 @@ import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.acclimatiser.Acclimatiser; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowAcclimatiser extends WindowMachine { - protected static Texture progressBase = - new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); + + protected static Texture progressBase = new StandardTexture( + 64, + 0, + 130, + 21, + ExtraBeeTexture.GUIProgress.getTexture()); protected static Texture progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); public WindowAcclimatiser(EntityPlayer player, IInventory inventory, Side side) { diff --git a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java index b33295d0..617a0f02 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -22,12 +25,15 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.analyser.Analyser; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowAnalyser extends WindowMachine { - protected static Texture progressBase = - new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture()); + + protected static Texture progressBase = new StandardTexture( + 0, + 218, + 142, + 17, + ExtraBeeTexture.GUIProgress.getTexture()); protected static Texture progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture()); public WindowAnalyser(EntityPlayer player, IInventory inventory, Side side) { diff --git a/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java index 703e9780..2a3d97c9 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGeneBank.java @@ -1,5 +1,16 @@ package binnie.genetics.craftgui; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.AbstractMod; import binnie.core.craftgui.Tooltip; @@ -27,17 +38,9 @@ import binnie.genetics.genetics.GeneTracker; import cpw.mods.fml.relauncher.Side; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public class WindowGeneBank extends WindowMachine { + public boolean isNei; protected ControlGeneScroll genes; @@ -84,6 +87,7 @@ public class WindowGeneBank extends WindowMachine { public void initialiseClient() { setTitle(getTitle()); addEventHandler(new EventValueChanged.Handler() { + @Override public void onEvent(EventValueChanged event) { if (event.value instanceof BreedingSystem) { @@ -101,57 +105,66 @@ public class WindowGeneBank extends WindowMachine { int geneBoxWidth = 120; new Panel(this, boxX + 24, 32.0f, geneBoxWidth, 120.0f, MinecraftGUI.PanelType.Black); new Panel(this, boxX + 24 + geneBoxWidth, 32.0f, 14.0f, 120.0f, MinecraftGUI.PanelType.Gray); - ControlScrollableContent scroll = - new ControlScrollableContent(this, boxX + 24 + 2, 34.0f, geneBoxWidth + 10, 116.0f, 12.0f); + ControlScrollableContent scroll = new ControlScrollableContent( + this, + boxX + 24 + 2, + 34.0f, + geneBoxWidth + 10, + 116.0f, + 12.0f); ControlTextEdit edit = new ControlTextEdit(this, boxX + 27 + geneBoxWidth - 70, 18.0f, 80.0f, 12.0f); - addEventHandler( - new EventTextEdit.Handler() { - @Override - public void onEvent(EventTextEdit event) { - genes.setFilter(event.getValue()); - } - }.setOrigin(EventHandler.Origin.Self, edit)); + addEventHandler(new EventTextEdit.Handler() { + + @Override + public void onEvent(EventTextEdit event) { + genes.setFilter(event.getValue()); + } + }.setOrigin(EventHandler.Origin.Self, edit)); scroll.setScrollableContent(genes = new ControlGeneScroll(scroll, 1.0f, 1.0f, geneBoxWidth, 116.0f)); genes.setGenes(Binnie.Genetics.beeBreedingSystem); - ControlTabBar tabBar = - new ControlTabBar(this, boxX, 32.0f, 24.0f, 120.0f, Position.LEFT) { + ControlTabBar tabBar = new ControlTabBar( + this, + boxX, + 32.0f, + 24.0f, + 120.0f, + Position.LEFT) { + + @Override + public ControlTab createTab(float x, float y, float w, float h, BreedingSystem value) { + return new ControlTabIcon(this, x, y, w, h, value) { + @Override - public ControlTab createTab( - float x, float y, float w, float h, BreedingSystem value) { - return new ControlTabIcon(this, x, y, w, h, value) { - @Override - public void getTooltip(Tooltip tooltip) { - tooltip.add(getValue().toString()); - int totalGenes = 0; - int seqGenes = 0; - GeneTracker tracker = GeneTracker.getTracker(getWorld(), getUsername()); - Map> genes = Binnie.Genetics.getChromosomeMap( - getValue().getSpeciesRoot()); - for (Map.Entry> entry : genes.entrySet()) { - totalGenes += entry.getValue().size(); - for (IAllele allele : entry.getValue()) { - Gene gene = new Gene( - allele, - entry.getKey(), - getValue().getSpeciesRoot()); - if (tracker.isSequenced(gene)) { - seqGenes++; - } - } + public void getTooltip(Tooltip tooltip) { + tooltip.add(getValue().toString()); + int totalGenes = 0; + int seqGenes = 0; + GeneTracker tracker = GeneTracker.getTracker(getWorld(), getUsername()); + Map> genes = Binnie.Genetics + .getChromosomeMap(getValue().getSpeciesRoot()); + for (Map.Entry> entry : genes.entrySet()) { + totalGenes += entry.getValue().size(); + for (IAllele allele : entry.getValue()) { + Gene gene = new Gene(allele, entry.getKey(), getValue().getSpeciesRoot()); + if (tracker.isSequenced(gene)) { + seqGenes++; } - tooltip.add(I18N.localise( - "genetics.gui.geneBank.sequencedGenes.short", seqGenes, totalGenes)); } - }; + } + tooltip.add(I18N.localise("genetics.gui.geneBank.sequencedGenes.short", seqGenes, totalGenes)); } }; + } + }; tabBar.setValues(Binnie.Genetics.getActiveSystems()); tabBar.setValue(Binnie.Genetics.beeBreedingSystem); boxX -= 8; ControlTabBar infoTabs = new ControlTabBar<>(this, boxX + 8, 160.0f, 16.0f, 50.0f, Position.LEFT); - infoTabs.setValues(Arrays.asList( - I18N.localise("genetics.gui.geneBank.stats"), I18N.localise("genetics.gui.geneBank.ranking"))); + infoTabs.setValues( + Arrays.asList( + I18N.localise("genetics.gui.geneBank.stats"), + I18N.localise("genetics.gui.geneBank.ranking"))); infoTabs.setValue(I18N.localise("genetics.gui.geneBank.info")); Panel panelProject = new Panel(this, boxX + 24, 160.0f, geneBoxWidth + 20, 50.0f, MinecraftGUI.PanelType.Black); int totalGenes = 0; @@ -178,8 +191,7 @@ public class WindowGeneBank extends WindowMachine { new ControlText( panelProject, new IPoint(4.0f, 18.0f), - EnumChatFormatting.ITALIC.toString() - + EnumChatFormatting.YELLOW + EnumChatFormatting.ITALIC.toString() + EnumChatFormatting.YELLOW + I18N.localise("genetics.gui.geneBank.sequencedGenes", seqGenes, totalGenes)); } diff --git a/src/main/java/binnie/genetics/craftgui/WindowGeneBankNEI.java b/src/main/java/binnie/genetics/craftgui/WindowGeneBankNEI.java index 9fd218f3..55daced4 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGeneBankNEI.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGeneBankNEI.java @@ -1,11 +1,13 @@ package binnie.genetics.craftgui; -import binnie.core.craftgui.minecraft.Window; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import binnie.core.craftgui.minecraft.Window; +import cpw.mods.fml.relauncher.Side; + public class WindowGeneBankNEI { + public static Window create(EntityPlayer player, IInventory inventory, Side side) { return new WindowGeneBank(player, inventory, side, true); } diff --git a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java index e45a8bad..88bd9c72 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java +++ b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -20,10 +23,9 @@ import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.genepool.Genepool; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowGenepool extends WindowMachine { + static Texture progressBase = new StandardTexture(64, 0, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); static Texture progress = new StandardTexture(64, 21, 130, 21, ExtraBeeTexture.GUIProgress.getTexture()); diff --git a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java index abb68bf9..4f9a03f3 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -19,10 +22,9 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.incubator.Incubator; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowIncubator extends WindowMachine { + protected static Texture progressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess); protected static Texture progress = new StandardTexture(38, 91, 38, 32, GeneticsTexture.GUIProcess); @@ -46,7 +48,12 @@ public class WindowIncubator extends WindowMachine { new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon()); x += 18; new ControlMachineProgress( - this, x, y + 6, WindowIncubator.progressBase, WindowIncubator.progress, Position.LEFT); + this, + x, + y + 6, + WindowIncubator.progressBase, + WindowIncubator.progress, + Position.LEFT); new ControlSlot(this, x + 10, y + 3 + 10).assign(Incubator.SLOT_INCUBATOR); x += 40; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon()); diff --git a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java index f16804c8..accbf1f5 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; @@ -21,10 +24,9 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.inoculator.Inoculator; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowInoculator extends WindowMachine { + static Texture ProgressBase = new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); static Texture Progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); @@ -52,7 +54,12 @@ public class WindowInoculator extends WindowMachine { new ControlSlotArray(this, 0, 0, 2, 1).create(Inoculator.SLOT_SERUM_EXPENDED)); x += 18; new ControlMachineProgress( - this, x, y + 24, WindowInoculator.ProgressBase, WindowInoculator.Progress, Position.LEFT); + this, + x, + y + 24, + WindowInoculator.ProgressBase, + WindowInoculator.Progress, + Position.LEFT); new ControlEnergyBar(this, 91, 118, 60, 16, Position.LEFT); new ControlErrorState(this, 161.0f, 118.0f); x += 142; diff --git a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java index bd592de1..80eeb907 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java +++ b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -20,10 +23,9 @@ import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.isolator.Isolator; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowIsolator extends WindowMachine { + static Texture ProgressBase = new StandardTexture(0, 218, 142, 17, ExtraBeeTexture.GUIProgress.getTexture()); static Texture Progress = new StandardTexture(0, 201, 142, 17, ExtraBeeTexture.GUIProgress.getTexture()); diff --git a/src/main/java/binnie/genetics/craftgui/WindowMachine.java b/src/main/java/binnie/genetics/craftgui/WindowMachine.java index 9c9fb2d3..fc4e2477 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowMachine.java +++ b/src/main/java/binnie/genetics/craftgui/WindowMachine.java @@ -1,11 +1,13 @@ package binnie.genetics.craftgui; -import binnie.core.craftgui.minecraft.Window; -import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import binnie.core.craftgui.minecraft.Window; +import cpw.mods.fml.relauncher.Side; + public abstract class WindowMachine extends Window { + public WindowMachine(int width, int height, EntityPlayer player, IInventory inventory, Side side) { super(width, height, player, inventory, side); } diff --git a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java index 90523099..746b0348 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java +++ b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.Position; import binnie.core.craftgui.minecraft.GUIIcon; @@ -20,12 +23,15 @@ import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.polymeriser.Polymeriser; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowPolymeriser extends WindowMachine { - protected static Texture progressBase = - new StandardTexture(76, 170, 160, 79, GeneticsTexture.GUIProcess.getTexture()); + + protected static Texture progressBase = new StandardTexture( + 76, + 170, + 160, + 79, + GeneticsTexture.GUIProcess.getTexture()); protected static Texture progress = new StandardTexture(76, 91, 160, 79, GeneticsTexture.GUIProcess.getTexture()); public WindowPolymeriser(EntityPlayer player, IInventory inventory, Side side) { diff --git a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java index 332bf0c9..d638e058 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java @@ -1,5 +1,10 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.AbstractMod; import binnie.core.craftgui.controls.ControlText; import binnie.core.craftgui.geometry.CraftGUIUtil; @@ -22,14 +27,15 @@ import binnie.extrabees.core.ExtraBeeTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.sequencer.Sequencer; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public class WindowSequencer extends WindowMachine { - protected static Texture progressBase = - new StandardTexture(64, 114, 98, 9, ExtraBeeTexture.GUIProgress.getTexture()); + + protected static Texture progressBase = new StandardTexture( + 64, + 114, + 98, + 9, + ExtraBeeTexture.GUIProgress.getTexture()); protected static Texture progress = new StandardTexture(64, 123, 98, 9, ExtraBeeTexture.GUIProgress.getTexture()); protected ControlText slotText; @@ -45,8 +51,9 @@ public class WindowSequencer extends WindowMachine { @Override public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) { if (side == Side.CLIENT && name.equals("username")) { - slotText.setValue(EnumChatFormatting.DARK_GRAY - + I18N.localise("genetics.machine.sequencer.gui.sequensedBy", nbt.getString("username"))); + slotText.setValue( + EnumChatFormatting.DARK_GRAY + + I18N.localise("genetics.machine.sequencer.gui.sequensedBy", nbt.getString("username"))); } super.recieveGuiNBT(side, player, name, nbt); } diff --git a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java index fec77508..93e1de3e 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java +++ b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java @@ -1,5 +1,8 @@ package binnie.genetics.craftgui; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; + import binnie.core.AbstractMod; import binnie.core.craftgui.geometry.CraftGUIUtil; import binnie.core.craftgui.geometry.Position; @@ -20,12 +23,15 @@ import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.inoculator.Inoculator; import binnie.genetics.machine.splicer.Splicer; import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; public class WindowSplicer extends WindowMachine { - protected static Texture progressBase = - new StandardTexture(0, 72, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); + + protected static Texture progressBase = new StandardTexture( + 0, + 72, + 142, + 72, + GeneticsTexture.GUIProcess2.getTexture()); protected static Texture progress = new StandardTexture(0, 0, 142, 72, GeneticsTexture.GUIProcess2.getTexture()); public WindowSplicer(EntityPlayer player, IInventory inventory, Side side) { diff --git a/src/main/java/binnie/genetics/genetics/AlleleHelper.java b/src/main/java/binnie/genetics/genetics/AlleleHelper.java index 82a14a43..9739e793 100644 --- a/src/main/java/binnie/genetics/genetics/AlleleHelper.java +++ b/src/main/java/binnie/genetics/genetics/AlleleHelper.java @@ -1,5 +1,9 @@ package binnie.genetics.genetics; +import java.util.Locale; + +import org.apache.commons.lang3.text.WordUtils; + import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.EnumSoilType; @@ -11,10 +15,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.core.genetics.alleles.EnumAllele; -import java.util.Locale; -import org.apache.commons.lang3.text.WordUtils; public class AlleleHelper extends forestry.core.genetics.alleles.AlleleHelper { + public static IAllele getAllele(EnumTemperature temperature) { return getAllele(getUid(temperature)); } diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index 7cf8bb06..c6c52122 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -1,5 +1,7 @@ package binnie.genetics.genetics; +import net.minecraft.item.ItemStack; + import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemChargable; @@ -7,9 +9,9 @@ import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import net.minecraft.item.ItemStack; public class Engineering { + public static boolean isGeneAcceptor(ItemStack stack) { if (stack == null) { return false; @@ -17,9 +19,8 @@ public class Engineering { if (stack.getItem() instanceof IItemSerum) { return ((IItemSerum) stack.getItem()).getCharges(stack) == 0; } - return stack.getItem() == Genetics.itemGenetics - && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() - || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()); + return stack.getItem() == Genetics.itemGenetics && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() + || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()); } public static boolean canAcceptGene(ItemStack stack, IGene gene) { @@ -57,7 +58,7 @@ public class Engineering { return ((IItemSerum) serum.getItem()).getGenes(serum); } if (serum.getItem() == Genetics.itemSequencer) { - return new IGene[] {new SequencerItem(serum).gene}; + return new IGene[] { new SequencerItem(serum).gene }; } return new IGene[0]; } diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index bca52f24..747cc555 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -1,5 +1,13 @@ package binnie.genetics.genetics; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; @@ -8,14 +16,9 @@ import binnie.core.util.I18N; import binnie.genetics.api.IGene; import forestry.api.core.INBTTagable; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumChatFormatting; public class GeneArrayItem implements INBTTagable, IGeneItem { + protected List genes; public GeneArrayItem(ItemStack stack) { @@ -64,8 +67,7 @@ public class GeneArrayItem implements INBTTagable, IGeneItem { if (genes.size() == 0) { return null; } - BreedingSystem system = - Binnie.Genetics.getSystem(genes.get(0).getSpeciesRoot().getUID()); + BreedingSystem system = Binnie.Genetics.getSystem(genes.get(0).getSpeciesRoot().getUID()); return (system == null) ? Binnie.Genetics.getActiveSystems().iterator().next() : system; } diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index 0ac146c3..02476271 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -1,17 +1,20 @@ package binnie.genetics.genetics; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.genetics.api.IGene; import forestry.api.core.INBTTagable; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; public class GeneItem implements INBTTagable, IGeneItem { + protected IGene gene; public GeneItem(ItemStack stack) { diff --git a/src/main/java/binnie/genetics/genetics/GeneTracker.java b/src/main/java/binnie/genetics/genetics/GeneTracker.java index 05455de4..056c2e74 100644 --- a/src/main/java/binnie/genetics/genetics/GeneTracker.java +++ b/src/main/java/binnie/genetics/genetics/GeneTracker.java @@ -1,16 +1,7 @@ package binnie.genetics.genetics; -import binnie.core.genetics.Gene; -import binnie.core.network.packet.MessageNBT; -import binnie.genetics.Genetics; -import binnie.genetics.api.IGene; -import binnie.genetics.core.GeneticsPacket; -import com.mojang.authlib.GameProfile; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -18,7 +9,21 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; +import binnie.core.genetics.Gene; +import binnie.core.network.packet.MessageNBT; +import binnie.genetics.Genetics; +import binnie.genetics.api.IGene; +import binnie.genetics.core.GeneticsPacket; + +import com.mojang.authlib.GameProfile; + +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.ISpeciesRoot; + public class GeneTracker extends WorldSavedData { + GameProfile username; private ArrayList discoveredGenes; diff --git a/src/main/java/binnie/genetics/genetics/IGeneItem.java b/src/main/java/binnie/genetics/genetics/IGeneItem.java index 54ec42fa..308e76db 100644 --- a/src/main/java/binnie/genetics/genetics/IGeneItem.java +++ b/src/main/java/binnie/genetics/genetics/IGeneItem.java @@ -1,11 +1,14 @@ package binnie.genetics.genetics; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.genetics.api.IGene; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import net.minecraft.item.ItemStack; public interface IGeneItem { + ISpeciesRoot getSpeciesRoot(); void getInfo(List tooltip); diff --git a/src/main/java/binnie/genetics/genetics/SequencerItem.java b/src/main/java/binnie/genetics/genetics/SequencerItem.java index ed724b41..1918c090 100644 --- a/src/main/java/binnie/genetics/genetics/SequencerItem.java +++ b/src/main/java/binnie/genetics/genetics/SequencerItem.java @@ -1,10 +1,12 @@ package binnie.genetics.genetics; -import binnie.genetics.api.IGene; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import binnie.genetics.api.IGene; + public class SequencerItem extends GeneItem { + public int sequenced; public boolean analysed; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java index cbf5b1ed..08689ee0 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java @@ -1,5 +1,9 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + +import org.lwjgl.opengl.GL11; + import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IFlower; import binnie.botany.craftgui.ControlColorDisplay; @@ -10,10 +14,9 @@ import binnie.core.craftgui.geometry.IArea; import binnie.core.craftgui.geometry.IPoint; import binnie.core.craftgui.minecraft.control.ControlIconDisplay; import binnie.core.util.I18N; -import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; public class AnalystPageAppearance extends ControlAnalystPage { + public AnalystPageAppearance(IWidget parent, IArea area, IFlower ind) { super(parent, area); setColor(0x333333); @@ -38,6 +41,7 @@ public class AnalystPageAppearance extends ControlAnalystPage { int w = (sections > 1) ? 50 : 100; new ControlIconDisplay(this, (w() - w) / 2.0f, y - ((sections == 1) ? 0 : 0), null) { + @Override public void onRenderForeground() { GL11.glPushMatrix(); @@ -47,11 +51,13 @@ public class AnalystPageAppearance extends ControlAnalystPage { CraftGUI.render.color(ind.getGenome().getStemColor().getColor(false)); if (sections > 1) { CraftGUI.render.iconBlock( - new IPoint(0.0f, 0.0f), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1)); + new IPoint(0.0f, 0.0f), + ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1)); } CraftGUI.render.iconBlock( - new IPoint(0.0f, dy), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0)); + new IPoint(0.0f, dy), + ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0)); CraftGUI.render.color(ind.getGenome().getPrimaryColor().getColor(false)); if (sections > 1) { CraftGUI.render.iconBlock( @@ -60,7 +66,8 @@ public class AnalystPageAppearance extends ControlAnalystPage { } CraftGUI.render.iconBlock( - new IPoint(0.0f, dy), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0)); + new IPoint(0.0f, dy), + ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0)); CraftGUI.render.color(ind.getGenome().getSecondaryColor().getColor(false)); if (sections > 1) { CraftGUI.render.iconBlock( diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index 672f2625..cea5e4ae 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -1,5 +1,7 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -15,9 +17,9 @@ import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IButterfly; import forestry.plugins.PluginApiculture; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageBehaviour extends ControlAnalystPage { + public AnalystPageBehaviour(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(0x660033); @@ -30,20 +32,19 @@ public class AnalystPageBehaviour extends ControlAnalystPage { y += 8; int fertility = bee.getGenome().getFlowering(); new ControlTextCentered( - this, - y, - I18N.localise("genetics.gui.analyst.behaviour.pollinatesNearby") + "\n" - + bee.getGenome().getFlowerProvider().getDescription()) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.behaviour.pollinatesNearby") + "\n" + + bee.getGenome().getFlowerProvider().getDescription()).setColor(getColor()); y += 20; new ControlTextCentered( - this, - y, - I18N.localise( - "genetics.gui.analyst.behaviour.everyTime", - getTimeString(PluginApiculture.ticksPerBeeWorkCycle * 100.0f / fertility))) - .setColor(getColor()); + this, + y, + I18N.localise( + "genetics.gui.analyst.behaviour.everyTime", + getTimeString(PluginApiculture.ticksPerBeeWorkCycle * 100.0f / fertility))) + .setColor(getColor()); y += 22; IAlleleBeeEffect effect = bee.getGenome().getEffect(); @@ -58,42 +59,46 @@ public class AnalystPageBehaviour extends ControlAnalystPage { .setColor(getColor()); y += (int) (CraftGUI.render.textHeight(loc, w() - 8.0f) + 1.0f); - new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.behaviour.withinBlocks", (int) - (t[0] / 2.0f))) - .setColor(getColor()); + new ControlTextCentered( + this, + y, + I18N.localise("genetics.gui.analyst.behaviour.withinBlocks", (int) (t[0] / 2.0f))) + .setColor(getColor()); y += 22; } new ControlTextCentered( - this, y, I18N.localise("genetics.gui.analyst.behaviour.territory", t[0], t[1], t[2])) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.behaviour.territory", t[0], t[1], t[2])).setColor(getColor()); y += 22; } if (ind instanceof IButterfly) { IButterfly bee2 = (IButterfly) ind; new ControlTextCentered( - this, - y, - I18N.localise( - "genetics.gui.analyst.behaviour.metabolism", - Binnie.Genetics.mothBreedingSystem.getAlleleName( - EnumButterflyChromosome.METABOLISM, - ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM)))) - .setColor(getColor()); + this, + y, + I18N.localise( + "genetics.gui.analyst.behaviour.metabolism", + Binnie.Genetics.mothBreedingSystem.getAlleleName( + EnumButterflyChromosome.METABOLISM, + ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM)))) + .setColor(getColor()); y += 20; new ControlTextCentered( - this, - y, - I18N.localise("genetics.gui.analyst.behaviour.pollinatesNearby") + "\n" - + bee2.getGenome().getFlowerProvider().getDescription()) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.behaviour.pollinatesNearby") + "\n" + + bee2.getGenome().getFlowerProvider().getDescription()).setColor(getColor()); y += 20; new ControlTextCentered( - this, y, I18N.localise("genetics.gui.analyst.behaviour.everyTime", getTimeString(1500.0f))) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.behaviour.everyTime", getTimeString(1500.0f))) + .setColor(getColor()); y += 22; IAlleleButterflyEffect effect2 = bee2.getGenome().getEffect(); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java index 907c0e68..940f0917 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java @@ -1,5 +1,10 @@ package binnie.genetics.gui; +import java.text.DecimalFormat; + +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.EnumPlantType; + import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.craftgui.IWidget; @@ -15,11 +20,9 @@ import forestry.api.arboriculture.ITree; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.plugins.PluginApiculture; -import java.text.DecimalFormat; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.EnumPlantType; public class AnalystPageBiology extends ControlAnalystPage { + private static final float SPAWN_KOEF = 1365.3999f; public AnalystPageBiology(IWidget parent, IArea area, IIndividual ind) { @@ -89,13 +92,13 @@ public class AnalystPageBiology extends ControlAnalystPage { y += 30; } else if (ind instanceof ITree) { String alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName( - EnumTreeChromosome.SAPPINESS, ind.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); + EnumTreeChromosome.SAPPINESS, + ind.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC - + I18N.localise("genetics.gui.analyst.biology.sappiness", alleleName)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.biology.sappiness", alleleName)) + .setColor(getColor()); y += 20; } else { y += 10; @@ -106,17 +109,17 @@ public class AnalystPageBiology extends ControlAnalystPage { int fertility = bee.getGenome().getFertility(); if (fertility > 1) { new ControlTextCentered( - this, - y, - EnumChatFormatting.BOLD - + I18N.localise("genetics.gui.analyst.biology.fertility.drones", fertility)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.BOLD + + I18N.localise("genetics.gui.analyst.biology.fertility.drones", fertility)) + .setColor(getColor()); } else { new ControlTextCentered( - this, - y, - EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.biology.fertility.drone")) - .setColor(getColor()); + this, + y, + EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.biology.fertility.drone")) + .setColor(getColor()); } y += 22; @@ -126,11 +129,10 @@ public class AnalystPageBiology extends ControlAnalystPage { y += 12; int lifespan = bee.getGenome().getLifespan() * PluginApiculture.ticksPerBeeWorkCycle; new ControlTextCentered( - this, - y, - EnumChatFormatting.BOLD - + getMCDayString(lifespan * (bee.getGenome().getNocturnal() ? 1.0f : 2.0f))) - .setColor(getColor()); + this, + y, + EnumChatFormatting.BOLD + getMCDayString(lifespan * (bee.getGenome().getNocturnal() ? 1.0f : 2.0f))) + .setColor(getColor()); y += 22; } @@ -139,8 +141,9 @@ public class AnalystPageBiology extends ControlAnalystPage { int fertility = bee2.getGenome().getFertility(); if (fertility > 1) { new ControlTextCentered( - this, y, I18N.localise("genetics.gui.analyst.biology.fertility.moths", fertility)) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.biology.fertility.moths", fertility)).setColor(getColor()); } else { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.biology.fertility.moth")) .setColor(getColor()); @@ -148,8 +151,7 @@ public class AnalystPageBiology extends ControlAnalystPage { y += 32; float caterpillarMatureTime = SPAWN_KOEF - * Math.round( - bee2.getGenome().getLifespan() / (bee2.getGenome().getFertility() * 2)); + * Math.round(bee2.getGenome().getLifespan() / (bee2.getGenome().getFertility() * 2)); new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.biology.caterpillarGestation")) .setColor(getColor()); @@ -164,10 +166,10 @@ public class AnalystPageBiology extends ControlAnalystPage { y += 12; new ControlTextCentered( - this, - y, - EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.biology.blocksPerSec", speed)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.biology.blocksPerSec", speed)) + .setColor(getColor()); y += 22; } @@ -176,22 +178,21 @@ public class AnalystPageBiology extends ControlAnalystPage { int fertility = (int) (1.0f / tree.getGenome().getFertility()); if (fertility > 1) { new ControlTextCentered( - this, y, I18N.localise("genetics.gui.analyst.biology.fertility.leaves", fertility)) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.biology.fertility.leaves", fertility)).setColor(getColor()); } else { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.biology.fertility.leaf")) .setColor(getColor()); } y += 22; - float butterflySpawn = SPAWN_KOEF - / (tree.getGenome().getSappiness() * tree.getGenome().getYield() * 0.5f); + float butterflySpawn = SPAWN_KOEF / (tree.getGenome().getSappiness() * tree.getGenome().getYield() * 0.5f); new ControlTextCentered( - this, - y, - I18N.localise( - "genetics.gui.analyst.biology.mothSpawn.perLeaf", getTimeString(butterflySpawn))) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.biology.mothSpawn.perLeaf", getTimeString(butterflySpawn))) + .setColor(getColor()); y += 34; new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.biology.planTypes")) @@ -207,10 +208,10 @@ public class AnalystPageBiology extends ControlAnalystPage { IFlower flower = (IFlower) ind; float butterflySpawn2 = SPAWN_KOEF / (flower.getGenome().getSappiness() * 0.2f); new ControlTextCentered( - this, - y, - I18N.localise("genetics.gui.analyst.biology.mothSpawn", getTimeString(butterflySpawn2))) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.biology.mothSpawn", getTimeString(butterflySpawn2))) + .setColor(getColor()); y += 30; int fertility = flower.getGenome().getFertility(); @@ -245,12 +246,11 @@ public class AnalystPageBiology extends ControlAnalystPage { y += 12; new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC - + I18N.localise("genetics.gui.analyst.biology.perLifetime", (int) - (floweringLifespan / dispersalTime))) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise( + "genetics.gui.analyst.biology.perLifetime", + (int) (floweringLifespan / dispersalTime))).setColor(getColor()); y += 22; new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.biology.pollination")) @@ -258,12 +258,11 @@ public class AnalystPageBiology extends ControlAnalystPage { y += 12; new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC - + I18N.localise("genetics.gui.analyst.biology.perLifetime", (int) - (floweringLifespan / pollinateTime))) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise( + "genetics.gui.analyst.biology.perLifetime", + (int) (floweringLifespan / pollinateTime))).setColor(getColor()); y += 22; } setSize(new IPoint(w(), y)); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java index adcf7c48..38c3b651 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageClimate.java @@ -1,5 +1,12 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; + import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IFlower; import binnie.core.craftgui.IWidget; @@ -19,13 +26,9 @@ import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IButterfly; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.BiomeDictionary; public class AnalystPageClimate extends ControlAnalystPage { + public AnalystPageClimate(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(0x006633); @@ -48,9 +51,8 @@ public class AnalystPageClimate extends ControlAnalystPage { } if (ind instanceof IButterfly) { - tempTol = ((IAlleleTolerance) - ind.getGenome().getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE)) - .getValue(); + tempTol = ((IAlleleTolerance) ind.getGenome() + .getActiveAllele(EnumButterflyChromosome.TEMPERATURE_TOLERANCE)).getValue(); humidTol = ((IAlleleTolerance) ind.getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE)) .getValue(); } @@ -60,32 +62,29 @@ public class AnalystPageClimate extends ControlAnalystPage { y += 16; new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.climate.temperature"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.climate.temperature"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createTemperatureBar(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, temp, tempTol); y += 16; if (!(ind instanceof IFlower)) { new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.climate.humidity"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.climate.humidity"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createHumidity(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, humid, humidTol); y += 16; } new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.climate.biomes"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.climate.biomes"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; List biomes = new ArrayList<>(); @@ -128,9 +127,10 @@ public class AnalystPageClimate extends ControlAnalystPage { setSize(new IPoint(w(), y + dy + 18 + 8)); } - protected void createTemperatureBar( - IWidget parent, float x, float y, float w, float h, EnumTemperature value, EnumTolerance tol) { + protected void createTemperatureBar(IWidget parent, float x, float y, float w, float h, EnumTemperature value, + EnumTolerance tol) { new ControlToleranceBar(parent, x, y, w, h, EnumTemperature.class) { + @Override protected String getName(EnumTemperature value) { return value.name; @@ -138,14 +138,15 @@ public class AnalystPageClimate extends ControlAnalystPage { @Override protected int getColor(EnumTemperature value) { - return (new int[] {0x00fffb, 0x78bbff, 0x4fff30, 0xffff00, 0xffa200, 0xff0000})[value.ordinal() - 1]; + return (new int[] { 0x00fffb, 0x78bbff, 0x4fff30, 0xffff00, 0xffa200, 0xff0000 })[value.ordinal() - 1]; } }.setValues(value, tol); } - protected void createHumidity( - IWidget parent, float x, float y, float w, float h, EnumHumidity value, EnumTolerance tol) { + protected void createHumidity(IWidget parent, float x, float y, float w, float h, EnumHumidity value, + EnumTolerance tol) { new ControlToleranceBar(parent, x, y, w, h, EnumHumidity.class) { + @Override protected String getName(EnumHumidity value) { return value.name; @@ -153,7 +154,7 @@ public class AnalystPageClimate extends ControlAnalystPage { @Override protected int getColor(EnumHumidity value) { - return (new int[] {0xffe7a3, 0x1aff00, 0x307cff})[value.ordinal()]; + return (new int[] { 0xffe7a3, 0x1aff00, 0x307cff })[value.ordinal()]; } }.setValues(value, tol); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 0e7531ae..79968fdf 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -1,5 +1,10 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.Collection; + +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; @@ -20,11 +25,9 @@ import binnie.core.util.I18N; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import java.util.ArrayList; -import java.util.Collection; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageDatabase extends ControlAnalystPage { + ControlScrollableContent scroll; boolean isMaster; @@ -47,13 +50,13 @@ public class AnalystPageDatabase extends ControlAnalystPage { new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 16; new ControlTextEdit(this, 20.0f, y, w() - 40.0f, 16.0f) { + @Override public void onTextEdit(String value) { Collection options = new ArrayList<>(); getSpecies(system); for (IAlleleSpecies species : getSpecies(system)) { - if (value != null - && !value.isEmpty() + if (value != null && !value.isEmpty() && !species.getName().toLowerCase().contains(value.toLowerCase())) { continue; } @@ -97,6 +100,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { if (textView) { scroll = new ControlListBox(this, 4.0f, y, w() - 8.0f, h() - y - 8.0f - 20.0f, 0.0f) { + @Override public void initialise() { super.initialise(); @@ -106,6 +110,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { @Override public IWidget createOption(IAlleleSpecies v, int y) { return new Control(getContent(), 0.0f, y, w(), 12.0f) { + IAlleleSpecies value = v; @Override @@ -120,6 +125,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { scroll.setScrollableContent(getItemScrollList(system, options)); } new ControlScrollBar(this, scroll.x() + scroll.w() - 6.0f, scroll.y() + 3.0f, 3.0f, scroll.h() - 6.0f, scroll) { + @Override public void onRenderBackground() { if (!isEnabled()) { @@ -136,6 +142,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { private IWidget getItemScrollList(BreedingSystem system, Collection options) { return new Control(scroll, 0.0f, 0.0f, scroll.w(), scroll.h()) { + @Override public void initialise() { int maxBiomePerLine = (int) ((w() - 4.0f + 2.0f) / 18.0f); @@ -146,9 +153,11 @@ public class AnalystPageDatabase extends ControlAnalystPage { IIndividual ind = system.getSpeciesRoot() .templateAsIndividual(system.getSpeciesRoot().getTemplate(species.getUID())); new ControlIndividualDisplay(this, biomeListX + dx, 2 + dy, ind) { + @Override public void initialise() { addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getSuperParent(); @@ -163,15 +172,12 @@ public class AnalystPageDatabase extends ControlAnalystPage { if (window.getIndividual() != null && window.getIndividual().getGenome().getPrimary() == species) { CraftGUI.render.color(0xeeeeee); - CraftGUI.render.texture( - CraftGUITexture.TabSolid, getArea().outset(1)); + CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().outset(1)); CraftGUI.render.color(AnalystPageDatabase.this.getColor()); - CraftGUI.render.texture( - CraftGUITexture.TabOutline, getArea().outset(1)); + CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().outset(1)); } else if (calculateIsMouseOver()) { CraftGUI.render.color(0xeeeeee); - CraftGUI.render.texture( - CraftGUITexture.TabSolid, getArea().outset(1)); + CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().outset(1)); } super.onRenderBackground(); } @@ -195,10 +201,10 @@ public class AnalystPageDatabase extends ControlAnalystPage { private Collection getSpecies(BreedingSystem system) { Collection species = new ArrayList<>(); species.addAll( - isMaster - ? system.getAllSpecies() + isMaster ? system.getAllSpecies() : system.getDiscoveredSpecies( - getWindow().getWorld(), getWindow().getPlayer().getGameProfile())); + getWindow().getWorld(), + getWindow().getPlayer().getGameProfile())); return species; } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index 7fa36411..e3e30775 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -1,5 +1,7 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlText; @@ -10,17 +12,16 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.util.I18N; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageDescription extends ControlAnalystPage { + public AnalystPageDescription(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(0x333333); int y = 4; IAlleleSpecies species = ind.getGenome().getPrimary(); - String branchBinomial = (species.getBranch() != null) - ? species.getBranch().getScientific() + String branchBinomial = (species.getBranch() != null) ? species.getBranch().getScientific() : I18N.localise("genetics.gui.analyst.description.unknown"); String desc = species.getDescription(); StringBuilder descBody = new StringBuilder(EnumChatFormatting.ITALIC.toString()); @@ -56,30 +57,27 @@ public class AnalystPageDescription extends ControlAnalystPage { y += 10; new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() - + EnumChatFormatting.RESET) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + EnumChatFormatting.RESET) + .setColor(getColor()); y += 20; new ControlTextCentered( - this, - y, - EnumChatFormatting.BOLD - + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) - + EnumChatFormatting.RESET) - .setColor(getColor()); + this, + y, + EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + + EnumChatFormatting.RESET).setColor(getColor()); - y += (int) (3.0f - + CraftGUI.render.textHeight( - EnumChatFormatting.BOLD - + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) - + EnumChatFormatting.RESET, - w())); + y += (int) (3.0f + CraftGUI.render.textHeight( + EnumChatFormatting.BOLD + I18N.localise("genetics.gui.analyst.description.discoveredBy", authority) + + EnumChatFormatting.RESET, + w())); new ControlTextCentered( - this, y, I18N.localise("genetics.gui.analyst.description.complexity", species.getComplexity())) - .setColor(getColor()); + this, + y, + I18N.localise("genetics.gui.analyst.description.complexity", species.getComplexity())) + .setColor(getColor()); y += 26; ControlText descText = new ControlText( @@ -94,10 +92,8 @@ public class AnalystPageDescription extends ControlAnalystPage { TextJustification.BOTTOM_RIGHT); descText.setColor(getColor()); signatureText.setColor(getColor()); - float descHeight = CraftGUI.render.textHeight( - descText.getValue(), descText.getSize().x()); - signatureText.setPosition( - new IPoint(signatureText.pos().x(), descText.getPosition().y() + descHeight + 10.0f)); + float descHeight = CraftGUI.render.textHeight(descText.getValue(), descText.getSize().x()); + signatureText.setPosition(new IPoint(signatureText.pos().x(), descText.getPosition().y() + descHeight + 10.0f)); setSize(new IPoint(w(), 20.0f + signatureText.y())); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java index be4350e6..69dd79fb 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageFruit.java @@ -1,5 +1,13 @@ package binnie.genetics.gui; +import java.lang.reflect.Field; +import java.util.Collection; +import java.util.Collections; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; @@ -14,14 +22,9 @@ import forestry.api.arboriculture.ITree; import forestry.api.genetics.IAllele; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Collections; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageFruit extends AnalystPageProduce { + public AnalystPageFruit(IWidget parent, IArea area, ITree ind) { super(parent, area); setColor(0xcc3300); @@ -29,13 +32,13 @@ public class AnalystPageFruit extends AnalystPageProduce { new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - String alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName( - EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD)); + String alleleName = Binnie.Genetics.treeBreedingSystem + .getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD)); new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.fruit.yield", alleleName)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.fruit.yield", alleleName)) + .setColor(getColor()); y += 20; Collection products = new UniqueItemStackSet(); @@ -102,8 +105,8 @@ public class AnalystPageFruit extends AnalystPageProduce { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.fruit.possible")).setColor(getColor()); y += 12; - Collection fruitAlleles = - Binnie.Genetics.getChromosomeMap(Binnie.Genetics.getTreeRoot()).get(EnumTreeChromosome.FRUITS); + Collection fruitAlleles = Binnie.Genetics.getChromosomeMap(Binnie.Genetics.getTreeRoot()) + .get(EnumTreeChromosome.FRUITS); for (IFruitFamily fam : ind.getGenome().getPrimary().getSuitableFruit()) { Collection stacks = new UniqueItemStackSet(); for (IAllele a : fruitAlleles) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index f7555945..b169f2a8 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -1,5 +1,9 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + +import org.lwjgl.opengl.GL11; + import binnie.Binnie; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.IWidget; @@ -16,10 +20,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; public class AnalystPageGenome extends ControlAnalystPage { + boolean active; public AnalystPageGenome(IWidget parent, IArea area, boolean active, IIndividual ind) { @@ -32,6 +35,7 @@ public class AnalystPageGenome extends ControlAnalystPage { ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass()); BreedingSystem system = Binnie.Genetics.getSystem(root); Control scaled = new Control(this, 0.0f, y, 0.0f, 0.0f) { + @Override public void onRenderBackground() { GL11.glPushMatrix(); @@ -46,23 +50,20 @@ public class AnalystPageGenome extends ControlAnalystPage { }; for (IChromosomeType chromo : system.getActiveKaryotype()) { - IAllele allele = active - ? ind.getGenome().getActiveAllele(chromo) + IAllele allele = active ? ind.getGenome().getActiveAllele(chromo) : ind.getGenome().getInactiveAllele(chromo); String alleleName = system.getAlleleName(chromo, allele); float height = CraftGUI.render.textHeight(alleleName, w() / 2.0f - 2.0f); new ControlText( - scaled, - new IArea(0.0f, y + (height - 9.0f) / 2.0f, w() / 2.0f - 2.0f, 0.0f), - system.getChromosomeShortName(chromo) + " :", - TextJustification.TOP_RIGHT) - .setColor(getColor()); + scaled, + new IArea(0.0f, y + (height - 9.0f) / 2.0f, w() / 2.0f - 2.0f, 0.0f), + system.getChromosomeShortName(chromo) + " :", + TextJustification.TOP_RIGHT).setColor(getColor()); new ControlText( - scaled, - new IArea(w() / 2.0f + 2.0f, y, w() / 2.0f - 2.0f, 0.0f), - alleleName, - TextJustification.TOP_LEFT) - .setColor(getColor()); + scaled, + new IArea(w() / 2.0f + 2.0f, y, w() / 2.0f - 2.0f, 0.0f), + alleleName, + TextJustification.TOP_LEFT).setColor(getColor()); y += (int) (3.0f + height); } setSize(new IPoint(w(), y + 8)); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java index 5bf90ce9..d8d46514 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java @@ -1,5 +1,7 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; @@ -8,9 +10,9 @@ import binnie.core.util.I18N; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.ITree; import forestry.api.genetics.IIndividual; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageGrowth extends ControlAnalystPage { + public AnalystPageGrowth(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(0x333333); @@ -29,21 +31,22 @@ public class AnalystPageGrowth extends ControlAnalystPage { y += 22; String alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName( - EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT)); + EnumTreeChromosome.HEIGHT, + ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT)); new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.height", alleleName)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.height", alleleName)) + .setColor(getColor()); y += 12; - alleleName = Binnie.Genetics.treeBreedingSystem.getAlleleName( - EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH)); + alleleName = Binnie.Genetics.treeBreedingSystem + .getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH)); new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.girth", alleleName)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.growth.girth", alleleName)) + .setColor(getColor()); y += 20; new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.growth.conditions")) @@ -51,11 +54,10 @@ public class AnalystPageGrowth extends ControlAnalystPage { y += 12; new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC - + tree.getGenome().getGrowthProvider().getDescription()) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + tree.getGenome().getGrowthProvider().getDescription()) + .setColor(getColor()); y += 12; for (String s : tree.getGenome().getGrowthProvider().getInfo()) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index 747c8a22..d0c13956 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -1,5 +1,7 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; @@ -10,9 +12,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageKaryogram extends ControlAnalystPage { + public AnalystPageKaryogram(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(0x9933ff); @@ -23,8 +25,7 @@ public class AnalystPageKaryogram extends ControlAnalystPage { ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind.getClass()); BreedingSystem system = Binnie.Genetics.getSystem(root); int maxBiomePerLine = (int) ((w() + 4.0f - 16.0f) / 22.0f); - float karygramX = - (w() - (Math.min(maxBiomePerLine, system.getActiveKaryotype().size()) * 18 - 4)) / 2.0f; + float karygramX = (w() - (Math.min(maxBiomePerLine, system.getActiveKaryotype().size()) * 18 - 4)) / 2.0f; int dx = 0; int dy = 0; int rem = system.getActiveKaryotype().size(); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 6d7cf301..5f2464c8 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -1,5 +1,11 @@ package binnie.genetics.gui; +import java.util.Collection; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.craftgui.CraftGUI; @@ -23,12 +29,9 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.apiculture.genetics.BeeDefinition; -import java.util.Collection; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageMutations extends ControlAnalystPage { + public AnalystPageMutations(IWidget parent, IArea area, IIndividual ind, boolean isMaster) { super(parent, area); setColor(0x333300); @@ -67,30 +70,27 @@ public class AnalystPageMutations extends ControlAnalystPage { hive = new ItemStack(Blocks.chest); } - if (ind.getGenome().getPrimary() - == BeeDefinition.VALIANT.getGenome().getPrimary()) { + if (ind.getGenome().getPrimary() == BeeDefinition.VALIANT.getGenome().getPrimary()) { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.habitat")) .setColor(getColor()); y += 10; new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.mutations.habitat.any")) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.mutations.habitat.any")) + .setColor(getColor()); y += 22; - } else if (ind.getGenome().getPrimary() - == BeeDefinition.MONASTIC.getGenome().getPrimary()) { + } else if (ind.getGenome().getPrimary() == BeeDefinition.MONASTIC.getGenome().getPrimary()) { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.habitat")) .setColor(getColor()); y += 10; new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC - + I18N.localise("genetics.gui.analyst.mutations.habitat.villagers")) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.mutations.habitat.villagers")) + .setColor(getColor()); y += 22; } else if (hive != null) { new ControlTextCentered(this, y, I18N.localise("genetics.gui.analyst.mutations.habitat")) @@ -98,8 +98,7 @@ public class AnalystPageMutations extends ControlAnalystPage { y += 10; ControlItemDisplay display = new ControlItemDisplay(this, (w() - 16.0f) / 2.0f, y); - if (ind.getGenome().getPrimary() - == BeeDefinition.STEADFAST.getGenome().getPrimary()) { + if (ind.getGenome().getPrimary() == BeeDefinition.STEADFAST.getGenome().getPrimary()) { display.addTooltip(I18N.localise("genetics.gui.analyst.mutations.habitat.chest")); } else { display.setTooltip(); @@ -127,16 +126,15 @@ public class AnalystPageMutations extends ControlAnalystPage { new ControlUnknownMutation(this, ox + dx, y, 44.0f, 16.0f); } else { new Control(this, ox + dx, y, 44.0f, 16.0f) { + @Override public void initialise() { IAlleleSpecies species0 = mutation.getAllele0(); IAlleleSpecies species2 = mutation.getAllele1(); String comb = species0.getName() + " + " + species2.getName(); addTooltip(comb); - String chance = - getMutationColor(mutation.getBaseChance()).getCode() - + I18N.localise("genetics.gui.analyst.mutations.chance", (int) - mutation.getBaseChance()); + String chance = getMutationColor(mutation.getBaseChance()).getCode() + I18N + .localise("genetics.gui.analyst.mutations.chance", (int) mutation.getBaseChance()); if (specificChance != mutation.getBaseChance()) { chance += getMutationColor(specificChance).getCode() + " " + I18N.localise("genetics.gui.analyst.mutations.chance", (int) specificChance); @@ -152,22 +150,17 @@ public class AnalystPageMutations extends ControlAnalystPage { public void onRenderBackground() { CraftGUI.render.item( new IPoint(0.0f, 0.0f), - system.getDefaultMember( - mutation.getAllele0().getUID())); + system.getDefaultMember(mutation.getAllele0().getUID())); CraftGUI.render.item( new IPoint(28.0f, 0.0f), - system.getDefaultMember( - mutation.getAllele1().getUID())); + system.getDefaultMember(mutation.getAllele1().getUID())); if (specificChance != mutation.getBaseChance()) { - CraftGUI.render.color(getMutationColor(mutation.getBaseChance()) - .getColor()); + CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor()); CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd0.getIcon()); - CraftGUI.render.color( - getMutationColor(specificChance).getColor()); + CraftGUI.render.color(getMutationColor(specificChance).getColor()); CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd1.getIcon()); } else { - CraftGUI.render.color(getMutationColor(mutation.getBaseChance()) - .getColor()); + CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor()); CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconAdd.getIcon()); } } @@ -202,6 +195,7 @@ public class AnalystPageMutations extends ControlAnalystPage { new ControlUnknownMutation(this, ox + dx, y, 44.0f, 16.0f); } else { new Control(this, ox + dx, y, 44.0f, 16.0f) { + @Override public void initialise() { IAlleleSpecies species0 = (IAlleleSpecies) speciesComb; @@ -209,13 +203,11 @@ public class AnalystPageMutations extends ControlAnalystPage { addTooltip(species2.getName()); String comb = speciesCurrent.getName() + " + " + species0.getName(); addTooltip(comb); - String chance = - getMutationColor(mutation.getBaseChance()).getCode() - + I18N.localise("genetics.gui.analyst.mutations.chance", (int) - mutation.getBaseChance()); + String chance = getMutationColor(mutation.getBaseChance()).getCode() + I18N + .localise("genetics.gui.analyst.mutations.chance", (int) mutation.getBaseChance()); if (specificChance2 != mutation.getBaseChance()) { - chance = chance - + getMutationColor(specificChance2).getCode() + " " + chance = chance + getMutationColor(specificChance2).getCode() + + " " + I18N.localise("genetics.gui.analyst.mutations.chance", (int) specificChance2); } addTooltip(chance); @@ -230,18 +222,14 @@ public class AnalystPageMutations extends ControlAnalystPage { CraftGUI.render.item( new IPoint(28.0f, 0.0f), system.getDefaultMember(mutation.getTemplate()[0].getUID())); - CraftGUI.render.color( - getMutationColor(mutation.getBaseChance()).getColor()); + CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor()); if (specificChance2 != mutation.getBaseChance()) { - CraftGUI.render.color(getMutationColor(mutation.getBaseChance()) - .getColor()); + CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor()); CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow0.getIcon()); - CraftGUI.render.color( - getMutationColor(specificChance2).getColor()); + CraftGUI.render.color(getMutationColor(specificChance2).getColor()); CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow1.getIcon()); } else { - CraftGUI.render.color(getMutationColor(mutation.getBaseChance()) - .getColor()); + CraftGUI.render.color(getMutationColor(mutation.getBaseChance()).getColor()); CraftGUI.render.iconItem(new IPoint(14.0f, 0.0f), ModuleItem.iconArrow.getIcon()); } } @@ -263,8 +251,7 @@ public class AnalystPageMutations extends ControlAnalystPage { } private boolean isKnown(BreedingSystem system, IMutation mutation) { - return system.getDiscoveredMutations( - getWindow().getWorld(), getWindow().getPlayer().getGameProfile()) + return system.getDiscoveredMutations(getWindow().getWorld(), getWindow().getPlayer().getGameProfile()) .contains(mutation); } @@ -297,6 +284,7 @@ public class AnalystPageMutations extends ControlAnalystPage { } static class ControlUnknownMutation extends Control { + public ControlUnknownMutation(IWidget parent, float x, float y, float w, float h) { super(parent, x, y, w, h); addAttribute(WidgetAttribute.MOUSE_OVER); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index 1bd39cd6..e9e44e35 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -1,16 +1,10 @@ package binnie.genetics.gui; -import binnie.core.craftgui.IWidget; -import binnie.core.craftgui.controls.ControlTextCentered; -import binnie.core.craftgui.geometry.IArea; -import binnie.core.craftgui.minecraft.control.ControlItemDisplay; -import binnie.core.util.UniqueFluidStackSet; -import binnie.core.util.UniqueItemStackSet; -import forestry.api.recipes.RecipeManagers; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -21,7 +15,16 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.ShapelessOreRecipe; +import binnie.core.craftgui.IWidget; +import binnie.core.craftgui.controls.ControlTextCentered; +import binnie.core.craftgui.geometry.IArea; +import binnie.core.craftgui.minecraft.control.ControlItemDisplay; +import binnie.core.util.UniqueFluidStackSet; +import binnie.core.util.UniqueItemStackSet; +import forestry.api.recipes.RecipeManagers; + public abstract class AnalystPageProduce extends ControlAnalystPage { + public AnalystPageProduce(IWidget parent, IArea area) { super(parent, area); } @@ -37,8 +40,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { public Collection getCentrifuge(ItemStack stack) { List products = new ArrayList<>(); - for (Map.Entry recipe : - RecipeManagers.centrifugeManager.getRecipes().entrySet()) { + for (Map.Entry recipe : RecipeManagers.centrifugeManager.getRecipes().entrySet()) { boolean isRecipe = false; for (Object obj : recipe.getKey()) { if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { @@ -59,8 +61,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { public Collection getSqueezer(ItemStack stack) { List products = new ArrayList<>(); - for (Map.Entry recipe : - RecipeManagers.squeezerManager.getRecipes().entrySet()) { + for (Map.Entry recipe : RecipeManagers.squeezerManager.getRecipes().entrySet()) { boolean isRecipe = false; for (Object obj : recipe.getKey()) { if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { @@ -136,8 +137,7 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { public Collection getSqueezerFluid(ItemStack stack) { List products = new ArrayList<>(); - for (Map.Entry recipe : - RecipeManagers.squeezerManager.getRecipes().entrySet()) { + for (Map.Entry recipe : RecipeManagers.squeezerManager.getRecipes().entrySet()) { boolean isRecipe = false; for (Object obj : recipe.getKey()) { if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { @@ -197,8 +197,8 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { allFluids.addAll(fluids3); for (FluidStack fluid : allFluids) { ItemStack container = null; - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.emptyContainer.isItemEqual(new ItemStack(Items.glass_bottle)) && data.fluid.isFluidEqual(fluid)) { container = data.filledContainer; @@ -237,8 +237,12 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(soilStack); soilStack.stackSize = 1; - ControlItemDisplay display = - new ControlItemDisplay(this, biomeListX + dx, y + dy, soilStack, fluid == null); + ControlItemDisplay display = new ControlItemDisplay( + this, + biomeListX + dx, + y + dy, + soilStack, + fluid == null); if (fluid != null) { display.addTooltip(fluid.getLocalizedName()); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index 737b8f20..b24dae88 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -1,5 +1,17 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.craftgui.IWidget; @@ -17,38 +29,27 @@ import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.plugins.PluginApiculture; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; public class AnalystPageProducts extends AnalystPageProduce { + public AnalystPageProducts(IWidget parent, IArea area, IBee ind) { super(parent, area); setColor(0xcc3300); IBeeGenome genome = ind.getGenome(); float speed = genome.getSpeed(); - float modeSpeed = Binnie.Genetics.getBeeRoot() - .getBeekeepingMode(BinnieCore.proxy.getWorld()) - .getBeeModifier() + float modeSpeed = Binnie.Genetics.getBeeRoot().getBeekeepingMode(BinnieCore.proxy.getWorld()).getBeeModifier() .getProductionModifier(genome, 1.0f); int y = 4; new ControlTextCentered(this, y, EnumChatFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - String alleleName = Binnie.Genetics.beeBreedingSystem.getAlleleName( - EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED)); + String alleleName = Binnie.Genetics.beeBreedingSystem + .getAlleleName(EnumBeeChromosome.SPEED, ind.getGenome().getActiveAllele(EnumBeeChromosome.SPEED)); new ControlTextCentered( - this, - y, - EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.produce.rate", alleleName)) - .setColor(getColor()); + this, + y, + EnumChatFormatting.ITALIC + I18N.localise("genetics.gui.analyst.produce.rate", alleleName)) + .setColor(getColor()); y += 20; Collection refinedProducts = new UniqueItemStackSet(); @@ -116,8 +117,8 @@ public class AnalystPageProducts extends AnalystPageProduce { } int maxBiomePerLine = (int) ((w() + 2.0f - 16.0f) / 18.0f); - float biomeListX = - (w() - (Math.min(maxBiomePerLine, allFluids.size() + refinedProducts.size()) * 18 - 2)) / 2.0f; + float biomeListX = (w() - (Math.min(maxBiomePerLine, allFluids.size() + refinedProducts.size()) * 18 - 2)) + / 2.0f; int dx = 0; int dy = 0; for (ItemStack soilStack : refinedProducts) { @@ -138,8 +139,8 @@ public class AnalystPageProducts extends AnalystPageProduce { } ItemStack container = null; - for (FluidContainerRegistry.FluidContainerData data : - FluidContainerRegistry.getRegisteredFluidContainerData()) { + for (FluidContainerRegistry.FluidContainerData data : FluidContainerRegistry + .getRegisteredFluidContainerData()) { if (data.emptyContainer.isItemEqual(new ItemStack(Items.glass_bottle)) && data.fluid.isFluidEqual(soilStack2)) { container = data.filledContainer; @@ -174,6 +175,7 @@ public class AnalystPageProducts extends AnalystPageProduce { private void createProductEntry(ItemStack key, Float value, int y, float speed) { ControlItemDisplay item = new ControlItemDisplay(this, 16.0f, y) { + @Override public void getTooltip(Tooltip tooltip) { super.getTooltip(tooltip); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java index f5287e3f..203ed905 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageSoil.java @@ -1,5 +1,12 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; + import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; @@ -15,13 +22,9 @@ import binnie.core.genetics.Tolerance; import binnie.core.util.I18N; import binnie.genetics.genetics.AlleleHelper; import forestry.api.genetics.EnumTolerance; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageSoil extends ControlAnalystPage { + public AnalystPageSoil(IWidget parent, IArea area, IFlower flower) { super(parent, area); setColor(0x663300); @@ -34,33 +37,30 @@ public class AnalystPageSoil extends ControlAnalystPage { y += 16; new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.soil.moistureTolerance"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.soil.moistureTolerance"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createMoisture(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, moisture, moistureTol); y += 16; new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.soil.pHTolerance"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.soil.pHTolerance"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; createAcidity(this, (w() - 100.0f) / 2.0f, y, 100.0f, 10.0f, pH, pHTol); y += 16; new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.soil.recommendedSoil"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.soil.recommendedSoil"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; EnumMoisture recomMoisture = EnumMoisture.NORMAL; @@ -106,18 +106,16 @@ public class AnalystPageSoil extends ControlAnalystPage { recomSoil.setTooltip(); y += 32; new ControlText( - this, - new IArea(4.0f, y, w() - 8.0f, 14.0f), - I18N.localise("genetics.gui.analyst.soil.otherSoils"), - TextJustification.MIDDLE_CENTER) - .setColor(getColor()); + this, + new IArea(4.0f, y, w() - 8.0f, 14.0f), + I18N.localise("genetics.gui.analyst.soil.otherSoils"), + TextJustification.MIDDLE_CENTER).setColor(getColor()); y += 12; List stacks = new ArrayList<>(); for (EnumAcidity a : EnumSet.range(EnumAcidity.ACID, EnumAcidity.ALKALINE)) { for (EnumMoisture b : EnumSet.range(EnumMoisture.DRY, EnumMoisture.DAMP)) { - if (Tolerance.canTolerate(pH, a, pHTol) - && Tolerance.canTolerate(moisture, b, moistureTol) + if (Tolerance.canTolerate(pH, a, pHTol) && Tolerance.canTolerate(moisture, b, moistureTol) && (a != recomPH || b != recomMoisture)) { stacks.add(new ItemStack(Botany.soil, 1, BlockSoil.getMeta(a, b))); } @@ -134,9 +132,10 @@ public class AnalystPageSoil extends ControlAnalystPage { } } - protected void createMoisture( - IWidget parent, float x, float y, float w, float h, EnumMoisture value, EnumTolerance tol) { + protected void createMoisture(IWidget parent, float x, float y, float w, float h, EnumMoisture value, + EnumTolerance tol) { new ControlToleranceBar(parent, x, y, w, h, EnumMoisture.class) { + @Override protected String getName(EnumMoisture value) { return AlleleHelper.toDisplay(value); @@ -144,14 +143,15 @@ public class AnalystPageSoil extends ControlAnalystPage { @Override protected int getColor(EnumMoisture value) { - return (new int[] {0xccffcc, 0x66ccff, 0x3366ff})[value.ordinal()]; + return (new int[] { 0xccffcc, 0x66ccff, 0x3366ff })[value.ordinal()]; } }.setValues(value, tol); } - protected void createAcidity( - IWidget parent, float x, float y, float w, float h, EnumAcidity value, EnumTolerance tol) { + protected void createAcidity(IWidget parent, float x, float y, float w, float h, EnumAcidity value, + EnumTolerance tol) { new ControlToleranceBar(parent, x, y, w, h, EnumAcidity.class) { + @Override protected String getName(EnumAcidity value) { return AlleleHelper.toDisplay(value); @@ -159,7 +159,7 @@ public class AnalystPageSoil extends ControlAnalystPage { @Override protected int getColor(EnumAcidity value) { - return (new int[] {0xff0066, 0x00ff00, 0x0066ff})[value.ordinal()]; + return (new int[] { 0xff0066, 0x00ff00, 0x0066ff })[value.ordinal()]; } }.setValues(value, tol); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java index 8244a72e..7fa95aff 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java @@ -1,13 +1,15 @@ package binnie.genetics.gui; +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; import binnie.core.util.I18N; import forestry.api.lepidopterology.IButterfly; -import net.minecraft.util.EnumChatFormatting; public class AnalystPageSpecimen extends ControlAnalystPage { + public AnalystPageSpecimen(IWidget parent, IArea area, IButterfly ind) { super(parent, area); setColor(0x333333); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/AnalystPageWood.java index cf46eab7..7fafbe11 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageWood.java @@ -1,5 +1,11 @@ package binnie.genetics.gui; +import java.util.Collection; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.ControlTextCentered; import binnie.core.craftgui.geometry.IArea; @@ -14,12 +20,9 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAlleleBoolean; -import java.util.Collection; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.util.ForgeDirection; public class AnalystPageWood extends AnalystPageProduce { + public AnalystPageWood(IWidget parent, IArea area, ITree ind) { super(parent, area); setColor(0x663300); diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index ea806374..79779493 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -18,6 +18,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; public class ControlAnalystChromosome extends Control implements ITooltip { + IAllele allele0; IAllele allele1; IChromosomeType chromosomeType; @@ -25,14 +26,8 @@ public class ControlAnalystChromosome extends Control implements ITooltip { Texture Homozygous; Texture Heterozygous; - public ControlAnalystChromosome( - IWidget parent, - float x, - float y, - ISpeciesRoot root, - IChromosomeType type, - IAllele allele0, - IAllele allele1) { + public ControlAnalystChromosome(IWidget parent, float x, float y, ISpeciesRoot root, IChromosomeType type, + IAllele allele0, IAllele allele1) { super(parent, x, y, 16.0f, 22.0f); Homozygous = new StandardTexture(0, 0, 16, 22, BinnieCoreTexture.GUIAnalyst); Heterozygous = new StandardTexture(16, 0, 16, 22, BinnieCoreTexture.GUIAnalyst); @@ -60,10 +55,14 @@ public class ControlAnalystChromosome extends Control implements ITooltip { if (isHomozygous()) { tooltip.add(system.getAlleleName(chromosomeType, allele0)); } else { - tooltip.add(I18N.localise( - "genetics.gui.analyst.chromosome.active", system.getAlleleName(chromosomeType, allele0))); - tooltip.add(I18N.localise( - "genetics.gui.analyst.chromosome.inactive", system.getAlleleName(chromosomeType, allele1))); + tooltip.add( + I18N.localise( + "genetics.gui.analyst.chromosome.active", + system.getAlleleName(chromosomeType, allele0))); + tooltip.add( + I18N.localise( + "genetics.gui.analyst.chromosome.inactive", + system.getAlleleName(chromosomeType, allele1))); } } } diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java index a1a69b5f..878e238e 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java @@ -1,12 +1,14 @@ package binnie.genetics.gui; +import java.text.DecimalFormat; + import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IArea; import binnie.core.util.I18N; -import java.text.DecimalFormat; public abstract class ControlAnalystPage extends Control { + public ControlAnalystPage(IWidget parent, IArea area) { super(parent, area); hide(); diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/ControlBiome.java index 63cf4679..49f0dfd1 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/ControlBiome.java @@ -1,5 +1,9 @@ package binnie.genetics.gui; +import net.minecraft.util.IIcon; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -7,11 +11,9 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; import binnie.core.craftgui.geometry.IPoint; import forestry.core.render.TextureManager; -import net.minecraft.util.IIcon; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.BiomeDictionary; public class ControlBiome extends Control implements ITooltip { + BiomeGenBase biome; String iconCategory; diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index bf1f1d82..c2538b36 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -15,6 +15,7 @@ import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.genetics.IChromosomeType; public class ControlChromoPicker extends Control implements ITooltip { + Texture Selected; Texture Texture; IChromosomeType type; @@ -28,12 +29,14 @@ public class ControlChromoPicker extends Control implements ITooltip { addAttribute(WidgetAttribute.MOUSE_OVER); this.parent = parent; addSelfEventHandler(new EventWidget.StartMouseOver.Handler() { + @Override public void onEvent(EventWidget.StartMouseOver event) { callEvent(new EventValueChanged(getWidget(), type)); } }); addSelfEventHandler(new EventWidget.EndMouseOver.Handler() { + @Override public void onEvent(EventWidget.EndMouseOver event) { callEvent(new EventValueChanged<>(getWidget(), null)); diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index 936dbef8..9d60453f 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -17,6 +17,7 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; public class ControlChromosome extends Control implements IControlValue { + Texture BeeTexture; Texture TreeTexture; Texture MothTexture; diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index 66636bb1..d6287cc8 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -8,6 +8,7 @@ import binnie.core.craftgui.geometry.TextJustification; import binnie.core.genetics.Gene; public class ControlGenesisOption extends ControlOption { + public ControlGenesisOption(ControlList parent, Gene gene, int y) { super(parent, gene, y); } @@ -24,9 +25,15 @@ public class ControlGenesisOption extends ControlOption { public void onRenderBackground() { super.onRenderBackground(); CraftGUI.render.text( - new IArea(0.0f, 0.0f, 70.0f, 22.0f), TextJustification.MIDDLE_CENTER, getChromosomeName(), getColor()); + new IArea(0.0f, 0.0f, 70.0f, 22.0f), + TextJustification.MIDDLE_CENTER, + getChromosomeName(), + getColor()); CraftGUI.render.text( - new IArea(75.0f, 0.0f, 80.0f, 22.0f), TextJustification.MIDDLE_CENTER, getAlleleName(), getColor()); + new IArea(75.0f, 0.0f, 80.0f, 22.0f), + TextJustification.MIDDLE_CENTER, + getAlleleName(), + getColor()); CraftGUI.render.solid(new IArea(70.0f, 2.0f, 1.0f, 16.0f), 0xff000000 + getColor()); } } diff --git a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java index 68dff52b..1e0fe704 100644 --- a/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java +++ b/src/main/java/binnie/genetics/gui/ControlIndividualDisplay.java @@ -1,5 +1,7 @@ package binnie.genetics.gui; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -8,9 +10,9 @@ import binnie.core.craftgui.minecraft.control.ControlItemDisplay; import binnie.core.genetics.BreedingSystem; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; public class ControlIndividualDisplay extends ControlItemDisplay implements ITooltip { + public ControlIndividualDisplay(IWidget parent, float x, float y, IIndividual ind) { this(parent, x, y, 16.0f, ind); } diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index 52f8e507..820151f2 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -1,5 +1,9 @@ package binnie.genetics.gui; +import java.util.EnumSet; + +import net.minecraft.util.EnumChatFormatting; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -11,10 +15,9 @@ import binnie.core.craftgui.geometry.IBorder; import binnie.core.genetics.Tolerance; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; -import java.util.EnumSet; -import net.minecraft.util.EnumChatFormatting; public abstract class ControlToleranceBar> extends Control implements ITooltip { + EnumSet tolerated; EnumSet fullSet; private Class enumClass; diff --git a/src/main/java/binnie/genetics/gui/ControlTooltip.java b/src/main/java/binnie/genetics/gui/ControlTooltip.java index e10380b1..a5611231 100644 --- a/src/main/java/binnie/genetics/gui/ControlTooltip.java +++ b/src/main/java/binnie/genetics/gui/ControlTooltip.java @@ -6,6 +6,7 @@ import binnie.core.craftgui.Tooltip; import binnie.core.craftgui.controls.core.Control; public class ControlTooltip extends Control implements ITooltip { + public ControlTooltip(IWidget parent, float x, float y, float w, float h) { super(parent, x, y, w, h); } diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 3f19d276..e132af76 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -1,5 +1,12 @@ package binnie.genetics.gui; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.AbstractMod; @@ -39,13 +46,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class WindowAnalyst extends Window { + protected IWidget baseWidget; protected ControlScrollableContent leftPage; protected ControlScrollableContent rightPage; @@ -91,11 +94,11 @@ public class WindowAnalyst extends Window { private void setupValidators() { if (!isDatabase) { getWindowInventory().setValidator(0, new SlotValidator.Individual() { + @Override public boolean isValid(ItemStack itemStack) { return Analyser.isAnalysed(itemStack) - || (Analyser.isAnalysable(itemStack) - && getWindowInventory().getStackInSlot(1) != null); + || (Analyser.isAnalysable(itemStack) && getWindowInventory().getStackInSlot(1) != null); } }); getWindowInventory() @@ -134,10 +137,12 @@ public class WindowAnalyst extends Window { if (isDatabase) { for (BreedingSystem syst : Binnie.Genetics.getActiveSystems()) { new Control(this, x, y, 20.0f, 20.0f) { + @Override public void initialise() { addAttribute(WidgetAttribute.MOUSE_OVER); addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { setSystem(syst); @@ -154,12 +159,10 @@ public class WindowAnalyst extends Window { public void onRenderBackground() { CraftGUI.render.color(syst.getColor()); int outset = (getSystem() == syst) ? 1 : 0; - CraftGUI.render.texture( - CraftGUITexture.TabOutline, getArea().outset(outset)); + CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().outset(outset)); if (getSystem() == syst) { CraftGUI.render.color(1140850688 + syst.getColor()); - CraftGUI.render.texture( - CraftGUITexture.TabSolid, getArea().outset(outset)); + CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().outset(outset)); } CraftGUI.render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative()); } @@ -175,6 +178,7 @@ public class WindowAnalyst extends Window { } tabBar = new Control(this, x, 28.0f, w() - 16.0f - x, 20.0f); analystPanel = new Panel(this, 16.0f, 54.0f, 280.0f, 164.0f, MinecraftGUI.PanelType.Outline) { + @Override public void onRenderBackground() { CraftGUI.render.gradientRect(getArea(), 0x44ffffff, 0x66ffffff); @@ -185,19 +189,25 @@ public class WindowAnalyst extends Window { public void initialise() { setColor(0x444444); float sectionWidth = (w() - 8.0f - 4.0f) / 2.0f; - leftPage = - new ControlScrollableContent( - this, 3.0f, 3.0f, sectionWidth + 2.0f, h() - 8.0f + 2.0f, 0.0f) { - @Override - public void onRenderBackground() { - if (getContent() == null) { - return; - } - CraftGUI.render.color(getContent().getColor()); - CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea()); - } - }; + leftPage = new ControlScrollableContent( + this, + 3.0f, + 3.0f, + sectionWidth + 2.0f, + h() - 8.0f + 2.0f, + 0.0f) { + + @Override + public void onRenderBackground() { + if (getContent() == null) { + return; + } + CraftGUI.render.color(getContent().getColor()); + CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea()); + } + }; new ControlScrollBar(this, sectionWidth + 2.0f - 3.0f, 6.0f, 3.0f, h() - 8.0f + 2.0f - 6.0f, leftPage) { + @Override public void onRenderBackground() { if (!isEnabled()) { @@ -210,22 +220,26 @@ public class WindowAnalyst extends Window { getArea(), 1140850688 + leftPage.getContent().getColor(), 0x44000000 + leftPage.getContent().getColor()); - CraftGUI.render.solid( - getRenderArea(), leftPage.getContent().getColor()); + CraftGUI.render.solid(getRenderArea(), leftPage.getContent().getColor()); + } + }; + rightPage = new ControlScrollableContent( + this, + 3.0f + sectionWidth + 4.0f, + 3.0f, + sectionWidth + 2.0f, + h() - 8.0f + 2.0f, + 0.0f) { + + @Override + public void onRenderBackground() { + if (getContent() == null) { + return; + } + CraftGUI.render.color(getContent().getColor()); + CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea()); } }; - rightPage = - new ControlScrollableContent( - this, 3.0f + sectionWidth + 4.0f, 3.0f, sectionWidth + 2.0f, h() - 8.0f + 2.0f, 0.0f) { - @Override - public void onRenderBackground() { - if (getContent() == null) { - return; - } - CraftGUI.render.color(getContent().getColor()); - CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea()); - } - }; new ControlScrollBar( this, sectionWidth + 2.0f - 3.0f + sectionWidth + 4.0f, @@ -233,6 +247,7 @@ public class WindowAnalyst extends Window { 3.0f, h() - 8.0f + 2.0f - 6.0f, rightPage) { + @Override public void onRenderBackground() { if (!isEnabled()) { @@ -245,8 +260,7 @@ public class WindowAnalyst extends Window { getArea(), 1140850688 + rightPage.getContent().getColor(), 0x44000000 + rightPage.getContent().getColor()); - CraftGUI.render.solid( - getRenderArea(), rightPage.getContent().getColor()); + CraftGUI.render.solid(getRenderArea(), rightPage.getContent().getColor()); } }; analystPageSize = new IArea(1.0f, 1.0f, sectionWidth, h() - 8.0f); @@ -265,6 +279,7 @@ public class WindowAnalyst extends Window { slideUpInv.setSlide(false); } addEventHandler(new EventKey.Down.Handler() { + @Override public void onEvent(EventKey.Down event) { if (event.getKey() == 205) { @@ -278,6 +293,7 @@ public class WindowAnalyst extends Window { if (!isDatabase) { analystNone = new Control(analystPanel, 0.0f, 0.0f, analystPanel.w(), analystPanel.h()) { + @Override public void initialise() { new ControlTextCentered(this, 20.0f, I18N.localise("genetics.gui.analyst.info")).setColor(0x444444); @@ -307,8 +323,7 @@ public class WindowAnalyst extends Window { setPage(rightPage, null); if (isDatabase) { analystPages.add( - (databasePage != null) - ? databasePage + (databasePage != null) ? databasePage : new AnalystPageDatabase(analystPanel, analystPageSize, currentSystem, isMaster)); } @@ -352,6 +367,7 @@ public class WindowAnalyst extends Window { for (ControlAnalystPage page : analystPages) { new ControlTooltip(tabBar, x, 0.0f, width, tabBar.h()) { + ControlAnalystPage value; @Override @@ -365,6 +381,7 @@ public class WindowAnalyst extends Window { addAttribute(WidgetAttribute.MOUSE_OVER); value = page; addSelfEventHandler(new EventMouse.Down.Handler() { + @Override public void onEvent(EventMouse.Down event) { int currentIndex = analystPages.indexOf(rightPage.getContent()); @@ -395,8 +412,7 @@ public class WindowAnalyst extends Window { CraftGUI.render.color((active ? 0xff000000 : 0x44000000) + value.getColor()); CraftGUI.render.texture(CraftGUITexture.TabSolid, getArea().inset(1)); CraftGUI.render.color(value.getColor()); - CraftGUI.render.texture( - CraftGUITexture.TabOutline, getArea().inset(1)); + CraftGUI.render.texture(CraftGUITexture.TabOutline, getArea().inset(1)); super.onRenderBackground(); } }; @@ -468,19 +484,13 @@ public class WindowAnalyst extends Window { super.onWindowInventoryChanged(); if (getWindowInventory().getStackInSlot(0) != null && !Analyser.isAnalysed(getWindowInventory().getStackInSlot(0))) { - getWindowInventory() - .setInventorySlotContents( - 0, Analyser.analyse(getWindowInventory().getStackInSlot(0))); + getWindowInventory().setInventorySlotContents(0, Analyser.analyse(getWindowInventory().getStackInSlot(0))); getWindowInventory().decrStackSize(1, 1); } - IIndividual ind = - AlleleManager.alleleRegistry.getIndividual(getWindowInventory().getStackInSlot(0)); + IIndividual ind = AlleleManager.alleleRegistry.getIndividual(getWindowInventory().getStackInSlot(0)); if (ind != null) { - ind.getGenome() - .getSpeciesRoot() - .getBreedingTracker(getWorld(), getUsername()) - .registerBirth(ind); + ind.getGenome().getSpeciesRoot().getBreedingTracker(getWorld(), getUsername()).registerBirth(ind); } if (isClient()) { diff --git a/src/main/java/binnie/genetics/item/GeneticLiquid.java b/src/main/java/binnie/genetics/item/GeneticLiquid.java index 3d398172..fb139354 100644 --- a/src/main/java/binnie/genetics/item/GeneticLiquid.java +++ b/src/main/java/binnie/genetics/item/GeneticLiquid.java @@ -1,15 +1,17 @@ package binnie.genetics.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidStack; + import binnie.Binnie; import binnie.core.liquid.FluidContainer; import binnie.core.liquid.IFluidType; import binnie.core.util.I18N; import binnie.genetics.Genetics; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidStack; public enum GeneticLiquid implements IFluidType { + GrowthMedium("growthMedium", 0xebe8b5), Bacteria("bacteria", 0xd8ba81), BacteriaPoly("bacteriaPoly", 0xae9cc4), diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index a4e1ee0f..25b0e1c5 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -1,14 +1,17 @@ package binnie.genetics.item; -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; -import binnie.genetics.Genetics; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.item.IItemMisc; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; + public enum GeneticsItems implements IItemMisc { + LaboratoryCasing("casingIron"), DNADye("dnaDye"), FluorescentDye("dyeFluor"), diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 330a3fb6..c58f9231 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,18 +1,20 @@ package binnie.genetics.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ItemAnalyst extends Item { + public ItemAnalyst() { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("analyst"); diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 7436cc32..48d03cfb 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,12 +1,7 @@ package binnie.genetics.item; -import binnie.core.util.I18N; -import binnie.genetics.Genetics; -import binnie.genetics.GeneticsCreativeTab; -import binnie.genetics.core.GeneticsGUI; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; +import binnie.genetics.core.GeneticsGUI; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemDatabase extends Item { + protected IIcon iconMaster; public ItemDatabase() { @@ -53,19 +56,18 @@ public class ItemDatabase extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (stack.getItemDamage() == 0) { - Genetics.proxy.openGui( - GeneticsGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); + Genetics.proxy + .openGui(GeneticsGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); } else { - Genetics.proxy.openGui( - GeneticsGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); + Genetics.proxy + .openGui(GeneticsGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); } return stack; } @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) - ? I18N.localise("genetics.item.database.0.name") + return (stack.getItemDamage() == 0) ? I18N.localise("genetics.item.database.0.name") : I18N.localise("genetics.item.database.1.name"); } } diff --git a/src/main/java/binnie/genetics/item/ItemFieldKit.java b/src/main/java/binnie/genetics/item/ItemFieldKit.java index ffeea9fb..a2548ed9 100644 --- a/src/main/java/binnie/genetics/item/ItemFieldKit.java +++ b/src/main/java/binnie/genetics/item/ItemFieldKit.java @@ -1,5 +1,14 @@ package binnie.genetics.item; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.gui.BinnieCoreGUI; @@ -7,15 +16,9 @@ import binnie.core.util.I18N; import binnie.genetics.GeneticsCreativeTab; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; public class ItemFieldKit extends Item { + private IIcon fieldKit0; private IIcon fieldKit1; private IIcon fieldKit2; @@ -56,8 +59,8 @@ public class ItemFieldKit extends Item { @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { if (!player.isSneaking()) { - BinnieCore.proxy.openGui( - BinnieCoreGUI.FieldKit, player, (int) player.posX, (int) player.posY, (int) player.posZ); + BinnieCore.proxy + .openGui(BinnieCoreGUI.FieldKit, player, (int) player.posX, (int) player.posY, (int) player.posZ); } return itemStack; } diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index fa925cc6..3b96075a 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,12 +1,7 @@ package binnie.genetics.item; -import binnie.core.util.I18N; -import binnie.genetics.Genetics; -import binnie.genetics.GeneticsCreativeTab; -import binnie.genetics.genetics.IGeneItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +9,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import binnie.core.util.I18N; +import binnie.genetics.Genetics; +import binnie.genetics.GeneticsCreativeTab; +import binnie.genetics.genetics.IGeneItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public abstract class ItemGene extends Item { + protected IIcon[] icons; public ItemGene(String unlocName) { diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 3ffceff8..6a861e45 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,18 +1,20 @@ package binnie.genetics.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ItemMasterRegistry extends Item { + public ItemMasterRegistry() { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("masterRegistry"); @@ -27,8 +29,8 @@ public class ItemMasterRegistry extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - Genetics.proxy.openGui( - GeneticsGUI.MasterRegistry, player, (int) player.posX, (int) player.posY, (int) player.posZ); + Genetics.proxy + .openGui(GeneticsGUI.MasterRegistry, player, (int) player.posX, (int) player.posY, (int) player.posZ); return stack; } diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index aac5f2fb..f3f83cbd 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,18 +1,20 @@ package binnie.genetics.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ItemRegistry extends Item { + public ItemRegistry() { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("registry"); diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 8c0393f2..c04d803e 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,5 +1,13 @@ package binnie.genetics.item; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.genetics.Gene; import binnie.core.util.I18N; @@ -15,14 +23,9 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemSequence extends Item implements IItemAnalysable, IItemChargable { + public ItemSequence() { setMaxStackSize(1); setMaxDamage(5); @@ -48,8 +51,7 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl if (gene.isCorrupted()) { return I18N.localise("genetics.sequence.corrupted"); } - return I18N.localise( - "genetics.sequence.descriptor", gene.getBreedingSystem().getDescriptor()); + return I18N.localise("genetics.sequence.descriptor", gene.getBreedingSystem().getDescriptor()); } @Override @@ -86,8 +88,8 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - IAlleleBeeSpecies species = - (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows"); + IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry + .getAllele("forestry.speciesMeadows"); list.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.Genetics.getBeeRoot()), false)); } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 2dbc8dc4..d387586b 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,5 +1,13 @@ package binnie.genetics.item; +import java.util.List; +import java.util.Map; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -15,14 +23,9 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import java.util.Map; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemSerum extends ItemGene implements IItemSerum { + public ItemSerum() { super("serum"); setMaxDamage(16); @@ -70,7 +73,7 @@ public class ItemSerum extends ItemGene implements IItemSerum { @Override public IGene[] getGenes(ItemStack stack) { - return new IGene[] {getGeneItem(stack).getGene()}; + return new IGene[] { getGeneItem(stack).getGene() }; } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 1877e9e4..ecd9a996 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,5 +1,13 @@ package binnie.genetics.item; +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -17,14 +25,9 @@ import forestry.api.genetics.IChromosome; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemSerumArray extends ItemGene implements IItemSerum { + public ItemSerumArray() { super("serumArray"); setMaxDamage(16); diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index cf373495..050d7491 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -1,5 +1,12 @@ package binnie.genetics.item; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -13,14 +20,9 @@ import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItem implements IInitializable { + public static BinnieIcon iconNight; public static BinnieIcon iconDaytime; public static BinnieIcon iconAllDay; @@ -71,67 +73,73 @@ public class ModuleItem implements IInitializable { @Override public void postInit() { - GameRegistry.addShapelessRecipe( - GeneticsItems.DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5)); + GameRegistry + .addShapelessRecipe(GeneticsItems.DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5)); - GameRegistry.addRecipe(new ShapedOreRecipe( - GeneticsItems.LaboratoryCasing.get(1), - new Object[] {"iii", "iYi", "iii", 'i', "ingotIron", 'Y', Mods.forestry.item("sturdyMachine")})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.LaboratoryCasing.get(1), + new Object[] { "iii", "iYi", "iii", 'i', "ingotIron", 'Y', + Mods.forestry.item("sturdyMachine") })); - GameRegistry.addRecipe(new ShapelessOreRecipe( - GeneticsItems.DNADye.get(2), new Object[] {"dyePurple", "dyeMagenta", "dyePink"})); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + GeneticsItems.DNADye.get(2), + new Object[] { "dyePurple", "dyeMagenta", "dyePink" })); - GameRegistry.addRecipe(new ShapelessOreRecipe( - GeneticsItems.FluorescentDye.get(2), new Object[] {"dyeOrange", "dyeYellow", "dustGlowstone"})); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + GeneticsItems.FluorescentDye.get(2), + new Object[] { "dyeOrange", "dyeYellow", "dustGlowstone" })); - GameRegistry.addRecipe(new ShapelessOreRecipe( - GeneticsItems.GrowthMedium.get(2), new Object[] {new ItemStack(Items.dye, 1, 15), Items.sugar})); + GameRegistry.addRecipe( + new ShapelessOreRecipe( + GeneticsItems.GrowthMedium.get(2), + new Object[] { new ItemStack(Items.dye, 1, 15), Items.sugar })); - GameRegistry.addRecipe(new ShapedOreRecipe( - GeneticsItems.EmptySequencer.get(1), - new Object[] {" p ", "iGi", " p ", 'i', "ingotGold", 'G', Blocks.glass_pane, 'p', Items.paper})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.EmptySequencer.get(1), + new Object[] { " p ", "iGi", " p ", 'i', "ingotGold", 'G', Blocks.glass_pane, 'p', + Items.paper })); - GameRegistry.addRecipe(new ShapedOreRecipe( - GeneticsItems.EmptySerum.get(1), - new Object[] {" g ", " G ", "GGG", 'g', "ingotGold", 'G', Blocks.glass_pane})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.EmptySerum.get(1), + new Object[] { " g ", " G ", "GGG", 'g', "ingotGold", 'G', Blocks.glass_pane })); - GameRegistry.addRecipe(new ShapedOreRecipe( - GeneticsItems.EmptyGenome.get(1), - new Object[] {"sss", "sss", "sss", 's', GeneticsItems.EmptySerum.get(1)})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.EmptyGenome.get(1), + new Object[] { "sss", "sss", "sss", 's', GeneticsItems.EmptySerum.get(1) })); - GameRegistry.addRecipe(new ShapedOreRecipe( - GeneticsItems.Cylinder.get(8), new Object[] {" g ", "g g", " ", 'g', Blocks.glass_pane})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.Cylinder.get(8), + new Object[] { " g ", "g g", " ", 'g', Blocks.glass_pane })); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(1), new Object[] { - "l g", - " c ", - "g l", - 'c', - Mods.forestry.stack("chipsets", 1, 1), - 'l', - new ItemStack(Items.dye, 1, 4), - 'g', - "dustGlowstone" - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.IntegratedCircuit.get(1), + new Object[] { "l g", " c ", "g l", 'c', Mods.forestry.stack("chipsets", 1, 1), 'l', + new ItemStack(Items.dye, 1, 4), 'g', "dustGlowstone" })); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(1), new Object[] { - "g l", - " c ", - "l g", - 'c', - Mods.forestry.stack("chipsets", 1, 1), - 'l', - new ItemStack(Items.dye, 1, 4), - 'g', - "dustGlowstone" - })); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCasing.get(1), new Object[] { - "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(1), 'd', GeneticsItems.LaboratoryCasing.get(1) - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.IntegratedCircuit.get(1), + new Object[] { "g l", " c ", "l g", 'c', Mods.forestry.stack("chipsets", 1, 1), 'l', + new ItemStack(Items.dye, 1, 4), 'g', "dustGlowstone" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.IntegratedCasing.get(1), + new Object[] { "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(1), 'd', + GeneticsItems.LaboratoryCasing.get(1) })); - GameRegistry.addRecipe(new ShapedOreRecipe( - GeneticsItems.IntegratedCPU.get(1), - new Object[] {"ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(1), 'd', Items.diamond})); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticsItems.IntegratedCPU.get(1), + new Object[] { "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(1), 'd', + Items.diamond })); RecipeManagers.carpenterManager.addRecipe( 100, @@ -167,15 +175,17 @@ public class ModuleItem implements IInitializable { // item you but a diamond seems reasonable // theoretically similar checks could be performed for Apiculture and Arboriculture; but I will leave that to // the mod owner to decide - Item flutterlyzer = BinnieCore.isLepidopteryActive() - ? Mods.forestry.item("flutterlyzer") // grab the forestry flutterlyzer ONLY IF lepidopterology is active + Item flutterlyzer = BinnieCore.isLepidopteryActive() ? Mods.forestry.item("flutterlyzer") // grab the forestry + // flutterlyzer ONLY + // IF lepidopterology + // is active : Items.diamond; // otherwise just replace it with another diamond ItemStack circuit = GeneticsItems.IntegratedCircuit.get(1); // get a reference to Integrated circuit Item diamond = Items.diamond; // save a reference to diamond - ItemStack analyst = - new ItemStack(Genetics.analyst); // save a reference to the analyst, will make the next bit easier + ItemStack analyst = new ItemStack(Genetics.analyst); // save a reference to the analyst, will make the next bit + // easier // the following code is a sufficient replacement for the 3 nested loops that preceded it; arguably this is // still @@ -288,9 +298,10 @@ public class ModuleItem implements IInitializable { // do a check to ensure that the butterfly module is enabled before using the butterfly dictionary. // a similar check could be done for arboriculture and apiculture as well, but that is left to the mod owner - Item lepiDb = BinnieCore.isLepidopteryActive() - ? ExtraTrees.itemDictionaryLepi - : Items.diamond; // just use a diamond if Butterflies is disabled + Item lepiDb = BinnieCore.isLepidopteryActive() ? ExtraTrees.itemDictionaryLepi : Items.diamond; // just use a + // diamond if + // Butterflies + // is disabled // going to use the circuit reference above as well // as above, there are only 24 permutations here; let's find a way to just get those recipes rather than trying @@ -298,12 +309,9 @@ public class ModuleItem implements IInitializable { if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) { // 24 full recipe lines is a bit much to maintain; so we'll use a loop here, but we're only going // to run it 24 times. Start by making an array of all 24 valid dictionary permutations... - String[] permutations = new String[] { - "btlf", "btfl", "bltf", "blft", "bftl", "bflt", - "tblf", "tbfl", "tlbf", "tlfb", "tfbl", "tflb", - "lbtf", "lbft", "ltbf", "ltfb", "lfbt", "lftb", - "fbtl", "fblt", "ftbl", "ftlb", "flbt", "fltb" - }; + String[] permutations = new String[] { "btlf", "btfl", "bltf", "blft", "bftl", "bflt", "tblf", "tbfl", + "tlbf", "tlfb", "tfbl", "tflb", "lbtf", "lbft", "ltbf", "ltfb", "lfbt", "lftb", "fbtl", "fblt", + "ftbl", "ftlb", "flbt", "fltb" }; // now go through each of the permutations and create a recipe for (String p : permutations) { diff --git a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java index 0c2e29d5..03c16957 100644 --- a/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/AdvGeneticMachine.java @@ -1,13 +1,15 @@ package binnie.genetics.machine; +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachineType; import binnie.core.machines.MachinePackage; import binnie.core.resource.IBinnieTexture; import binnie.genetics.Genetics; import binnie.genetics.machine.splicer.SplicerPackage; -import net.minecraft.item.ItemStack; public enum AdvGeneticMachine implements IMachineType { + Splicer(SplicerPackage.class); protected Class cls; @@ -31,6 +33,7 @@ public enum AdvGeneticMachine implements IMachineType { } public abstract static class PackageAdvGeneticBase extends PackageGeneticBase { + protected PackageAdvGeneticBase(String uid, IBinnieTexture renderTexture, int flashColor, boolean powered) { super(uid, renderTexture, flashColor, powered); } diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 9531b5a1..4bd67e45 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -1,5 +1,17 @@ package binnie.genetics.machine; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.machines.IMachine; @@ -10,18 +22,9 @@ import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; import binnie.genetics.Genetics; import buildcraft.api.tools.IToolWrench; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class ComponentGUIHolder extends MachineComponent implements INetwork.TilePacketSync, IInteraction.RightClick { + private ItemStack stack; public ComponentGUIHolder(IMachine machine) { @@ -80,7 +83,11 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til } EntityItem entityitem = new EntityItem( - world, tile.xCoord + xOffset, tile.yCoord + yOffset, tile.zCoord + zOffset, stack.copy()); + world, + tile.xCoord + xOffset, + tile.yCoord + yOffset, + tile.zCoord + zOffset, + stack.copy()); float accel = 0.05f; entityitem.motionX = (float) rand.nextGaussian() * accel; entityitem.motionY = (float) rand.nextGaussian() * accel + 0.2f; diff --git a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java b/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java index 602fc118..354b5ae4 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java +++ b/src/main/java/binnie/genetics/machine/ComponentGeneticGUI.java @@ -1,14 +1,16 @@ package binnie.genetics.machine; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + import binnie.core.machines.Machine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; public class ComponentGeneticGUI extends MachineComponent implements IInteraction.RightClick { + public GeneticsGUI id; public ComponentGeneticGUI(Machine machine, GeneticsGUI id) { diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/src/main/java/binnie/genetics/machine/GeneticMachine.java index ae03193d..7e778ae9 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -1,5 +1,7 @@ package binnie.genetics.machine; +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachineType; import binnie.core.machines.MachinePackage; import binnie.genetics.Genetics; @@ -7,9 +9,9 @@ import binnie.genetics.machine.inoculator.InoculatorPackage; import binnie.genetics.machine.isolator.IsolatorPackage; import binnie.genetics.machine.polymeriser.PolymeriserPackage; import binnie.genetics.machine.sequencer.SequencerPackage; -import net.minecraft.item.ItemStack; public enum GeneticMachine implements IMachineType { + Isolator(IsolatorPackage.class), Sequencer(SequencerPackage.class), Polymeriser(PolymeriserPackage.class), diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 1265b994..fab2aedb 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -1,5 +1,7 @@ package binnie.genetics.machine; +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachineType; import binnie.core.machines.MachinePackage; import binnie.genetics.Genetics; @@ -8,9 +10,9 @@ import binnie.genetics.machine.analyser.AnalyserPackage; import binnie.genetics.machine.genepool.GenepoolPackage; import binnie.genetics.machine.incubator.IncubatorPackage; import binnie.genetics.machine.lab.LabMachinePackage; -import net.minecraft.item.ItemStack; public enum LaboratoryMachine implements IMachineType { + LabMachine(LabMachinePackage.class), Analyser(AnalyserPackage.class), Incubator(IncubatorPackage.class), diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java index 30d4c8bb..94545a67 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java @@ -1,18 +1,21 @@ package binnie.genetics.machine; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.machines.Machine; import binnie.core.machines.component.IRender; import binnie.core.resource.BinnieResource; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class MachineRendererGenetics { + public static MachineRendererGenetics instance = new MachineRendererGenetics(); public RenderItem customRenderItem; @@ -22,6 +25,7 @@ public class MachineRendererGenetics { public MachineRendererGenetics() { model = new ModelMachine(); customRenderItem = new RenderItem() { + @Override public boolean shouldBob() { return false; @@ -35,8 +39,8 @@ public class MachineRendererGenetics { customRenderItem.setRenderManager(RenderManager.instance); } - public void renderMachine( - Machine machine, int colour, BinnieResource texture, double x, double y, double z, float var8) { + public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, + float var8) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index d7b1fa69..a4f7e8f7 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -1,10 +1,5 @@ package binnie.genetics.machine; -import binnie.core.BinnieCore; -import binnie.core.machines.Machine; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -12,10 +7,18 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; +import binnie.core.BinnieCore; +import binnie.core.machines.Machine; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class MachineRendererLab { + public static MachineRendererLab instance = new MachineRendererLab(); private EntityItem dummyEntityItem; @@ -26,26 +29,25 @@ public class MachineRendererLab { public MachineRendererLab() { dummyEntityItem = new EntityItem(null); - itemSides = - new EntityItem[] {new EntityItem(null), new EntityItem(null), new EntityItem(null), new EntityItem(null) - }; + itemSides = new EntityItem[] { new EntityItem(null), new EntityItem(null), new EntityItem(null), + new EntityItem(null) }; model = new ModelMachine(); (customRenderItem = new RenderItem() { - @Override - public boolean shouldBob() { - return false; - } - @Override - public boolean shouldSpreadItems() { - return false; - } - }) - .setRenderManager(RenderManager.instance); + @Override + public boolean shouldBob() { + return false; + } + + @Override + public boolean shouldSpreadItems() { + return false; + } + }).setRenderManager(RenderManager.instance); } - public void renderMachine( - Machine machine, int colour, BinnieResource texture, double x, double y, double z, float var8) { + public void renderMachine(Machine machine, int colour, BinnieResource texture, double x, double y, double z, + float var8) { GL11.glPushMatrix(); int ix = machine.getTileEntity().xCoord; int iz = machine.getTileEntity().zCoord; @@ -60,8 +62,7 @@ public class MachineRendererLab { ComponentGUIHolder holder = Machine.getInterface(ComponentGUIHolder.class, machine); // TODO remove label - Label_0591: - { + Label_0591: { if (world != null && holder != null && holder.getStack() != null) { BinnieCore.proxy.getMinecraftInstance(); if (Minecraft.isFancyGraphicsEnabled()) { diff --git a/src/main/java/binnie/genetics/machine/ModelMachine.java b/src/main/java/binnie/genetics/machine/ModelMachine.java index 6dfbbf61..bbb9c2cc 100644 --- a/src/main/java/binnie/genetics/machine/ModelMachine.java +++ b/src/main/java/binnie/genetics/machine/ModelMachine.java @@ -4,6 +4,7 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelMachine extends ModelBase { + private ModelRenderer base; private ModelRenderer body; private ModelRenderer arm1; diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index db135aa5..6dee0395 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -1,5 +1,11 @@ package binnie.genetics.machine; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -11,13 +17,9 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.acclimatiser.Acclimatiser; import binnie.genetics.machine.incubator.Incubator; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { + public static ValidatorIcon IconDye; public static ValidatorIcon IconSequencer; public static ValidatorIcon IconSerum; @@ -30,55 +32,54 @@ public class ModuleMachine implements IInitializable { Genetics.packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values()); Genetics.packageGenetic.setCreativeTab(GeneticsCreativeTab.instance); - Genetics.packageLabMachine = - new MachineGroup(Genetics.instance, "labMachine", "labMachine", LaboratoryMachine.values()); + Genetics.packageLabMachine = new MachineGroup( + Genetics.instance, + "labMachine", + "labMachine", + LaboratoryMachine.values()); Genetics.packageLabMachine.setCreativeTab(GeneticsCreativeTab.instance); - Genetics.packageAdvGenetic = - new MachineGroup(Genetics.instance, "advMachine", "advMachine", AdvGeneticMachine.values()); + Genetics.packageAdvGenetic = new MachineGroup( + Genetics.instance, + "advMachine", + "advMachine", + AdvGeneticMachine.values()); Genetics.packageAdvGenetic.setCreativeTab(GeneticsCreativeTab.instance); } @Override public void init() { - ModuleMachine.IconSequencer = - new ValidatorIcon(Genetics.instance, "validator/sequencer.0", "validator/sequencer.1"); + ModuleMachine.IconSequencer = new ValidatorIcon( + Genetics.instance, + "validator/sequencer.0", + "validator/sequencer.1"); ModuleMachine.IconSerum = new ValidatorIcon(Genetics.instance, "validator/serum.0", "validator/serum.1"); ModuleMachine.IconEnzyme = new ValidatorIcon(Genetics.instance, "validator/enzyme.0", "validator/enzyme.1"); ModuleMachine.IconDye = new ValidatorIcon(Genetics.instance, "validator/dye.0", "validator/dye.1"); ModuleMachine.IconNugget = new ValidatorIcon(Genetics.instance, "validator/nugget.0", "validator/nugget.1"); - ModuleMachine.IconBacteria = - new ValidatorIcon(Genetics.instance, "validator/bacteria.0", "validator/bacteria.1"); + ModuleMachine.IconBacteria = new ValidatorIcon( + Genetics.instance, + "validator/bacteria.0", + "validator/bacteria.1"); Incubator.addRecipes(); } @Override public void postInit() { Acclimatiser.setupRecipes(); - Object[] standardCircuit = {Mods.forestry.stack("chipsets", 1, 1)}; - Object[] advCircuit = {GeneticsItems.IntegratedCircuit.get(1)}; + Object[] standardCircuit = { Mods.forestry.stack("chipsets", 1, 1) }; + Object[] advCircuit = { GeneticsItems.IntegratedCircuit.get(1) }; String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "gearIron" : "ingotIron"; String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "gearIron" : "ingotIron"; String diamondGear = OreDictionary.getOres("gearDiamond").isEmpty() ? "gearIron" : "ingotIron"; for (Object circuit : standardCircuit) { - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Incubator.get(1), new Object[] { - "gFg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'F', - Blocks.furnace, - 'c', - circuit, - 'g', - Blocks.glass_pane, - 'P', - "gearBronze", - 'a', - ironGear - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + LaboratoryMachine.Incubator.get(1), + new Object[] { "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', + Blocks.furnace, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', + ironGear })); Item alyzer = null; if (BinnieCore.isApicultureActive()) { @@ -90,149 +91,64 @@ public class ModuleMachine implements IInitializable { } if (alyzer != null) { - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Analyser.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - alyzer, - 'c', - circuit, - 'g', - Blocks.glass_pane, - 'P', - "gearBronze", - 'a', - GeneticsItems.DNADye.get(1) - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + LaboratoryMachine.Analyser.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + alyzer, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', + GeneticsItems.DNADye.get(1) })); } - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Genepool.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - "gearBronze", - 'c', - circuit, - 'g', - Blocks.glass_pane, - 'P', - "gearBronze", - 'a', - Blocks.glass - })); - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Acclimatiser.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - Items.lava_bucket, - 'c', - circuit, - 'g', - Blocks.glass_pane, - 'P', - "gearBronze", - 'a', - Items.water_bucket - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + LaboratoryMachine.Genepool.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + "gearBronze", 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', + Blocks.glass })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + LaboratoryMachine.Acclimatiser.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + Items.lava_bucket, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', + Items.water_bucket })); } for (Object circuit : advCircuit) { - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Isolator.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - goldGear, - 'c', - circuit, - 'g', - Items.gold_nugget, - 'P', - "gearBronze", - 'a', - GeneticsItems.Enzyme.get(1) - })); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Polymeriser.get(1), new Object[] { - "gBg", - "cCc", - "gPg", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - ironGear, - 'c', - circuit, - 'g', - Items.gold_nugget, - 'P', - "gearBronze" - })); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Sequencer.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - "gearBronze", - 'c', - circuit, - 'g', - Items.gold_nugget, - 'P', - "gearBronze", - 'a', - GeneticsItems.FluorescentDye.get(1) - })); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Inoculator.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.LaboratoryCasing.get(1), - 'B', - diamondGear, - 'c', - circuit, - 'g', - Items.gold_nugget, - 'P', - "gearBronze", - 'a', - Items.emerald - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticMachine.Isolator.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + goldGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', + GeneticsItems.Enzyme.get(1) })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticMachine.Polymeriser.get(1), + new Object[] { "gBg", "cCc", "gPg", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + ironGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze" })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticMachine.Sequencer.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + "gearBronze", 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', + GeneticsItems.FluorescentDye.get(1) })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + GeneticMachine.Inoculator.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + diamondGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', + Items.emerald })); } - GameRegistry.addRecipe(new ShapedOreRecipe(AdvGeneticMachine.Splicer.get(1), new Object[] { - "gBg", - "cCc", - "aPa", - 'C', - GeneticsItems.IntegratedCasing.get(1), - 'B', - diamondGear, - 'c', - GeneticsItems.IntegratedCPU.get(1), - 'g', - Items.gold_nugget, - 'P', - "gearBronze", - 'a', - Items.blaze_rod - })); - GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.LabMachine.get(1), new Object[] { - "igi", "gCg", "igi", 'C', GeneticsItems.LaboratoryCasing.get(1), 'i', "ingotIron", 'g', Blocks.glass_pane - })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + AdvGeneticMachine.Splicer.get(1), + new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.IntegratedCasing.get(1), 'B', + diamondGear, 'c', GeneticsItems.IntegratedCPU.get(1), 'g', Items.gold_nugget, 'P', + "gearBronze", 'a', Items.blaze_rod })); + GameRegistry.addRecipe( + new ShapedOreRecipe( + LaboratoryMachine.LabMachine.get(1), + new Object[] { "igi", "gCg", "igi", 'C', GeneticsItems.LaboratoryCasing.get(1), 'i', + "ingotIron", 'g', Blocks.glass_pane })); } } diff --git a/src/main/java/binnie/genetics/machine/PackageGeneticBase.java b/src/main/java/binnie/genetics/machine/PackageGeneticBase.java index 24f14cb6..74b304a1 100644 --- a/src/main/java/binnie/genetics/machine/PackageGeneticBase.java +++ b/src/main/java/binnie/genetics/machine/PackageGeneticBase.java @@ -1,14 +1,16 @@ package binnie.genetics.machine; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.tileentity.TileEntity; + import binnie.core.machines.Machine; import binnie.core.machines.MachinePackage; import binnie.core.machines.TileEntityMachine; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; public abstract class PackageGeneticBase extends MachinePackage { + protected BinnieResource renderTexture; protected int color; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java index 762beae2..e09be4dd 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/Acclimatiser.java @@ -1,5 +1,14 @@ package binnie.genetics.machine.acclimatiser; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.api.EnumFlowerChromosome; import binnie.core.BinnieCore; @@ -11,18 +20,12 @@ import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.EnumButterflyChromosome; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class Acclimatiser { - public static final int[] SLOT_RESERVE = new int[] {0, 1, 2, 3}; - public static final int[] SLOT_ACCLIMATISER = new int[] {5, 6, 7}; - public static final int[] SLOT_DONE = new int[] {8, 9, 10, 11}; + + public static final int[] SLOT_RESERVE = new int[] { 0, 1, 2, 3 }; + public static final int[] SLOT_ACCLIMATISER = new int[] { 5, 6, 7 }; + public static final int[] SLOT_DONE = new int[] { 8, 9, 10, 11 }; public static final int SLOT_TARGET = 4; public static final float ENERGY_PER_TICK = 2.0f; @@ -157,9 +160,9 @@ public class Acclimatiser { int[] is = tol.getBounds(); int[] range; if (effect < 0.0f) { - range = new int[] {is[0] - 1, is[1]}; + range = new int[] { is[0] - 1, is[1] }; } else { - range = new int[] {is[0], is[1] + 1}; + range = new int[] { is[0], is[1] + 1 }; } if (range[0] < -5) { @@ -169,30 +172,12 @@ public class Acclimatiser { range[1] = 5; } - EnumTolerance[] up = { - EnumTolerance.NONE, - EnumTolerance.UP_1, - EnumTolerance.UP_2, - EnumTolerance.UP_3, - EnumTolerance.UP_4, - EnumTolerance.UP_5 - }; - EnumTolerance[] down = { - EnumTolerance.NONE, - EnumTolerance.DOWN_1, - EnumTolerance.DOWN_2, - EnumTolerance.DOWN_3, - EnumTolerance.DOWN_4, - EnumTolerance.DOWN_5 - }; - EnumTolerance[] both = { - EnumTolerance.NONE, - EnumTolerance.BOTH_1, - EnumTolerance.BOTH_2, - EnumTolerance.BOTH_3, - EnumTolerance.BOTH_4, - EnumTolerance.BOTH_5 - }; + EnumTolerance[] up = { EnumTolerance.NONE, EnumTolerance.UP_1, EnumTolerance.UP_2, EnumTolerance.UP_3, + EnumTolerance.UP_4, EnumTolerance.UP_5 }; + EnumTolerance[] down = { EnumTolerance.NONE, EnumTolerance.DOWN_1, EnumTolerance.DOWN_2, EnumTolerance.DOWN_3, + EnumTolerance.DOWN_4, EnumTolerance.DOWN_5 }; + EnumTolerance[] both = { EnumTolerance.NONE, EnumTolerance.BOTH_1, EnumTolerance.BOTH_2, EnumTolerance.BOTH_3, + EnumTolerance.BOTH_4, EnumTolerance.BOTH_5 }; if (range[0] == 0) { return Tolerance.get(up[range[1]]); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java index cd73fd3e..9c9da917 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserComponentLogic.java @@ -1,14 +1,17 @@ package binnie.genetics.machine.acclimatiser; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + import binnie.core.machines.IMachine; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; import binnie.core.util.I18N; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; public class AcclimatiserComponentLogic extends ComponentProcessIndefinate { + public AcclimatiserComponentLogic(IMachine machine) { super(machine, Acclimatiser.ENERGY_PER_TICK); } @@ -17,7 +20,8 @@ public class AcclimatiserComponentLogic extends ComponentProcessIndefinate { public ErrorState canWork() { if (getUtil().getStack(Acclimatiser.SLOT_TARGET) == null) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.acclimatiser.error.noIndividual"), Acclimatiser.SLOT_TARGET); + I18N.localise("genetics.machine.acclimatiser.error.noIndividual"), + Acclimatiser.SLOT_TARGET); } if (getUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER).isEmpty()) { return new ErrorState.NoItem( @@ -69,9 +73,7 @@ public class AcclimatiserComponentLogic extends ComponentProcessIndefinate { getUtil().setStack(Acclimatiser.SLOT_TARGET, acclimed); boolean removed = false; for (int i : Acclimatiser.SLOT_ACCLIMATISER) { - if (!removed - && getUtil().getStack(i) != null - && getUtil().getStack(i).isItemEqual(acc)) { + if (!removed && getUtil().getStack(i) != null && getUtil().getStack(i).isItemEqual(acc)) { getUtil().decreaseStack(i, 1); removed = true; } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java index 9c968a1d..1f01bc54 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserItemSlotValidator.java @@ -1,10 +1,12 @@ package binnie.genetics.machine.acclimatiser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import net.minecraft.item.ItemStack; public class AcclimatiserItemSlotValidator extends SlotValidator { + public AcclimatiserItemSlotValidator() { super(null); } diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java index ca0978d1..436a10ae 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/AcclimatiserPackage.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.acclimatiser; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -12,10 +15,9 @@ import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class AcclimatiserPackage extends PackageGeneticBase implements IMachineInformation { + public AcclimatiserPackage() { super("acclimatiser", GeneticsTexture.Acclimatiser, 0x966a49, true); } @@ -46,11 +48,15 @@ public class AcclimatiserPackage extends PackageGeneticBase implements IMachineI ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Acclimatiser.SLOT_RESERVE, Acclimatiser.SLOT_TARGET, 1); transfer.addStorage( - Acclimatiser.SLOT_TARGET, Acclimatiser.SLOT_DONE, new ComponentInventoryTransfer.Condition() { + Acclimatiser.SLOT_TARGET, + Acclimatiser.SLOT_DONE, + new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { return !Acclimatiser.canAcclimatise( - stack, machine.getMachineUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER)); + stack, + machine.getMachineUtil().getNonNullStacks(Acclimatiser.SLOT_ACCLIMATISER)); } }); diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java index 9c48a1de..a1d5e33a 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceSystem.java @@ -1,5 +1,9 @@ package binnie.genetics.machine.acclimatiser; +import java.util.Random; + +import net.minecraft.item.ItemStack; + import binnie.core.genetics.Gene; import binnie.core.genetics.Tolerance; import binnie.genetics.machine.inoculator.Inoculator; @@ -9,10 +13,9 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import java.util.Random; -import net.minecraft.item.ItemStack; public class ToleranceSystem { + public String uid; public IChromosomeType chromosomeOrdinal; public ToleranceType type; diff --git a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java index 27fa46de..3a927fde 100644 --- a/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java +++ b/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java @@ -1,9 +1,11 @@ package binnie.genetics.machine.acclimatiser; -import binnie.botany.gardening.Gardening; import net.minecraft.item.ItemStack; +import binnie.botany.gardening.Gardening; + public enum ToleranceType { + Temperature, Humidity, PH; diff --git a/src/main/java/binnie/genetics/machine/analyser/Analyser.java b/src/main/java/binnie/genetics/machine/analyser/Analyser.java index b6a5e45a..08f8f93d 100644 --- a/src/main/java/binnie/genetics/machine/analyser/Analyser.java +++ b/src/main/java/binnie/genetics/machine/analyser/Analyser.java @@ -1,16 +1,18 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.Binnie; import binnie.genetics.api.IItemAnalysable; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class Analyser { - public static final int[] SLOT_RESERVE = new int[] {0, 1, 2, 3, 4, 5}; - public static final int[] SLOT_FINISHED = new int[] {7, 8, 9, 10, 11, 12}; + + public static final int[] SLOT_RESERVE = new int[] { 0, 1, 2, 3, 4, 5 }; + public static final int[] SLOT_FINISHED = new int[] { 7, 8, 9, 10, 11, 12 }; public static final int SLOT_TARGET = 6; public static final int SLOT_DYE = 13; public static final int RF_COST = 9000; @@ -19,8 +21,7 @@ public class Analyser { public static boolean isAnalysable(ItemStack stack) { IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); - return ind != null - || stack.getItem() instanceof IItemAnalysable + return ind != null || stack.getItem() instanceof IItemAnalysable || Binnie.Genetics.getConversion(stack) != null; } diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java index 9878d0a3..fce19cb2 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentFX.java @@ -1,13 +1,7 @@ package binnie.genetics.machine.analyser; -import binnie.core.BinnieCore; -import binnie.core.machines.IMachine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.component.IRender; -import binnie.core.machines.network.INetwork; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.Random; + import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; @@ -16,10 +10,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; +import binnie.core.BinnieCore; +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IRender; +import binnie.core.machines.network.INetwork; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class AnalyserComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { + private EntityItem dummyEntityItem; public AnalyserComponentFX(IMachine machine) { @@ -37,10 +41,9 @@ public class AnalyserComponentFX extends MachineComponent @Override public void onDisplayTick(World world, int x, int y, int z, Random rand) { if (rand.nextFloat() < 1.0f && getUtil().getProcess().isInProgress()) { - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1.3 + rand.nextDouble() * 0.2, z + 0.5, 0.0, 0.0, 0.0) { + double axisX = posX; double axisZ = posZ; double angle = rand.nextDouble() * 2.0 * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java index 6b426157..7e35e851 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserComponentLogic.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import net.minecraft.item.ItemStack; public class AnalyserComponentLogic extends ComponentProcessSetCost implements IProcess { + public AnalyserComponentLogic(Machine machine) { super(machine, Analyser.RF_COST, Analyser.TIME_PERIOD); } @@ -38,7 +40,7 @@ public class AnalyserComponentLogic extends ComponentProcessSetCost implements I return new ErrorState.Item( I18N.localise("genetics.machine.analyser.error.insufficientDye.title"), I18N.localise("genetics.machine.analyser.error.insufficientDye"), - new int[] {Analyser.SLOT_DYE}); + new int[] { Analyser.SLOT_DYE }); } @Override diff --git a/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java b/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java index ed4ad350..f788e26b 100644 --- a/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java +++ b/src/main/java/binnie/genetics/machine/analyser/AnalyserPackage.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -12,10 +15,9 @@ import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class AnalyserPackage extends PackageGeneticBase implements IMachineInformation { + public AnalyserPackage() { super("analyser", GeneticsTexture.Analyser, 0x9800ff, true); } @@ -48,6 +50,7 @@ public class AnalyserPackage extends PackageGeneticBase implements IMachineInfor ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Analyser.SLOT_RESERVE, Analyser.SLOT_TARGET, 1); transfer.addStorage(Analyser.SLOT_TARGET, Analyser.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { return Analyser.isAnalysed(stack); diff --git a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java index 43526ebe..69c3f326 100644 --- a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java @@ -1,12 +1,14 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class DyeSlotValidator extends SlotValidator { + public DyeSlotValidator() { super(ModuleMachine.IconDye); } diff --git a/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java b/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java index 9731ab4d..b8a8a453 100644 --- a/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/analyser/UnanalysedSlotValidator.java @@ -1,10 +1,12 @@ package binnie.genetics.machine.analyser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import net.minecraft.item.ItemStack; public class UnanalysedSlotValidator extends SlotValidator { + public UnanalysedSlotValidator() { super(null); } diff --git a/src/main/java/binnie/genetics/machine/genepool/EthanolTankValidator.java b/src/main/java/binnie/genetics/machine/genepool/EthanolTankValidator.java index 2328e2a4..6af3d6d6 100644 --- a/src/main/java/binnie/genetics/machine/genepool/EthanolTankValidator.java +++ b/src/main/java/binnie/genetics/machine/genepool/EthanolTankValidator.java @@ -1,10 +1,12 @@ package binnie.genetics.machine.genepool; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.inventory.TankValidator; import binnie.core.util.I18N; -import net.minecraftforge.fluids.FluidStack; public class EthanolTankValidator extends TankValidator { + @Override public String getTooltip() { return I18N.localise("fluid.bioethanol"); diff --git a/src/main/java/binnie/genetics/machine/genepool/Genepool.java b/src/main/java/binnie/genetics/machine/genepool/Genepool.java index 5c4e95b3..ce2c5f68 100644 --- a/src/main/java/binnie/genetics/machine/genepool/Genepool.java +++ b/src/main/java/binnie/genetics/machine/genepool/Genepool.java @@ -1,11 +1,12 @@ package binnie.genetics.machine.genepool; public class Genepool { + public static final int SLOT_BEE = 0; public static final int TANK_DNA = 0; public static final int TANK_ETHANOL = 1; public static final int SLOT_ENZYME = 7; - public static final int[] SLOT_RESERVE = new int[] {1, 2, 3, 4, 5, 6}; + public static final int[] SLOT_RESERVE = new int[] { 1, 2, 3, 4, 5, 6 }; public static final int RF_COST = 8000; public static final int TIME_PERIOD = 400; public static final float ENZYME_PER_PROCESS = 0.25f; diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java index cfe8cd72..2cc6778d 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentFX.java @@ -1,16 +1,19 @@ package binnie.genetics.machine.genepool; +import java.util.Random; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.world.World; public class GenepoolComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { + public GenepoolComponentFX(IMachine machine) { super(machine); } @@ -28,48 +31,46 @@ public class GenepoolComponentFX extends MachineComponent implements IRender.Ran return; } - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer - .addEffect( - new EntityFX( - world, - x + 0.3 + rand.nextDouble() * 0.4, - y + 1, - z + 0.3 + rand.nextDouble() * 0.4, - 0.0, - 0.0, - 0.0) { - double axisX = posX; - double axisZ = posZ; - double angle = rand.nextDouble() * 2.0 * 3.1415; + BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect( + new EntityFX( + world, + x + 0.3 + rand.nextDouble() * 0.4, + y + 1, + z + 0.3 + rand.nextDouble() * 0.4, + 0.0, + 0.0, + 0.0) { - { - axisX = 0.0; - axisZ = 0.0; - angle = 0.0; - motionX = 0.0; - motionZ = 0.0; - motionY = rand.nextFloat() * 0.01; - particleMaxAge = 25; - particleGravity = 0.0f; - noClip = true; - setRBGColorF( - 0.4f + 0.6f * rand.nextFloat(), - 0.6f * rand.nextFloat(), - 0.6f + 0.4f * rand.nextFloat()); - } + double axisX = posX; + double axisZ = posZ; + double angle = rand.nextDouble() * 2.0 * 3.1415; - @Override - public void onUpdate() { - super.onUpdate(); - setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); - } + { + axisX = 0.0; + axisZ = 0.0; + angle = 0.0; + motionX = 0.0; + motionZ = 0.0; + motionY = rand.nextFloat() * 0.01; + particleMaxAge = 25; + particleGravity = 0.0f; + noClip = true; + setRBGColorF( + 0.4f + 0.6f * rand.nextFloat(), + 0.6f * rand.nextFloat(), + 0.6f + 0.4f * rand.nextFloat()); + } - @Override - public int getFXLayer() { - return 0; - } - }); + @Override + public void onUpdate() { + super.onUpdate(); + setAlphaF((float) Math.cos(1.57 * particleAge / particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; + } + }); } } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java index c6fe2837..96ea7874 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolComponentLogic.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.genepool; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; @@ -11,9 +13,9 @@ import binnie.core.util.I18N; import binnie.genetics.item.GeneticLiquid; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public class GenepoolComponentLogic extends ComponentProcessSetCost implements IProcess, INetwork.TilePacketSync { + private float ethanolDrain; public GenepoolComponentLogic(Machine machine) { @@ -25,7 +27,8 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I public ErrorState canWork() { if (getUtil().isSlotEmpty(Genepool.SLOT_BEE)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.genepool.error.noIndividual"), Genepool.SLOT_BEE); + I18N.localise("genetics.machine.genepool.error.noIndividual"), + Genepool.SLOT_BEE); } return super.canWork(); } @@ -37,11 +40,13 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I } if (!getUtil().liquidInTank(Genepool.TANK_ETHANOL, 1)) { return new ErrorState.InsufficientLiquid( - I18N.localise("genetics.machine.genepool.error.noEthanol"), Genepool.TANK_ETHANOL); + I18N.localise("genetics.machine.genepool.error.noEthanol"), + Genepool.TANK_ETHANOL); } if (getUtil().getSlotCharge(Genepool.SLOT_ENZYME) == 0.0f) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.genepool.error.insufficientEnzyme"), Genepool.SLOT_ENZYME); + I18N.localise("genetics.machine.genepool.error.insufficientEnzyme"), + Genepool.SLOT_ENZYME); } return super.canProgress(); } @@ -56,9 +61,7 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I private int getDNAAmount(ItemStack stack) { ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(stack); - if (root == null - || root != Binnie.Genetics.getBeeRoot() - || Binnie.Genetics.getBeeRoot().isDrone(stack)) { + if (root == null || root != Binnie.Genetics.getBeeRoot() || Binnie.Genetics.getBeeRoot().isDrone(stack)) { return 10; } @@ -76,8 +79,7 @@ public class GenepoolComponentLogic extends ComponentProcessSetCost implements I ethanolDrain--; } - getMachine() - .getInterface(IChargedSlots.class) + getMachine().getInterface(IChargedSlots.class) .alterCharge(Genepool.SLOT_ENZYME, -Genepool.ENZYME_PER_PROCESS * getProgressPerTick() / 100.0f); } } diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java index 737af5fb..1350c1cb 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.genepool; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -17,9 +19,9 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.tileentity.TileEntity; public class GenepoolPackage extends PackageGeneticBase implements IMachineInformation { + public GenepoolPackage() { super("genepool", GeneticsTexture.Genepool, 0xc134b6, true); } diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index e934b1a5..61912121 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.incubator; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.genetics.api.IIncubatorRecipe; @@ -10,14 +16,11 @@ import forestry.api.apiculture.EnumBeeType; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class Incubator { - public static final int[] SLOT_QUEUE = new int[] {0, 1, 2}; - public static final int[] SLOT_OUTPUT = new int[] {4, 5, 6}; + + public static final int[] SLOT_QUEUE = new int[] { 0, 1, 2 }; + public static final int[] SLOT_OUTPUT = new int[] { 4, 5, 6 }; public static final int SLOT_INCUBATOR = 3; public static final int TANK_INPUT = 0; public static final int TANK_OUTPUT = 1; @@ -28,41 +31,51 @@ public class Incubator { public static final int OUTPU_TANK_CAPACITY = 2000; public static void addRecipes() { - Incubator.RECIPES.add(new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), - Binnie.Liquid.getLiquidStack("water", 25), - GeneticLiquid.GrowthMedium.get(25), - 0.2f)); - Incubator.RECIPES.add(new IncubatorRecipe( - new ItemStack(Items.wheat), GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f)); - Incubator.RECIPES.add(new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), - GeneticLiquid.Bacteria.get(0), - GeneticLiquid.Bacteria.get(5), - 0.05f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + GeneticsItems.GrowthMedium.get(1), + Binnie.Liquid.getLiquidStack("water", 25), + GeneticLiquid.GrowthMedium.get(25), + 0.2f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + new ItemStack(Items.wheat), + GeneticLiquid.GrowthMedium.get(25), + GeneticLiquid.Bacteria.get(5), + 0.2f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + GeneticsItems.GrowthMedium.get(1), + GeneticLiquid.Bacteria.get(0), + GeneticLiquid.Bacteria.get(5), + 0.05f)); Incubator.RECIPES.add( new IncubatorRecipe(new ItemStack(Items.sugar), GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) .setOutputStack(GeneticsItems.Enzyme.get(1))); - Incubator.RECIPES.add(new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), - GeneticLiquid.BacteriaPoly.get(0), - GeneticLiquid.BacteriaPoly.get(5), - 0.05f)); - Incubator.RECIPES.add(new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), - GeneticLiquid.BacteriaVector.get(0), - GeneticLiquid.BacteriaVector.get(5), - 0.05f)); - Incubator.RECIPES.add(new IncubatorRecipe( - new ItemStack(Items.dye, 1, 15), - GeneticLiquid.Bacteria.get(10), - GeneticLiquid.BacteriaPoly.get(10), - 0.1f)); - Incubator.RECIPES.add(new IncubatorRecipe( - new ItemStack(Items.blaze_powder), - GeneticLiquid.Bacteria.get(10), - GeneticLiquid.BacteriaVector.get(10), - 0.05f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + GeneticsItems.GrowthMedium.get(1), + GeneticLiquid.BacteriaPoly.get(0), + GeneticLiquid.BacteriaPoly.get(5), + 0.05f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + GeneticsItems.GrowthMedium.get(1), + GeneticLiquid.BacteriaVector.get(0), + GeneticLiquid.BacteriaVector.get(5), + 0.05f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + new ItemStack(Items.dye, 1, 15), + GeneticLiquid.Bacteria.get(10), + GeneticLiquid.BacteriaPoly.get(10), + 0.1f)); + Incubator.RECIPES.add( + new IncubatorRecipe( + new ItemStack(Items.blaze_powder), + GeneticLiquid.Bacteria.get(10), + GeneticLiquid.BacteriaVector.get(10), + 0.05f)); if (BinnieCore.isApicultureActive()) { AlleleManager.alleleRegistry.getRegisteredAlleles().values().forEach(iAllele -> { diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java index 6afff267..af5aba2e 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorComponentLogic.java @@ -1,5 +1,11 @@ package binnie.genetics.machine.incubator; +import java.util.Random; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessIndefinate; import binnie.core.machines.power.ErrorState; @@ -7,12 +13,9 @@ import binnie.core.machines.power.IProcess; import binnie.core.machines.transfer.TransferRequest; import binnie.core.util.I18N; import binnie.genetics.api.IIncubatorRecipe; -import java.util.Random; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class IncubatorComponentLogic extends ComponentProcessIndefinate implements IProcess { + IIncubatorRecipe recipe; private final Random rand; private boolean roomForOutput; @@ -43,11 +46,13 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen if (recipe != null) { if (!recipe.isInputLiquidSufficient(getUtil().getFluid(Incubator.TANK_INPUT))) { return new ErrorState.InsufficientLiquid( - I18N.localise("genetics.machine.incubator.error.noLiquid"), Incubator.TANK_INPUT); + I18N.localise("genetics.machine.incubator.error.noLiquid"), + Incubator.TANK_INPUT); } if (!roomForOutput) { return new ErrorState.TankSpace( - I18N.localise("genetics.machine.incubator.error.noRoom"), Incubator.TANK_OUTPUT); + I18N.localise("genetics.machine.incubator.error.noRoom"), + Incubator.TANK_OUTPUT); } } return super.canProgress(); @@ -85,16 +90,12 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen FluidStack liquid = getUtil().getFluid(Incubator.TANK_INPUT); ItemStack incubator = getUtil().getStack(Incubator.SLOT_INCUBATOR); - if (recipe != null - && (incubator == null - || liquid == null - || !recipe.isInputLiquid(liquid) - || !isStackValid(incubator, recipe))) { + if (recipe != null && (incubator == null || liquid == null + || !recipe.isInputLiquid(liquid) + || !isStackValid(incubator, recipe))) { recipe = null; - ItemStack leftover = new TransferRequest(incubator, getInventory()) - .setTargetSlots(Incubator.SLOT_OUTPUT) - .ignoreValidation() - .transfer(true); + ItemStack leftover = new TransferRequest(incubator, getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT) + .ignoreValidation().transfer(true); getUtil().setStack(Incubator.SLOT_INCUBATOR, leftover); } @@ -132,8 +133,7 @@ public class IncubatorComponentLogic extends ComponentProcessIndefinate implemen if (potential != null) { TransferRequest removal = new TransferRequest(incubator, getInventory()) - .setTargetSlots(Incubator.SLOT_OUTPUT) - .ignoreValidation(); + .setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); if (removal.transfer(false) == null) { recipe = potential; diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java index 91f1981b..69870125 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorPackage.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.incubator; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -11,9 +13,9 @@ import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.tileentity.TileEntity; public class IncubatorPackage extends PackageGeneticBase implements IMachineInformation { + public IncubatorPackage() { super("incubator", GeneticsTexture.Incubator, 0xffd951, true); } @@ -39,10 +41,8 @@ public class IncubatorPackage extends PackageGeneticBase implements IMachineInfo new ComponentPowerReceptor(machine, Incubator.POWER_CAPACITY); ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(Incubator.TANK_INPUT, "input", Incubator.INPUT_TANK_CAPACITY) - .forbidExtraction(); - tanks.addTank(Incubator.TANK_OUTPUT, "output", Incubator.OUTPU_TANK_CAPACITY) - .setReadOnly(); + tanks.addTank(Incubator.TANK_INPUT, "input", Incubator.INPUT_TANK_CAPACITY).forbidExtraction(); + tanks.addTank(Incubator.TANK_OUTPUT, "output", Incubator.OUTPU_TANK_CAPACITY).setReadOnly(); new IncubatorComponentLogic(machine); } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index e360e202..7b9fc778 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -1,12 +1,15 @@ package binnie.genetics.machine.incubator; +import java.util.Random; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.MachineUtil; import binnie.core.machines.transfer.TransferRequest; import binnie.genetics.api.IIncubatorRecipe; -import java.util.Random; -import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class IncubatorRecipe implements IIncubatorRecipe { @@ -22,17 +25,13 @@ public class IncubatorRecipe implements IIncubatorRecipe { @Nullable private ItemStack outputStack; - public IncubatorRecipe( - ItemStack inputStack, final FluidStack input, @Nullable final FluidStack output, final float lossChance) { + public IncubatorRecipe(ItemStack inputStack, final FluidStack input, @Nullable final FluidStack output, + final float lossChance) { this(inputStack, input, output, lossChance, 1.0f); } - public IncubatorRecipe( - ItemStack inputStack, - final FluidStack input, - @Nullable final FluidStack output, - final float lossChance, - final float chance) { + public IncubatorRecipe(ItemStack inputStack, final FluidStack input, @Nullable final FluidStack output, + final float lossChance, final float chance) { this.inputStack = inputStack; this.outputStack = null; this.input = input; @@ -97,8 +96,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { if (this.outputStack != null) { final ItemStack output = this.outputStack.copy(); final TransferRequest product = new TransferRequest(output, machine.getInventory()) - .setTargetSlots(Incubator.SLOT_OUTPUT) - .ignoreValidation(); + .setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); product.transfer(true); } final Random rand = machine.getRandom(); @@ -134,8 +132,7 @@ public class IncubatorRecipe implements IIncubatorRecipe { ItemStack output = outputStack.copy(); TransferRequest product = new TransferRequest(output, machine.getInventory()) - .setTargetSlots(Incubator.SLOT_OUTPUT) - .ignoreValidation(); + .setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); return product.transfer(false) == null; } } diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java index 8993e81e..d875f272 100644 --- a/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.incubator; +import net.minecraft.item.ItemStack; + import binnie.core.machines.MachineUtil; import binnie.genetics.item.GeneticLiquid; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; -import net.minecraft.item.ItemStack; public class IncubatorRecipeLarvae extends IncubatorRecipe { + public IncubatorRecipeLarvae(ItemStack beeLarvaeWildcard) { super(beeLarvaeWildcard, GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f); } @@ -24,7 +26,7 @@ public class IncubatorRecipeLarvae extends IncubatorRecipe { @Override public ItemStack getExpectedOutput() { - return BeeManager.beeRoot.getMemberStack( - BeeManager.beeRoot.getMember(this.getInputStack()), EnumBeeType.DRONE.ordinal()); + return BeeManager.beeRoot + .getMemberStack(BeeManager.beeRoot.getMember(this.getInputStack()), EnumBeeType.DRONE.ordinal()); } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/BacteriaVectorValidator.java b/src/main/java/binnie/genetics/machine/inoculator/BacteriaVectorValidator.java index dfe6d9cb..d2e49c42 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/BacteriaVectorValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/BacteriaVectorValidator.java @@ -1,10 +1,12 @@ package binnie.genetics.machine.inoculator; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.inventory.Validator; import binnie.genetics.item.GeneticLiquid; -import net.minecraftforge.fluids.FluidStack; public class BacteriaVectorValidator extends Validator { + @Override public boolean isValid(FluidStack object) { return GeneticLiquid.BacteriaVector.get(1).isFluidEqual(object); diff --git a/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java b/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java index 54fdf7c6..6ef46b27 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/IndividualInoculateValidator.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public class IndividualInoculateValidator extends SlotValidator { + public IndividualInoculateValidator() { super(null); } diff --git a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java index 8b10f808..c8b4fd9c 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/Inoculator.java @@ -1,20 +1,22 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import binnie.genetics.api.IGene; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class Inoculator { + public static final int SLOT_SERUM_VIAL = 0; - public static final int[] SLOT_SERUM_RESERVE = new int[] {1, 2}; - public static final int[] SLOT_SERUM_EXPENDED = new int[] {3, 4}; - public static final int[] SLOT_RESERVE = new int[] {5, 6, 7, 8}; + public static final int[] SLOT_SERUM_RESERVE = new int[] { 1, 2 }; + public static final int[] SLOT_SERUM_EXPENDED = new int[] { 3, 4 }; + public static final int[] SLOT_RESERVE = new int[] { 5, 6, 7, 8 }; public static final int SLOT_TARGET = 9; - public static final int[] SLOT_FINISHED = new int[] {10, 11, 12, 13}; + public static final int[] SLOT_FINISHED = new int[] { 10, 11, 12, 13 }; public static final int TANK_VECTOR = 0; public static final int TANK_CAPACITY = 1000; public static final int RF_COST = 600000; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java index 09bc7d00..847110fb 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentFX.java @@ -1,5 +1,16 @@ package binnie.genetics.machine.inoculator; +import java.util.Random; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; @@ -7,17 +18,10 @@ import binnie.core.machines.component.IRender; import binnie.core.machines.network.INetwork; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; public class InoculatorComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { + private EntityItem dummyEntityItem; public InoculatorComponentFX(IMachine machine) { @@ -36,10 +40,9 @@ public class InoculatorComponentFX extends MachineComponent public void onDisplayTick(World world, int x, int y, int z, Random rand) { int tick = (int) (world.getTotalWorldTime() % 3L); if (tick == 0 && getUtil().getProcess().isInProgress()) { - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 0.92, z + 0.5, 0.0, 0.0, 0.0) { + double axisX = posX; double axisZ = posZ; double angle = (int) (worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java index dd06bccc..9d7cfa28 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorComponentLogic.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; @@ -13,10 +16,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class InoculatorComponentLogic extends ComponentProcessSetCost implements IProcess { + private float bacteriaDrain = 0.0f; public InoculatorComponentLogic(Machine machine) { @@ -54,15 +56,18 @@ public class InoculatorComponentLogic extends ComponentProcessSetCost implements public ErrorState canWork() { if (getUtil().isSlotEmpty(Inoculator.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.inoculator.error.noIndividual"), Inoculator.SLOT_TARGET); + I18N.localise("genetics.machine.inoculator.error.noIndividual"), + Inoculator.SLOT_TARGET); } if (getUtil().isSlotEmpty(Inoculator.SLOT_SERUM_VIAL)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.inoculator.error.noSerum"), Inoculator.SLOT_SERUM_VIAL); + I18N.localise("genetics.machine.inoculator.error.noSerum"), + Inoculator.SLOT_SERUM_VIAL); } if (getUtil().isTankEmpty(Inoculator.TANK_VECTOR)) { return new ErrorState.InsufficientLiquid( - I18N.localise("genetics.machine.inoculator.error.noLiquid"), Inoculator.TANK_VECTOR); + I18N.localise("genetics.machine.inoculator.error.noLiquid"), + Inoculator.TANK_VECTOR); } ErrorState state = isValidSerum(); diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java index 5e123ad8..aacc6f32 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorPackage.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -14,10 +17,9 @@ import binnie.genetics.core.GeneticsTexture; import binnie.genetics.genetics.Engineering; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class InoculatorPackage extends PackageGeneticBase implements IMachineInformation { + public InoculatorPackage() { super("inoculator", GeneticsTexture.Inoculator, 0xe22235, true); } @@ -66,7 +68,10 @@ public class InoculatorPackage extends PackageGeneticBase implements IMachineInf transfer.addRestock(Inoculator.SLOT_RESERVE, Inoculator.SLOT_TARGET, 1); transfer.addRestock(Inoculator.SLOT_SERUM_RESERVE, Inoculator.SLOT_SERUM_VIAL); transfer.addStorage( - Inoculator.SLOT_SERUM_VIAL, Inoculator.SLOT_SERUM_EXPENDED, new ComponentInventoryTransfer.Condition() { + Inoculator.SLOT_SERUM_VIAL, + Inoculator.SLOT_SERUM_EXPENDED, + new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { return Engineering.getCharges(stack) == 0; @@ -74,22 +79,19 @@ public class InoculatorPackage extends PackageGeneticBase implements IMachineInf }); transfer.addStorage(9, Inoculator.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { return stack != null && transfer.getMachine().getMachineUtil().getStack(Inoculator.SLOT_SERUM_VIAL) != null - && transfer.getMachine() - .getInterface(InoculatorComponentLogic.class) - .isValidSerum() - != null; + && transfer.getMachine().getInterface(InoculatorComponentLogic.class).isValidSerum() != null; } }); new ComponentPowerReceptor(machine, Inoculator.POWER_STORAGE); new InoculatorComponentLogic(machine); new InoculatorComponentFX(machine); - new ComponentTankContainer(machine) - .addTank(Inoculator.TANK_VECTOR, "input", Inoculator.TANK_CAPACITY) + new ComponentTankContainer(machine).addTank(Inoculator.TANK_VECTOR, "input", Inoculator.TANK_CAPACITY) .setValidator(new BacteriaVectorValidator()); } diff --git a/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java b/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java index c3b2dcd5..ae808490 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/inoculator/SerumSlotValidator.java @@ -1,12 +1,14 @@ package binnie.genetics.machine.inoculator; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.api.IItemSerum; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class SerumSlotValidator extends SlotValidator { + public SerumSlotValidator() { super(ModuleMachine.IconSerum); } diff --git a/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java b/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java index a3d91265..1ff9ffe2 100644 --- a/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java +++ b/src/main/java/binnie/genetics/machine/isolator/EthanolTankValidator.java @@ -1,10 +1,12 @@ package binnie.genetics.machine.isolator; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.inventory.TankValidator; import binnie.core.util.I18N; -import net.minecraftforge.fluids.FluidStack; public class EthanolTankValidator extends TankValidator { + @Override public String getTooltip() { return I18N.localise("fluid.bioethanol"); diff --git a/src/main/java/binnie/genetics/machine/isolator/Isolator.java b/src/main/java/binnie/genetics/machine/isolator/Isolator.java index 5e88d058..c1221176 100644 --- a/src/main/java/binnie/genetics/machine/isolator/Isolator.java +++ b/src/main/java/binnie/genetics/machine/isolator/Isolator.java @@ -1,10 +1,11 @@ package binnie.genetics.machine.isolator; public class Isolator { + public static final int SLOT_ENZYME = 0; public static final int SLOT_SEQUENCER_VIAL = 1; - public static final int[] SLOT_RESERVE = new int[] {2, 3, 4}; - public static final int[] SLOT_FINISHED = new int[] {7, 8, 9, 10, 11, 12}; + public static final int[] SLOT_RESERVE = new int[] { 2, 3, 4 }; + public static final int[] SLOT_FINISHED = new int[] { 7, 8, 9, 10, 11, 12 }; public static final int SLOT_TARGET = 5; public static final int SLOT_RESULT = 6; public static final int TANK_ETHANOL = 0; diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java index 85053b52..84645dfa 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentFX.java @@ -1,16 +1,19 @@ package binnie.genetics.machine.isolator; +import java.util.Random; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.world.World; public class IsolatorComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { + public IsolatorComponentFX(IMachine machine) { super(machine); } @@ -22,42 +25,40 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran return; } - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer - .addEffect( - new EntityFX( - world, - x + 0.4 + 0.2 * rand.nextDouble(), - y + 1.6, - z + 0.4 + rand.nextDouble() * 0.2, - 0.0, - 0.0, - 0.0) { - double angle = 0.0; + BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect( + new EntityFX( + world, + x + 0.4 + 0.2 * rand.nextDouble(), + y + 1.6, + z + 0.4 + rand.nextDouble() * 0.2, + 0.0, + 0.0, + 0.0) { - { - motionX = 0.0; - motionZ = 0.0; - motionY = -0.012; - particleMaxAge = 100; - particleGravity = 0.0f; - noClip = true; - setRBGColorF(0.8f, 0.4f, 0.0f); - } + double angle = 0.0; - @Override - public void onUpdate() { - super.onUpdate(); - angle += 0.06; - setAlphaF((float) Math.sin(3.14 * particleAge / particleMaxAge)); - } + { + motionX = 0.0; + motionZ = 0.0; + motionY = -0.012; + particleMaxAge = 100; + particleGravity = 0.0f; + noClip = true; + setRBGColorF(0.8f, 0.4f, 0.0f); + } - @Override - public int getFXLayer() { - return 0; - } - }); + @Override + public void onUpdate() { + super.onUpdate(); + angle += 0.06; + setAlphaF((float) Math.sin(3.14 * particleAge / particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; + } + }); } @SideOnly(Side.CLIENT) @@ -68,10 +69,9 @@ public class IsolatorComponentFX extends MachineComponent implements IRender.Ran return; } - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0) { + double axisX = posX; double axisZ = posZ; double angle = 0.7 + (int) (worldObj.getTotalWorldTime() % 2L) * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index b091639b..426cdedb 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -1,5 +1,9 @@ package binnie.genetics.machine.isolator; +import java.util.Random; + +import net.minecraft.item.ItemStack; + import binnie.core.genetics.Gene; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; @@ -13,10 +17,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import java.util.Random; -import net.minecraft.item.ItemStack; public class IsolatorComponentLogic extends ComponentProcessSetCost implements IProcess { + protected float enzymePerProcess = 0.5f; protected float ethanolPerProcess = 10.0f; @@ -28,16 +31,19 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I public ErrorState canWork() { if (getUtil().isSlotEmpty(Isolator.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.isolator.error.noIndividual"), Isolator.SLOT_TARGET); + I18N.localise("genetics.machine.isolator.error.noIndividual"), + Isolator.SLOT_TARGET); } // TODO check slot id in validation if (!getUtil().isSlotEmpty(Isolator.SLOT_RESULT)) { return new ErrorState.NoSpace( - I18N.localise("genetics.machine.isolator.error.noRoom"), Isolator.SLOT_FINISHED); + I18N.localise("genetics.machine.isolator.error.noRoom"), + Isolator.SLOT_FINISHED); } if (getUtil().isSlotEmpty(Isolator.SLOT_SEQUENCER_VIAL)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.isolator.error.noVials"), Isolator.SLOT_SEQUENCER_VIAL); + I18N.localise("genetics.machine.isolator.error.noVials"), + Isolator.SLOT_SEQUENCER_VIAL); } return super.canWork(); } @@ -46,11 +52,13 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I public ErrorState canProgress() { if (!getUtil().liquidInTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess)) { return new ErrorState.InsufficientLiquid( - I18N.localise("genetics.machine.isolator.error.noLiquid"), Isolator.TANK_ETHANOL); + I18N.localise("genetics.machine.isolator.error.noLiquid"), + Isolator.TANK_ETHANOL); } if (getUtil().getSlotCharge(Isolator.SLOT_ENZYME) == 0.0f) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.isolator.error.noEnzyme"), Isolator.SLOT_ENZYME); + I18N.localise("genetics.machine.isolator.error.noEnzyme"), + Isolator.SLOT_ENZYME); } return super.canProgress(); } @@ -59,8 +67,7 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I protected void onFinishTask() { super.onFinishTask(); Random rand = getMachine().getWorld().rand; - ISpeciesRoot root = - AlleleManager.alleleRegistry.getSpeciesRoot(getUtil().getStack(Isolator.SLOT_TARGET)); + ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(getUtil().getStack(Isolator.SLOT_TARGET)); if (root == null) { return; } @@ -77,8 +84,7 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I while (gene == null) { try { chromosome = root.getKaryotype()[rand.nextInt(root.getKaryotype().length)]; - allele = rand.nextBoolean() - ? individual.getGenome().getActiveAllele(chromosome) + allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) : individual.getGenome().getInactiveAllele(chromosome); gene = Gene.create(allele, chromosome, root); } catch (Exception e) { @@ -98,8 +104,7 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I @Override protected void onTickTask() { - getMachine() - .getInterface(IChargedSlots.class) + getMachine().getInterface(IChargedSlots.class) .alterCharge(Isolator.SLOT_ENZYME, -enzymePerProcess * getProgressPerTick() / 100.0f); } } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java index e46b0497..dbc06721 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.isolator; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -16,9 +18,9 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.tileentity.TileEntity; public class IsolatorPackage extends PackageGeneticBase implements IMachineInformation { + public IsolatorPackage() { super("isolator", GeneticsTexture.Isolator, 0xff6f0f, true); } diff --git a/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java b/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java index a40ba3b3..24a71bc1 100644 --- a/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java +++ b/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.lab; +import net.minecraft.client.renderer.RenderBlocks; + import binnie.core.machines.Machine; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGUIHolder; import binnie.genetics.machine.MachineRendererLab; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.client.renderer.RenderBlocks; public class LabMachinePackage extends PackageGeneticBase { + public LabMachinePackage() { super("labMachine", GeneticsTexture.LabMachine, 0xffffff, false); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java index 6814e768..da7940e1 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/DnaValidator.java @@ -1,11 +1,13 @@ package binnie.genetics.machine.polymeriser; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.inventory.Validator; import binnie.core.util.I18N; import binnie.genetics.item.GeneticLiquid; -import net.minecraftforge.fluids.FluidStack; class DnaValidator extends Validator { + @Override public boolean isValid(FluidStack itemStack) { return GeneticLiquid.RawDNA.get(1).isFluidEqual(itemStack); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java index d6f673f6..8097544c 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java @@ -1,12 +1,13 @@ package binnie.genetics.machine.polymeriser; public class Polymeriser { + public static final int TANK_BACTERIA = 0; public static final int TANK_DNA = 1; public static final int SLOT_SERUM = 0; 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}; + 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 }; public static final int RF_COST = 96000; public static final int TIME_PERIOD = 2400; public static final int BACTERIA_TANK_CAPACITY = 1000; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java index 4099b6cf..03264e82 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentFX.java @@ -1,16 +1,19 @@ package binnie.genetics.machine.polymeriser; +import java.util.Random; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.world.World; public class PolymeriserComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { + public PolymeriserComponentFX(IMachine machine) { super(machine); } @@ -26,10 +29,9 @@ public class PolymeriserComponentFX extends MachineComponent implements IRender. public void onDisplayTick(World world, int x, int y, int z, Random rand) { int tick = (int) (world.getTotalWorldTime() % 8L); if ((tick == 0 || tick == 3) && getUtil().getProcess().isInProgress()) { - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1.8, z + 0.5, 0.0, 0.0, 0.0) { + double axisX = posX; double axisZ = posZ; double angle = 0.7 + (int) (worldObj.getTotalWorldTime() % 2L) * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java index 16d09436..e936b78b 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserComponentLogic.java @@ -1,14 +1,16 @@ package binnie.genetics.machine.polymeriser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.genetics.genetics.Engineering; -import net.minecraft.item.ItemStack; public class PolymeriserComponentLogic extends ComponentProcessSetCost implements IProcess { + private static float chargePerProcess = 0.4f; private float dnaDrain = 0.0f; @@ -39,10 +41,9 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement @Override public void onTickTask() { super.onTickTask(); - getUtil() - .useCharge( - Polymeriser.SLOT_GOLD, - PolymeriserComponentLogic.chargePerProcess * getProgressPerTick() / 100.0f); + getUtil().useCharge( + Polymeriser.SLOT_GOLD, + PolymeriserComponentLogic.chargePerProcess * getProgressPerTick() / 100.0f); dnaDrain += getDNAPerProcess() * getProgressPerTick() / 100.0f; bacteriaDrain += 0.2f * getDNAPerProcess() * getProgressPerTick() / 100.0f; @@ -78,11 +79,13 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement public ErrorState canWork() { if (getUtil().isSlotEmpty(Polymeriser.SLOT_SERUM)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.polymeriser.error.noItem"), Polymeriser.SLOT_SERUM); + I18N.localise("genetics.machine.polymeriser.error.noItem"), + Polymeriser.SLOT_SERUM); } if (!getUtil().getStack(Polymeriser.SLOT_SERUM).isItemDamaged()) { return new ErrorState.InvalidItem( - I18N.localise("genetics.machine.polymeriser.error.itemFilled"), Polymeriser.SLOT_SERUM); + I18N.localise("genetics.machine.polymeriser.error.itemFilled"), + Polymeriser.SLOT_SERUM); } return super.canWork(); } @@ -91,11 +94,13 @@ public class PolymeriserComponentLogic extends ComponentProcessSetCost implement public ErrorState canProgress() { if (getUtil().getFluid(Polymeriser.TANK_BACTERIA) == null) { return new ErrorState.InsufficientLiquid( - I18N.localise("genetics.machine.polymeriser.error.noLiquid"), Polymeriser.TANK_BACTERIA); + I18N.localise("genetics.machine.polymeriser.error.noLiquid"), + Polymeriser.TANK_BACTERIA); } if (getUtil().getFluid(Polymeriser.TANK_DNA) == null) { return new ErrorState.InsufficientLiquid( - I18N.localise("genetics.machine.polymeriser.error.noDNA"), Polymeriser.TANK_DNA); + I18N.localise("genetics.machine.polymeriser.error.noDNA"), + Polymeriser.TANK_DNA); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java index 1c666fcd..7d7ba424 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserPackage.java @@ -1,5 +1,9 @@ package binnie.genetics.machine.polymeriser; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -15,11 +19,9 @@ import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class PolymeriserPackage extends PackageGeneticBase implements IMachineInformation { + public PolymeriserPackage() { super("polymeriser", GeneticsTexture.Polymeriser, 0x00e5c3, true); } @@ -49,7 +51,10 @@ public class PolymeriserPackage extends PackageGeneticBase implements IMachineIn ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); transfer.addRestock(Polymeriser.SLOT_SERUM_RESERVE, Polymeriser.SLOT_SERUM, 1); transfer.addStorage( - Polymeriser.SLOT_SERUM, Polymeriser.SLOT_SERUM_FINISHED, new ComponentInventoryTransfer.Condition() { + Polymeriser.SLOT_SERUM, + Polymeriser.SLOT_SERUM_FINISHED, + new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { return !stack.isItemDamaged(); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java index 68588d9c..e68884a0 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymerisingBacteriaValidator.java @@ -1,11 +1,13 @@ package binnie.genetics.machine.polymeriser; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.machines.inventory.Validator; import binnie.core.util.I18N; import binnie.genetics.item.GeneticLiquid; -import net.minecraftforge.fluids.FluidStack; class PolymerisingBacteriaValidator extends Validator { + @Override public boolean isValid(FluidStack itemStack) { return GeneticLiquid.BacteriaPoly.get(1).isFluidEqual(itemStack); diff --git a/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java b/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java index aa9036a1..69562fea 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/UnfilledSerumSlotValidator.java @@ -1,12 +1,14 @@ package binnie.genetics.machine.polymeriser; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.api.IItemChargable; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class UnfilledSerumSlotValidator extends SlotValidator { + public UnfilledSerumSlotValidator() { super(ModuleMachine.IconSerum); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java index 01b3765d..10bedea1 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java +++ b/src/main/java/binnie/genetics/machine/sequencer/Sequencer.java @@ -3,7 +3,8 @@ package binnie.genetics.machine.sequencer; import binnie.core.resource.BinnieIcon; public class Sequencer { - public static final int[] SLOT_RESERVE = new int[] {1, 2, 3, 4}; + + public static final int[] SLOT_RESERVE = new int[] { 1, 2, 3, 4 }; public static final int SLOT_DYE_INDEX = 0; public static final int SLOT_TARGET_INDEX = 5; public static final int SLOT_DONE_INDEX = 6; diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java index 1a191670..93441173 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentFX.java @@ -1,5 +1,10 @@ package binnie.genetics.machine.sequencer; +import java.util.Random; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.world.World; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; @@ -7,11 +12,9 @@ import binnie.core.machines.component.IRender; import binnie.core.resource.BinnieIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.world.World; public class SequencerComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick { + public SequencerComponentFX(IMachine machine) { super(machine); } @@ -23,10 +26,9 @@ public class SequencerComponentFX extends MachineComponent implements IRender.Ra return; } - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1.2 + rand.nextDouble() * 0.2, z + 0.5, 0.0, 0.0, 0.0) { + double axisX = posX; double axisZ = posZ; double angle = rand.nextDouble() * 2.0 * 3.1415; @@ -68,10 +70,9 @@ public class SequencerComponentFX extends MachineComponent implements IRender.Ra return; } - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1, z + 0.5, 0.0, 0.0, 0.0) { + { motionX = 0.0; motionZ = 0.0; @@ -81,10 +82,9 @@ public class SequencerComponentFX extends MachineComponent implements IRender.Ra noClip = true; particleScale = 2.0f; - setParticleIcon((new BinnieIcon[] { - Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT - }) - [rand.nextInt(4)].getIcon()); + setParticleIcon( + (new BinnieIcon[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, + Sequencer.fxSeqT })[rand.nextInt(4)].getIcon()); } @Override diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java index a3fa23e5..28470ba1 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.sequencer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.power.ComponentProcess; @@ -9,10 +11,10 @@ import binnie.core.util.I18N; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.item.GeneticsItems; -import net.minecraft.item.ItemStack; public class SequencerComponentLogic extends ComponentProcess implements IProcess, ComponentInventoryTransfer.ITransferRestockListener { + public SequencerComponentLogic(Machine machine) { super(machine); } @@ -41,7 +43,8 @@ public class SequencerComponentLogic extends ComponentProcess public ErrorState canWork() { if (getUtil().isSlotEmpty(Sequencer.SLOT_TARGET_INDEX)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.sequencer.error.noSequence"), Sequencer.SLOT_TARGET_INDEX); + I18N.localise("genetics.machine.sequencer.error.noSequence"), + Sequencer.SLOT_TARGET_INDEX); } return super.canWork(); } @@ -55,13 +58,15 @@ public class SequencerComponentLogic extends ComponentProcess } if (getUtil().getSlotCharge(Sequencer.SLOT_DYE_INDEX) == 0.0f) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.sequencer.error.noDye"), Sequencer.SLOT_DYE_INDEX); + I18N.localise("genetics.machine.sequencer.error.noDye"), + Sequencer.SLOT_DYE_INDEX); } ItemStack stack = getUtil().getStack(Sequencer.SLOT_DONE_INDEX); if (stack != null && stack.stackSize >= 64) { return new ErrorState.NoSpace( - I18N.localise("genetics.machine.sequencer.error.noSpace"), Sequencer.SLOT_DONE_INDEX); + I18N.localise("genetics.machine.sequencer.error.noSpace"), + Sequencer.SLOT_DONE_INDEX); } return super.canProgress(); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java index 18158b44..26714bd5 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.sequencer; +import net.minecraft.tileentity.TileEntity; + import binnie.Binnie; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; @@ -17,9 +19,9 @@ import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; -import net.minecraft.tileentity.TileEntity; public class SequencerPackage extends PackageGeneticBase implements IMachineInformation { + public SequencerPackage() { super("sequencer", GeneticsTexture.Sequencer, 0xb7ff32, true); Sequencer.fxSeqA = Binnie.Resource.getBlockIcon(Genetics.instance, "fx/sequencer.a"); diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index 56c91de6..05370459 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.sequencer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class UnsequencedSlotValidator extends SlotValidator { + public UnsequencedSlotValidator() { super(ModuleMachine.IconSequencer); } diff --git a/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java b/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java index 4a8a9105..4ae8f993 100644 --- a/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java +++ b/src/main/java/binnie/genetics/machine/splicer/IndividualInoculateValidator.java @@ -1,13 +1,15 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.item.ItemStack; public class IndividualInoculateValidator extends SlotValidator { + public IndividualInoculateValidator() { super(null); } diff --git a/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java b/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java index 6202e852..76aca2eb 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/splicer/SerumSlotValidator.java @@ -1,12 +1,14 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.api.IItemSerum; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; class SerumSlotValidator extends SlotValidator { + public SerumSlotValidator() { super(ModuleMachine.IconSerum); } diff --git a/src/main/java/binnie/genetics/machine/splicer/Splicer.java b/src/main/java/binnie/genetics/machine/splicer/Splicer.java index b9f15e51..4b7f0011 100644 --- a/src/main/java/binnie/genetics/machine/splicer/Splicer.java +++ b/src/main/java/binnie/genetics/machine/splicer/Splicer.java @@ -1,20 +1,22 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + import binnie.genetics.api.IGene; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.IAllele; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; public class Splicer { + public static final int SLOT_SERUM_VIAL = 0; - public static final int[] SLOT_SERUM_RESERVE = new int[] {1, 2}; - public static final int[] SLOT_SERUM_EXPENDED = new int[] {3, 4}; - public static final int[] SLOT_RESERVE = new int[] {5, 6, 7, 8, 9}; + public static final int[] SLOT_SERUM_RESERVE = new int[] { 1, 2 }; + public static final int[] SLOT_SERUM_EXPENDED = new int[] { 3, 4 }; + public static final int[] SLOT_RESERVE = new int[] { 5, 6, 7, 8, 9 }; public static final int SLOT_TARGET = 9; - public static final int[] SLOT_FINISHED = new int[] {10, 11, 12, 13}; + public static final int[] SLOT_FINISHED = new int[] { 10, 11, 12, 13 }; public static final int RF_COST = 12000000; public static final int TIME_PERIOD = 1200; public static final int POWER_CAPACITY = 20000; diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java index 288edfde..4e1e59c2 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentFX.java @@ -1,5 +1,16 @@ package binnie.genetics.machine.splicer; +import java.util.Random; + +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + import binnie.core.BinnieCore; import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; @@ -7,17 +18,10 @@ import binnie.core.machines.component.IRender; import binnie.core.machines.network.INetwork; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.Random; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; public class SplicerComponentFX extends MachineComponent implements IRender.RandomDisplayTick, IRender.DisplayTick, IRender.Render, INetwork.TilePacketSync { + private EntityItem dummyEntityItem; public SplicerComponentFX(IMachine machine) { @@ -37,10 +41,9 @@ public class SplicerComponentFX extends MachineComponent return; } - BinnieCore.proxy - .getMinecraftInstance() - .effectRenderer + BinnieCore.proxy.getMinecraftInstance().effectRenderer .addEffect(new EntityFX(world, x + 0.5, y + 1.5, z + 0.5, 0.0, 0.0, 0.0) { + double axisX = posX; double axisZ = posZ; double angle = (int) (worldObj.getTotalWorldTime() % 4L) * 0.5 * 3.1415; diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java index 64585803..027b1b5b 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerComponentLogic.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + import binnie.core.machines.Machine; import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; @@ -13,10 +16,9 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IGenome; import forestry.api.genetics.IIndividual; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class SplicerComponentLogic extends ComponentProcessSetCost implements IProcess { + public int nOfGenes; public SplicerComponentLogic(Machine machine) { @@ -106,11 +108,13 @@ public class SplicerComponentLogic extends ComponentProcessSetCost implements IP public ErrorState canWork() { if (getUtil().isSlotEmpty(Splicer.SLOT_TARGET)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.splicer.error.noIndividual"), Splicer.SLOT_TARGET); + I18N.localise("genetics.machine.splicer.error.noIndividual"), + Splicer.SLOT_TARGET); } if (getUtil().isSlotEmpty(Splicer.SLOT_SERUM_VIAL)) { return new ErrorState.NoItem( - I18N.localise("genetics.machine.splicer.error.noSerum"), Splicer.SLOT_SERUM_VIAL); + I18N.localise("genetics.machine.splicer.error.noSerum"), + Splicer.SLOT_SERUM_VIAL); } ErrorState state = isValidSerum(); diff --git a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java index c4d6dc2c..5ccea94b 100644 --- a/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java +++ b/src/main/java/binnie/genetics/machine/splicer/SplicerPackage.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.splicer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.TileEntityMachine; @@ -13,10 +16,9 @@ import binnie.genetics.core.GeneticsTexture; import binnie.genetics.genetics.Engineering; import binnie.genetics.machine.AdvGeneticMachine; import binnie.genetics.machine.ComponentGeneticGUI; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase implements IMachineInformation { + public SplicerPackage() { super("splicer", GeneticsTexture.Splicer, 0xe22235, true); } @@ -66,21 +68,21 @@ public class SplicerPackage extends AdvGeneticMachine.PackageAdvGeneticBase impl transfer.addRestock(Splicer.SLOT_RESERVE, Splicer.SLOT_TARGET, 1); transfer.addRestock(Splicer.SLOT_SERUM_RESERVE, Splicer.SLOT_SERUM_VIAL); transfer.addStorage( - Splicer.SLOT_SERUM_VIAL, Splicer.SLOT_SERUM_EXPENDED, new ComponentInventoryTransfer.Condition() { + Splicer.SLOT_SERUM_VIAL, + Splicer.SLOT_SERUM_EXPENDED, + new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { return Engineering.getCharges(stack) == 0; } }); transfer.addStorage(Splicer.SLOT_TARGET, Splicer.SLOT_FINISHED, new ComponentInventoryTransfer.Condition() { + @Override public boolean fufilled(ItemStack stack) { - return stack != null - && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null - && transfer.getMachine() - .getInterface(SplicerComponentLogic.class) - .isValidSerum() - != null; + return stack != null && transfer.getMachine().getMachineUtil().getStack(Splicer.SLOT_SERUM_VIAL) != null + && transfer.getMachine().getInterface(SplicerComponentLogic.class).isValidSerum() != null; } }); diff --git a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java index 54e21455..c3f69400 100644 --- a/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AcclimatiserRecipeHandler.java @@ -1,5 +1,12 @@ package binnie.genetics.nei; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -10,11 +17,6 @@ import binnie.genetics.machine.acclimatiser.ToleranceType; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class AcclimatiserRecipeHandler extends RecipeHandlerBase { @@ -114,6 +116,7 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase { } private static class AcclimatiserRecipe { + private final ItemStack[] target; private final ItemStack resource; private final float effect; @@ -154,12 +157,17 @@ public class AcclimatiserRecipeHandler extends RecipeHandlerBase { public CachedAcclimatiserRecipe(AcclimatiserRecipe recipe) { if (recipe.getTarget() != null) { for (int i = 0; i < recipe.getTarget().length; i++) { - target.add(new PositionedStack( - recipe.getTarget()[i], 31 + 18 * (i > 5 ? i % 6 : i), 29 + 18 * (i / 6))); + target.add( + new PositionedStack( + recipe.getTarget()[i], + 31 + 18 * (i > 5 ? i % 6 : i), + 29 + 18 * (i / 6))); } - this.resource = new PositionedStackAdv(recipe.getResource(), 76, 2) - .addToTooltip(StatCollector.translateToLocal("genetics.nei.tip." - + (recipe.getType().equals(ToleranceType.Temperature) ? "temperature" : "humidity"))) + this.resource = new PositionedStackAdv(recipe.getResource(), 76, 2).addToTooltip( + StatCollector.translateToLocal( + "genetics.nei.tip." + + (recipe.getType().equals(ToleranceType.Temperature) ? "temperature" + : "humidity"))) .addToTooltip( StatCollector.translateToLocalFormatted("genetics.nei.tip.effect", recipe.getEffect())); this.effect = recipe.getEffect(); diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index 20fd5ef0..fa1053b7 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -1,5 +1,12 @@ package binnie.genetics.nei; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -11,11 +18,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class AnalyserRecipeHandler extends RecipeHandlerBase { @@ -102,6 +104,7 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { } private static class AnalyserRecipe { + private final ItemStack analysable; public AnalyserRecipe(ItemStack analysable) { @@ -136,8 +139,7 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { } } } else { - for (ItemStack analysable : - ItemList.itemMap.get(recipe.getAnalysable().getItem())) { + for (ItemStack analysable : ItemList.itemMap.get(recipe.getAnalysable().getItem())) { if (analysable.getTagCompound() != null) { analysableList.add(analysable.copy()); } diff --git a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java index dc94149d..0ac6c527 100644 --- a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java @@ -1,5 +1,12 @@ package binnie.genetics.nei; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; @@ -8,11 +15,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class DatabaseRecipeHandler extends RecipeHandlerBase { @@ -55,7 +57,8 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { this.drawProgressBar(75, 7, 176, 0, 24, 17, 40, 0); List desc = GuiDraw.fontRenderer.listFormattedStringToWidth( - StatCollector.translateToLocalFormatted("genetics.nei.tip.databaseDesc"), 140); + StatCollector.translateToLocalFormatted("genetics.nei.tip.databaseDesc"), + 140); for (int i = 0; i < desc.size(); i++) { GuiDraw.drawStringC(desc.get(i), 88, 44 + 12 * (i - 1), 0xFFFFFF); } @@ -99,8 +102,7 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { } public ItemStack getEmptySerum() { - return this.serum.getItem() instanceof ItemSerumArray - ? GeneticsItems.EmptyGenome.get(1) + return this.serum.getItem() instanceof ItemSerumArray ? GeneticsItems.EmptyGenome.get(1) : GeneticsItems.EmptySerum.get(1); } } @@ -114,8 +116,7 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { if (recipe.getSerum() != null) { List serums = new ArrayList<>(); - for (ItemStack serumStack : - ItemList.itemMap.get(recipe.getSerum().getItem())) { + for (ItemStack serumStack : ItemList.itemMap.get(recipe.getSerum().getItem())) { if (serumStack.getTagCompound() != null) { ItemStack temp = serumStack.copy(); temp.setItemDamage(temp.getMaxDamage()); diff --git a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java index 5f3d953e..fd3475e6 100644 --- a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java @@ -1,5 +1,14 @@ package binnie.genetics.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -13,13 +22,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.apiculture.EnumBeeType; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class GenepoolRecipeHandler extends RecipeHandlerBase { @@ -115,6 +117,7 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase { } private static class GenepoolRecipe { + private final ItemStack inputStack; public GenepoolRecipe(ItemStack inputStack) { @@ -154,6 +157,7 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase { } public class CachedGenepoolRecipe extends CachedBaseRecipe { + public List tanks = new ArrayList<>(); public List ingredients = new ArrayList<>(); public PositionedStack input; diff --git a/src/main/java/binnie/genetics/nei/IMCForNEI.java b/src/main/java/binnie/genetics/nei/IMCForNEI.java index cd48e783..5312ef75 100644 --- a/src/main/java/binnie/genetics/nei/IMCForNEI.java +++ b/src/main/java/binnie/genetics/nei/IMCForNEI.java @@ -1,9 +1,11 @@ package binnie.genetics.nei; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.event.FMLInterModComms; + public class IMCForNEI { + public static void IMCSender() { sendHandler("binnie.genetics.nei.IsolatorRecipeHandler", "Genetics:machine:0"); sendHandler("binnie.genetics.nei.SequencerRecipeHandler", "Genetics:machine:1"); diff --git a/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java index 6d1f1715..f5d083a3 100644 --- a/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IncubatorRecipeHandler.java @@ -1,5 +1,13 @@ package binnie.genetics.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; + import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.RecipeHandlerBase; @@ -8,12 +16,6 @@ import binnie.genetics.machine.incubator.Incubator; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; public class IncubatorRecipeHandler extends RecipeHandlerBase { @@ -94,6 +96,7 @@ public class IncubatorRecipeHandler extends RecipeHandlerBase { } public class CachedIncubatorRecipe extends CachedBaseRecipe { + public List tanks = new ArrayList<>(); public PositionedStack input; public PositionedStack output; @@ -107,7 +110,10 @@ public class IncubatorRecipeHandler extends RecipeHandlerBase { if (fluidStack.amount == 0) { this.tanks.add( new PositionedFluidTank( - new FluidStack(fluidStack.getFluid(), 1), 100, new Rectangle(28, 6, 16, 58)) { + new FluidStack(fluidStack.getFluid(), 1), + 100, + new Rectangle(28, 6, 16, 58)) { + @Override public List handleTooltip(List currenttip) { List tip = super.handleTooltip(currenttip); diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index 476e94b5..1931f11b 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -1,5 +1,14 @@ package binnie.genetics.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -15,23 +24,20 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class InoculatorRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { - recipes.add(new InoculatorRecipe( - dnaManipulable, new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new InoculatorRecipe( - dnaManipulable, new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add( + new InoculatorRecipe( + dnaManipulable, + new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add( + new InoculatorRecipe( + dnaManipulable, + new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -147,8 +153,7 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { ISpeciesRoot root1 = AlleleManager.alleleRegistry.getSpeciesRoot(recipe.getDnaManipulable()); List serums = new ArrayList<>(); - for (ItemStack serumStack : - ItemList.itemMap.get(recipe.getSerum().getItem())) { + for (ItemStack serumStack : ItemList.itemMap.get(recipe.getSerum().getItem())) { if (serumStack.getTagCompound() != null) { IItemSerum itemSerum = (IItemSerum) serumStack.getItem(); ISpeciesRoot root2 = itemSerum.getSpeciesRoot(serumStack); @@ -156,8 +161,10 @@ public class InoculatorRecipeHandler extends RecipeHandlerBase { } } - this.bacteriaTank = - new PositionedFluidTank(recipe.getBacteriaVector(), 100, new Rectangle(28, 6, 16, 58)); + this.bacteriaTank = new PositionedFluidTank( + recipe.getBacteriaVector(), + 100, + new Rectangle(28, 6, 16, 58)); this.serum = new PositionedStack(serums, 53, 6); this.input = new PositionedStack(recipe.getDnaManipulable(), 53, 27); this.output = new PositionedStack(recipe.getDnaManipulable(), 105, 27); diff --git a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java index bf32d34d..9658fee8 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -1,5 +1,14 @@ package binnie.genetics.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -19,13 +28,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class IsolatorRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java b/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java index a8faea1d..17062874 100644 --- a/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java +++ b/src/main/java/binnie/genetics/nei/NEIGeneticsConfig.java @@ -6,6 +6,7 @@ import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; public class NEIGeneticsConfig implements IConfigureNEI { + protected static void registerHandler(RecipeHandlerBase handler) { handler.prepare(); API.registerRecipeHandler(handler); diff --git a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java index 39e64417..ee478bb6 100644 --- a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java @@ -1,5 +1,15 @@ package binnie.genetics.nei; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.PositionedStackAdv; @@ -13,14 +23,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class PolymeriserRecipeHandler extends RecipeHandlerBase { @@ -136,8 +138,7 @@ public class PolymeriserRecipeHandler extends RecipeHandlerBase { List bacteriaPolyTanks = new ArrayList<>(); List rawDNATanks = new ArrayList<>(); - for (ItemStack itemStack : - ItemList.itemMap.get(recipe.getSerum().getItem())) { + for (ItemStack itemStack : ItemList.itemMap.get(recipe.getSerum().getItem())) { if (itemStack.getTagCompound() != null) { ItemStack temp = itemStack.copy(); if (itemStack.getItem() instanceof IItemSerum) { @@ -145,8 +146,7 @@ public class PolymeriserRecipeHandler extends RecipeHandlerBase { } inputs.add(temp); - int bacteriaPolyAmount = 10 - * temp.getItemDamage() + int bacteriaPolyAmount = 10 * temp.getItemDamage() * (temp.getTagCompound() == null ? 1 : Engineering.getGenes(temp).length); bacteriaPolyTanks.add(GeneticLiquid.BacteriaPoly.get(bacteriaPolyAmount)); rawDNATanks.add(GeneticLiquid.RawDNA.get(bacteriaPolyAmount * 5)); @@ -159,14 +159,17 @@ public class PolymeriserRecipeHandler extends RecipeHandlerBase { this.ingredients.add(this.input); this.ingredients.add(this.goldNugget); - this.bacteriaPoly = - new PositionedFluidTank(bacteriaPolyTanks, 10000, new Rectangle(27, 6, 16, 58), null, null); + this.bacteriaPoly = new PositionedFluidTank( + bacteriaPolyTanks, + 10000, + new Rectangle(27, 6, 16, 58), + null, + null); this.rawDNA = new PositionedFluidTank(rawDNATanks, 20000, new Rectangle(48, 6, 16, 58), null, null); this.tanks.add(this.bacteriaPoly); this.tanks.add(this.rawDNA); - for (ItemStack itemStack : - ItemList.itemMap.get(recipe.getOutput().getItem())) { + for (ItemStack itemStack : ItemList.itemMap.get(recipe.getOutput().getItem())) { if (itemStack.getTagCompound() != null) { ItemStack temp = itemStack.copy(); if (recipe.getOutput().getItem() instanceof ItemSequence) { diff --git a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java index 24f66629..c07234d0 100644 --- a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java @@ -1,5 +1,11 @@ package binnie.genetics.nei; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; @@ -7,10 +13,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; public class SequencerRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index 66792c6c..eaa7e1d6 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -1,5 +1,13 @@ package binnie.genetics.nei; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -15,12 +23,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class SplicerRecipeHandler extends RecipeHandlerBase { @@ -29,8 +31,10 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { recipes.add( new SplicerRecipe(dnaManipulable, new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE))); - recipes.add(new SplicerRecipe( - dnaManipulable, new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE))); + recipes.add( + new SplicerRecipe( + dnaManipulable, + new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -110,6 +114,7 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { } private static class SplicerRecipe { + private final ItemStack dnaManipulable; private final ItemStack serum; @@ -140,8 +145,7 @@ public class SplicerRecipeHandler extends RecipeHandlerBase { ISpeciesRoot root1 = AlleleManager.alleleRegistry.getSpeciesRoot(recipe.getDnaManipulable()); List serums = new ArrayList<>(); - for (ItemStack serumStack : - ItemList.itemMap.get(recipe.getSerum().getItem())) { + for (ItemStack serumStack : ItemList.itemMap.get(recipe.getSerum().getItem())) { if (serumStack.getTagCompound() != null) { IItemSerum itemSerum = (IItemSerum) serumStack.getItem(); ISpeciesRoot root2 = itemSerum.getSpeciesRoot(serumStack); diff --git a/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java b/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java index 04d99f30..e78cb9f6 100644 --- a/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java +++ b/src/main/java/binnie/genetics/proxy/IGeneticsProxy.java @@ -2,4 +2,5 @@ package binnie.genetics.proxy; import binnie.core.proxy.IProxyCore; -public interface IGeneticsProxy extends IProxyCore {} +public interface IGeneticsProxy extends IProxyCore { +} diff --git a/src/main/java/binnie/genetics/proxy/Proxy.java b/src/main/java/binnie/genetics/proxy/Proxy.java index e2a052bb..88a5e3a0 100644 --- a/src/main/java/binnie/genetics/proxy/Proxy.java +++ b/src/main/java/binnie/genetics/proxy/Proxy.java @@ -4,6 +4,7 @@ import binnie.core.proxy.BinnieModProxy; import binnie.genetics.Genetics; public class Proxy extends BinnieModProxy implements IGeneticsProxy { + public Proxy() { super(Genetics.instance); } diff --git a/src/main/java/binnie/genetics/proxy/ProxyClient.java b/src/main/java/binnie/genetics/proxy/ProxyClient.java index 937b2af8..5c866173 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -1,3 +1,4 @@ package binnie.genetics.proxy; -public class ProxyClient extends Proxy implements IGeneticsProxy {} +public class ProxyClient extends Proxy implements IGeneticsProxy { +} diff --git a/src/main/java/binnie/genetics/proxy/ProxyServer.java b/src/main/java/binnie/genetics/proxy/ProxyServer.java index 9107b7ec..024e8ef6 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyServer.java +++ b/src/main/java/binnie/genetics/proxy/ProxyServer.java @@ -1,3 +1,4 @@ package binnie.genetics.proxy; -public class ProxyServer extends Proxy implements IGeneticsProxy {} +public class ProxyServer extends Proxy implements IGeneticsProxy { +}