From 57494b1f8190050d67178303f2ce6905a34e5887 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Mon, 24 Oct 2016 21:57:50 +0200 Subject: [PATCH] Working on Gardening --- .../java/binnie/botany/api/EnumSoilType.java | 22 +- .../binnie/botany/ceramic/BlockCeramic.java | 90 ++++----- .../botany/ceramic/BlockCeramicBrick.java | 117 +++++------ .../binnie/botany/ceramic/BlockStained.java | 190 ++++++++---------- .../botany/gardening/ItemSoilMeter.java | 97 ++++++--- .../botany/gardening/ModuleGardening.java | 7 +- .../binnie/botany/genetics/AlleleColor.java | 47 ----- .../botany/genetics/ItemDictionary.java | 67 +++--- .../botany/genetics/ItemEncyclopedia.java | 33 ++- .../java/binnie/botany/items/ItemPigment.java | 33 +-- .../java/binnie/core/block/BlockMetadata.java | 4 +- .../binnie/core/genetics/ManagerGenetics.java | 4 +- .../resources/assets/botany/lang/en_US.lang | 7 +- .../botany/models/item/botanistDatabase.json | 6 + .../botany/models/item/encylopedia.json | 6 + .../models/item/encylopediaReinforced.json | 6 + .../models/item/masterBotanistDatabase.json | 6 + .../assets/botany/models/item/pigment.json | 6 + .../assets/botany/models/item/soilMeter.json | 6 + ...ediaIron.png => encylopediaReinforced.png} | Bin 20 files changed, 374 insertions(+), 380 deletions(-) delete mode 100644 src/main/java/binnie/botany/genetics/AlleleColor.java create mode 100644 src/main/resources/assets/botany/models/item/botanistDatabase.json create mode 100644 src/main/resources/assets/botany/models/item/encylopedia.json create mode 100644 src/main/resources/assets/botany/models/item/encylopediaReinforced.json create mode 100644 src/main/resources/assets/botany/models/item/masterBotanistDatabase.json create mode 100644 src/main/resources/assets/botany/models/item/pigment.json create mode 100644 src/main/resources/assets/botany/models/item/soilMeter.json rename src/main/resources/assets/botany/textures/items/{encylopediaIron.png => encylopediaReinforced.png} (100%) diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index c217392b..411c4089 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -3,14 +3,30 @@ package binnie.botany.api; import java.util.Locale; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; public enum EnumSoilType implements IStringSerializable { - SOIL, - LOAM, - FLOWERBED; + SOIL(TextFormatting.DARK_GRAY), + LOAM(TextFormatting.GOLD), + FLOWERBED(TextFormatting.LIGHT_PURPLE); + final TextFormatting color; + + EnumSoilType() { + this(null); + } + + EnumSoilType(TextFormatting color) { + this.color = color; + } + @Override public String getName() { return this.name().toLowerCase(Locale.ENGLISH); } + + public String getTranslated(boolean withColor){ + return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.soil." + getName()); + } } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramic.java b/src/main/java/binnie/botany/ceramic/BlockCeramic.java index d2a1fe05..78202c5f 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramic.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramic.java @@ -2,21 +2,27 @@ package binnie.botany.ceramic; 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 forestry.core.blocks.IColoredBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -public class BlockCeramic extends Block implements IBlockMetadata { +public class BlockCeramic extends Block implements IBlockMetadata, IColoredBlock { public BlockCeramic() { super(Material.ROCK); this.setHardness(1.0f); @@ -25,32 +31,32 @@ public class BlockCeramic extends Block implements IBlockMetadata { this.setCreativeTab(CreativeTabBotany.instance); } -// @Override -// public ArrayList getDrops(final World world, final BlockPos pos, final int blockMeta, final int fortune) { -// return BlockMetadata.getBlockDropped(this, world, pos, blockMeta); -// } -// -// @Override -// public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { -// return BlockMetadata.breakBlock(this, player, world, x, y, z); -// } + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + return BlockMetadata.getBlockDropped(this, world, pos); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + return BlockMetadata.breakBlock(this, player, world, pos); + } @Override public TileEntity createNewTileEntity(final World var1, final int i) { return new TileEntityMetadata(); } -// @Override -// public boolean hasTileEntity(final int meta) { -// return true; -// } -// -// @Override -// public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) { + super.eventReceived(state, worldIn, pos, id, param); + TileEntity tileentity = worldIn.getTileEntity(pos); + return tileentity == null ? false : tileentity.receiveClientEvent(id, param); + } @Override public int getPlacedMeta(final ItemStack stack, final World world, BlockPos pos, final EnumFacing clickedBlock) { @@ -73,9 +79,8 @@ public class BlockCeramic extends Block implements IBlockMetadata { } @Override - public void dropAsStack(final World world, final BlockPos pos, final ItemStack drop) { - //TODO IMPLEMENT - // this.dropBlockAsItem(world, pos, drop); + public void dropAsStack(final World world, final BlockPos pos, final ItemStack itemStack) { + spawnAsEntity(world, pos, itemStack); } @Override @@ -105,31 +110,14 @@ public class BlockCeramic extends Block implements IBlockMetadata { // public void registerBlockIcons(final IIconRegister register) { // this.blockIcon = Botany.proxy.getIcon(register, "ceramic"); // } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) { -// final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); -// if (tile != null) { -// return this.getRenderColor(tile.getTileMetadata()); -// } -// return 16777215; -// } -// -// @Override -// public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { -// super.breakBlock(par1World, par2, par3, par4, par5, par6); -// par1World.removeTileEntity(par2, par3, par4); -// } -// -// @Override -// public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { -// return BlockMetadata.getPickBlock(world, x, y, z); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getRenderColor(final int meta) { -// return EnumFlowerColor.get(meta).getColor(false); -// } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return BlockMetadata.getPickBlock(world, pos); + } + + @Override + public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) { + return EnumFlowerColor.get(getMetaFromState(state)).getColor(false); + } } diff --git a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java index 1eba41ce..2c03dcb2 100644 --- a/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java @@ -4,22 +4,30 @@ import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; import binnie.botany.items.BotanyItems; +import binnie.core.block.BlockMetadata; import binnie.core.block.IBlockMetadata; import binnie.core.block.IMultipassBlock; import binnie.core.block.TileEntityMetadata; +import forestry.core.blocks.IColoredBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipassBlock { +public class BlockCeramicBrick extends Block implements IBlockMetadata, IColoredBlock { public BlockCeramicBrick() { super(Material.ROCK); this.setHardness(1.0f); @@ -31,34 +39,34 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa private static BlockType getType(final int meta) { return new BlockType(meta); } - -// @Override -// public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { -// return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); -// } -// -// @Override -// public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { -// return BlockMetadata.breakBlock(this, player, world, x, y, z); -// } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + return BlockMetadata.getBlockDropped(this, world, pos); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + return BlockMetadata.breakBlock(this, player, world, pos); + } @Override public TileEntity createNewTileEntity(final World var1, final int i) { return new TileEntityMetadata(); } - // @Override -// public boolean hasTileEntity(final int meta) { -// return true; -// } -// -// @Override -// public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } -// + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) { + super.eventReceived(state, worldIn, pos, id, param); + TileEntity tileentity = worldIn.getTileEntity(pos); + return tileentity == null ? false : tileentity.receiveClientEvent(id, param); + } + @Override public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); @@ -80,9 +88,8 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa } @Override - public void dropAsStack(final World world, final BlockPos pos, final ItemStack drop) { - //TODO IMPLEMENT - //this.dropBlockAsItem(world, pos, drop); + public void dropAsStack(World world, BlockPos pos, ItemStack itemStack) { + spawnAsEntity(world, pos, itemStack); } @Override @@ -125,56 +132,24 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa // } // } // } - -// @Override -// @SideOnly(Side.CLIENT) -// public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) { -// final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); -// if (tile != null) { -// return this.getRenderColor(tile.getTileMetadata()); -// } -// return 16777215; -// } -// -// @Override -// public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { -// super.breakBlock(par1World, par2, par3, par4, par5, par6); -// par1World.removeTileEntity(par2, par3, par4); -// } -// -// @Override -// public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { -// return BlockMetadata.getPickBlock(world, x, y, z); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getRenderColor(final int meta) { -// return this.colorMultiplier(meta); -// } - + @Override - public int getNumberOfPasses() { - return 3; + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return BlockMetadata.getPickBlock(world, pos); } - + + @SideOnly(Side.CLIENT) @Override - public int colorMultiplier(final int meta) { - final BlockType type = getType(meta); -// if (MultipassBlockRenderer.getLayer() == 0) { -// return 16777215; -// } -// if (MultipassBlockRenderer.getLayer() == 1) { -// return type.color1.getColor(false); -// } - return type.color2.getColor(false); + public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { + BlockType type = getType(getMetaFromState(state)); + if(tintIndex == 0){ + return 16777215; + }if(tintIndex == 1){ + return type.color1.getColor(false); + } + return type.color2.getColor(false); } -// @Override -// public int getRenderType() { -// return BinnieCore.multipassRenderID; -// } - public enum TileType { Tile("tile", "Ceramic Tile"), Brick("brick", "Ceramic Bricks"), diff --git a/src/main/java/binnie/botany/ceramic/BlockStained.java b/src/main/java/binnie/botany/ceramic/BlockStained.java index 66b70bd9..f0e02d2a 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStained.java +++ b/src/main/java/binnie/botany/ceramic/BlockStained.java @@ -2,22 +2,36 @@ package binnie.botany.ceramic; 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.extratrees.ExtraTrees; +import forestry.core.blocks.IColoredBlock; +import forestry.core.items.IColoredItem; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; import java.util.Random; -public class BlockStained extends Block implements IBlockMetadata { +import org.apache.logging.log4j.core.net.Facility; + +public class BlockStained extends Block implements IBlockMetadata, IColoredBlock { public BlockStained() { super(Material.GLASS); this.setCreativeTab(CreativeTabBotany.instance); @@ -28,58 +42,53 @@ public class BlockStained extends Block implements IBlockMetadata { public int quantityDropped(final Random p_149745_1_) { return 0; } - -// @Override -// public boolean isOpaqueCube() { -// return false; -// } -// -// @Override -// public boolean renderAsNormalBlock() { -// return false; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getRenderBlockPass() { -// return 1; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public boolean shouldSideBeRendered(final IBlockAccess p_149646_1_, final int p_149646_2_, final int p_149646_3_, final int p_149646_4_, final int p_149646_5_) { -// final Block block2 = p_149646_1_.getBlock(p_149646_2_ - Facing.offsetsXForSide[p_149646_5_], p_149646_3_ - Facing.offsetsYForSide[p_149646_5_], p_149646_4_ - Facing.offsetsZForSide[p_149646_5_]); -// final Block block3 = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); -// return block3 != this && block3 != ExtraTrees.blockStained && super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); -// } -// -// @Override -// public ArrayList getDrops(final World world, final int x, final int y, final int z, final int blockMeta, final int fortune) { -// return BlockMetadata.getBlockDropped(this, world, x, y, z, blockMeta); -// } -// -// @Override -// public boolean removedByPlayer(final World world, final EntityPlayer player, final int x, final int y, final int z) { -// return BlockMetadata.breakBlock(this, player, world, x, y, z); -// } + + @Override + public boolean isOpaqueCube(IBlockState state) { + return false; + } + + @SideOnly(Side.CLIENT) + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT_MIPPED; + } + + @SideOnly(Side.CLIENT) + @Override + public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + Block block2 = blockAccess.getBlockState(pos.offset(side)).getBlock(); + Block block3 = blockAccess.getBlockState(pos).getBlock(); + return block3 != this && block3 != ExtraTrees.blockStained && super.shouldSideBeRendered(blockState, blockAccess, pos, side); + } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { + return BlockMetadata.getBlockDropped(this, world, pos); + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + return BlockMetadata.breakBlock(this, player, world, pos); + } @Override public TileEntity createNewTileEntity(final World var1, final int i) { return new TileEntityMetadata(); } - - // @Override -// public boolean hasTileEntity(final int meta) { -// return true; -// } -// -// @Override -// public boolean onBlockEventReceived(final World par1World, final int par2, final int par3, final int par4, final int par5, final int par6) { -// super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); -// final TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); -// return tileentity != null && tileentity.receiveClientEvent(par5, par6); -// } -// + + @Override + public boolean hasTileEntity(IBlockState state) { + return true; + } + + @Override + public boolean eventReceived(IBlockState state, World worldIn, BlockPos pos, int id, int param) { + super.eventReceived(state, worldIn, pos, id, param); + TileEntity tileentity = worldIn.getTileEntity(pos); + return tileentity == null ? false : tileentity.receiveClientEvent(id, param); + } + @Override public int getPlacedMeta(final ItemStack stack, final World world, final BlockPos pos, final EnumFacing clickedBlock) { return TileEntityMetadata.getItemDamage(stack); @@ -101,15 +110,11 @@ public class BlockStained extends Block implements IBlockMetadata { } @Override - public void dropAsStack(World p0, BlockPos pos, ItemStack p4) { + public void dropAsStack(World world, BlockPos pos, ItemStack itemStack) { + spawnAsEntity(world, pos, itemStack); } -// @Override -// public void dropAsStack(final World world, final int x, final int y, final int z, final ItemStack drop) { -// this.dropBlockAsItem(world, x, y, z, drop); -// } - @Override public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List itemList) { for (final EnumFlowerColor c : EnumFlowerColor.values()) { @@ -137,51 +142,34 @@ public class BlockStained extends Block implements IBlockMetadata { // public void registerBlockIcons(final IIconRegister register) { // this.blockIcon = Botany.proxy.getIcon(register, "stained"); // } - -// @Override -// @SideOnly(Side.CLIENT) -// public int colorMultiplier(final IBlockAccess world, final int x, final int y, final int z) { -// final TileEntityMetadata tile = TileEntityMetadata.getTile(world, x, y, z); -// if (tile != null) { -// return this.getRenderColor(tile.getTileMetadata()); -// } -// return 16777215; -// } - -// @Override -// public void breakBlock(final World par1World, final int par2, final int par3, final int par4, final Block par5, final int par6) { -// super.breakBlock(par1World, par2, par3, par4, par5, par6); -// par1World.removeTileEntity(par2, par3, par4); -// } -// -// @Override -// public boolean isWood(final IBlockAccess world, final int x, final int y, final int z) { -// return true; -// } -// -// @Override -// public int getFlammability(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { -// return 20; -// } -// -// @Override -// public boolean isFlammable(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { -// return true; -// } -// -// @Override -// public int getFireSpreadSpeed(final IBlockAccess world, final int x, final int y, final int z, final ForgeDirection face) { -// return 5; -// } -// -// @Override -// public ItemStack getPickBlock(final MovingObjectPosition target, final World world, final int x, final int y, final int z) { -// return BlockMetadata.getPickBlock(world, x, y, z); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getRenderColor(final int meta) { -// return EnumFlowerColor.get(meta).getColor(false); -// } + + @Override + public boolean isWood(IBlockAccess world, BlockPos pos) { + return true; + } + + @Override + public int getFlammability(IBlockAccess world, BlockPos pos, EnumFacing face) { + return 20; + } + + @Override + public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { + return true; + } + + @Override + public int getFireSpreadSpeed(IBlockAccess world, BlockPos pos, EnumFacing face) { + return 5; + } + + @Override + public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { + return BlockMetadata.getPickBlock(world, pos); + } + + @Override + public int colorMultiplier(IBlockState state, IBlockAccess worldIn, BlockPos pos, int tintIndex) { + return EnumFlowerColor.get(getMetaFromState(state)).getColor(false); + } } diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 9f75cca4..b50e17d5 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -1,39 +1,29 @@ package binnie.botany.gardening; +import binnie.Binnie; import binnie.botany.CreativeTabBotany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.gardening.IBlockSoil; +import binnie.core.BinnieCore; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemSoilMeter extends Item { -// @Override -// public boolean onItemUse(final ItemStack stack, final EntityPlayer player, final World world, final int x, int y, final int z, final int p_77648_7_, final float p_77648_8_, final float p_77648_9_, final float p_77648_10_) { -// Block block = world.getBlock(x, y, z); -// if (!Gardening.isSoil(block)) { -// --y; -// block = world.getBlock(x, y, z); -// } -// if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) { -// final IBlockSoil soil = (IBlockSoil) block; -// final EnumSoilType type = soil.getType(world, x, y, z); -// final EnumMoisture moisture = soil.getMoisture(world, x, y, z); -// final EnumAcidity pH = soil.getPH(world, x, y, z); -// String info = "Type: "; -// info = info + "§" + (new char[] { '8', '6', 'd' })[type.ordinal()] + Binnie.Language.localise(type) + "§f"; -// info += ", Moisture: "; -// info = info + "§" + (new char[] { 'e', '7', '9' })[moisture.ordinal()] + Binnie.Language.localise(moisture) + "§f"; -// info += ", pH: "; -// info = info + "§" + (new char[] { 'c', 'a', 'b' })[pH.ordinal()] + Binnie.Language.localise(pH) + "§f"; -// final IChatComponent chat = new ChatComponentText(info); -// player.addChatMessage(chat); -// } -// return super.onItemUse(stack, player, world, x, y, z, p_77648_7_, p_77648_8_, p_77648_9_, p_77648_10_); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Botany.proxy.getIcon(register, "soilMeter"); -// } +public class ItemSoilMeter extends Item implements IItemModelRegister { public ItemSoilMeter() { this.setCreativeTab(CreativeTabBotany.instance); @@ -41,6 +31,53 @@ public class ItemSoilMeter extends Item { this.setMaxStackSize(1); setRegistryName("soilMeter"); } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0); + } + + @Override + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + Block block = world.getBlockState(pos).getBlock(); + if (!Gardening.isSoil(block)) { + pos = pos.down(); + block = world.getBlockState(pos).getBlock(); + } + if (Gardening.isSoil(block) && !BinnieCore.proxy.isSimulating(world)) { + IBlockSoil soil = (IBlockSoil) block; + String info = Binnie.Language.localise("botany.soil.type") + ": "; + info = info + soil.getType(world, pos).getTranslated(true); + info += ", " + TextFormatting.WHITE + Binnie.Language.localise("botany.moisture") + ": "; + info = info + soil.getMoisture(world, pos).getTranslated(true); + info += ", " + TextFormatting.WHITE + Binnie.Language.localise("botany.ph") + ": "; + info = info + soil.getPH(world, pos).getTranslated(true); + ITextComponent chat = new TextComponentString(info); + player.addChatMessage(chat); + } + return super.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ); + } + + public static String getPH(ItemStack stack, boolean withColor, boolean byNeutralNone) { + EnumAcidity ph = EnumAcidity.values()[stack.getItemDamage() / 3]; + if(byNeutralNone){ + if(ph == EnumAcidity.Neutral){ + return ""; + } + } + return TextFormatting.GRAY + Binnie.Language.localise("botany.ph") + ": " + ph.getTranslated(withColor); + } + + public static String getMoisture(ItemStack stack, boolean withColor, boolean byNormalNone) { + EnumMoisture moisure = EnumMoisture.values()[stack.getItemDamage() % 3]; + if(byNormalNone){ + if(moisure == EnumMoisture.Normal){ + return ""; + } + } + return TextFormatting.GRAY + Binnie.Language.localise("botany.moisture") + ": " + moisure.getTranslated(withColor); + } @Override public String getItemStackDisplayName(final ItemStack i) { diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 338c8494..52c0a530 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -31,9 +31,9 @@ import java.util.HashMap; import java.util.Map; public class ModuleGardening implements IInitializable { - public static HashMap queuedAcidFertilisers = new HashMap<>(); - public static HashMap queuedAlkalineFertilisers = new HashMap<>(); - public static HashMap queuedNutrientFertilisers = new HashMap<>(); + public static final HashMap queuedAcidFertilisers = new HashMap<>(); + public static final HashMap queuedAlkalineFertilisers = new HashMap<>(); + public static final HashMap queuedNutrientFertilisers = new HashMap<>(); @Override public void preInit() { @@ -262,5 +262,4 @@ public class ModuleGardening implements IInitializable { } } } - } diff --git a/src/main/java/binnie/botany/genetics/AlleleColor.java b/src/main/java/binnie/botany/genetics/AlleleColor.java deleted file mode 100644 index 471f3a83..00000000 --- a/src/main/java/binnie/botany/genetics/AlleleColor.java +++ /dev/null @@ -1,47 +0,0 @@ -package binnie.botany.genetics; - -import forestry.api.genetics.IAlleleInteger; - -public class AlleleColor implements IAlleleInteger { - String uid; - boolean dominant; - String name; - int value; - EnumFlowerColor color; - - public AlleleColor(final EnumFlowerColor color, final String uid, final String name, final int value) { - this.color = color; - this.uid = uid; - this.name = name; - this.value = value; - } - - @Override - public String getUID() { - return this.uid; - } - - @Override - public boolean isDominant() { - return true; - } - - @Override - public String getName() { - return this.color.getName(); - } - - @Override - public int getValue() { - return this.value; - } - - public EnumFlowerColor getColor() { - return this.color; - } - - @Override - public String getUnlocalizedName() { - return this.getUID(); - } -} diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 3b85a78f..bdb82331 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -1,36 +1,24 @@ package binnie.botany.genetics; +import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; +import binnie.botany.core.BotanyGUI; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; 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.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemDictionary extends Item { -// IIcon iconMaster; -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Botany.proxy.getIcon(register, "botanistDatabase"); -// this.iconMaster = Botany.proxy.getIcon(register, "masterBotanistDatabase"); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIconFromDamage(final int par1) { -// return (par1 == 0) ? this.itemIcon : this.iconMaster; -// } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { - super.getSubItems(par1, par2CreativeTabs, par3List); - par3List.add(new ItemStack(par1, 1, 1)); - } +public class ItemDictionary extends Item implements IItemModelRegister { public ItemDictionary() { this.setCreativeTab(CreativeTabBotany.instance); @@ -38,17 +26,30 @@ public class ItemDictionary extends Item { this.setMaxStackSize(1); setRegistryName("database"); } - -// @Override -// public ItemStack onItemRightClick(final ItemStack itemstack, final World world, final EntityPlayer player) { -// if (itemstack.getItemDamage() == 0) { -// Botany.proxy.openGui(BotanyGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); -// } -// else { -// Botany.proxy.openGui(BotanyGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); -// } -// return itemstack; -// } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List par3List) { + super.getSubItems(par1, par2CreativeTabs, par3List); + par3List.add(new ItemStack(par1, 1, 1)); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "botanistDatabase"); + manager.registerItemModel(item, 1, "masterBotanistDatabase"); + } + + @Override + public ActionResult onItemRightClick(ItemStack itemStack, World world, EntityPlayer player, EnumHand hand) { + if(itemStack.getMetadata() == 0){ + Botany.proxy.openGui(BotanyGUI.Database, player, player.getPosition()); + }else{ + Botany.proxy.openGui(BotanyGUI.DatabaseNEI, player, player.getPosition()); + } + return ActionResult.newResult(EnumActionResult.SUCCESS, itemStack); + } @Override public String getItemStackDisplayName(final ItemStack i) { diff --git a/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java b/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java index 97b1016c..841141b2 100644 --- a/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java +++ b/src/main/java/binnie/botany/genetics/ItemEncyclopedia.java @@ -1,36 +1,31 @@ package binnie.botany.genetics; +import binnie.Binnie; import binnie.botany.CreativeTabBotany; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class ItemEncyclopedia extends Item { +public class ItemEncyclopedia extends Item implements IItemModelRegister { boolean reinforced; -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Botany.proxy.getIcon(register, "encylopedia" + (this.reinforced ? "Iron" : "")); -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public IIcon getIconFromDamage(final int par1) { -// return this.itemIcon; -// } - - public ItemEncyclopedia(final boolean reinforced) { - this.reinforced = false; + public ItemEncyclopedia(boolean reinforced) { this.reinforced = reinforced; this.setCreativeTab(CreativeTabBotany.instance); - this.setUnlocalizedName("encylopedia" + (reinforced ? "Iron" : "")); + this.setUnlocalizedName("encylopedia" + (reinforced ? "Reinforced" : "")); this.setMaxStackSize(1); this.setMaxDamage(reinforced ? 480 : 120); - setRegistryName("encylopedia" + (reinforced ? "Iron" : "")); + setRegistryName("encylopedia" + (reinforced ? "Reinforced" : "")); + } + + @Override + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0, "encylopedia" + (this.reinforced ? "Reinforced" : "")); } @Override - public String getItemStackDisplayName(final ItemStack i) { - return (this.reinforced ? "Reinforced " : "") + "Florist's Encyclopaedia"; + public String getItemStackDisplayName(ItemStack itemStack) { + return Binnie.Language.localise("item.botany.encylopedia" + (this.reinforced ? "_reinforced" : "")); } } diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index 500827bc..9e157de8 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -2,6 +2,9 @@ package binnie.botany.items; import binnie.botany.CreativeTabBotany; import binnie.botany.genetics.EnumFlowerColor; +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.core.items.IColoredItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -10,21 +13,27 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemPigment extends Item { +public class ItemPigment extends Item implements IItemModelRegister, IColoredItem{ public ItemPigment() { this.setUnlocalizedName("pigment"); this.setHasSubtypes(true); this.setCreativeTab(CreativeTabBotany.instance); setRegistryName("pigment"); } - - -// @Override -// @SideOnly(Side.CLIENT) -// public int getColorFromItemStack(final ItemStack stack, final int p_82790_2_) { -// final int damage = stack.getItemDamage(); -// return EnumFlowerColor.get(damage).getColor(false); -// } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + for (final EnumFlowerColor c : EnumFlowerColor.values()) { + manager.registerItemModel(item, c.ordinal()); + } + } + + @SideOnly(Side.CLIENT) + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) { + return EnumFlowerColor.get(stack.getItemDamage()).getColor(false); + } @Override public String getItemStackDisplayName(final ItemStack stack) { @@ -38,10 +47,4 @@ public class ItemPigment extends Item { list.add(new ItemStack(this, 1, c.ordinal())); } } - -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister register) { -// this.itemIcon = Botany.proxy.getIcon(register, "pigment"); -// } } diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 83245aee..454587a4 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -24,7 +24,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return getBlockDropped(this, world, pos, state.getBlock().getMetaFromState(state)); + return getBlockDropped(this, world, pos); } @Override @@ -76,7 +76,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { return tileMeta; } - public static ArrayList getBlockDropped(final IBlockMetadata block, final IBlockAccess world, final BlockPos pos, final int blockMeta) { + public static ArrayList getBlockDropped(final IBlockMetadata block, final IBlockAccess world, final BlockPos pos) { final ArrayList array = new ArrayList<>(); final TileEntityMetadata tile = TileEntityMetadata.getTile(world, pos); if (tile != null && !tile.hasDroppedBlock()) { diff --git a/src/main/java/binnie/core/genetics/ManagerGenetics.java b/src/main/java/binnie/core/genetics/ManagerGenetics.java index 10a86c92..be7383b2 100644 --- a/src/main/java/binnie/core/genetics/ManagerGenetics.java +++ b/src/main/java/binnie/core/genetics/ManagerGenetics.java @@ -2,7 +2,7 @@ package binnie.core.genetics; import binnie.Binnie; import binnie.botany.api.IFlowerRoot; -import binnie.botany.genetics.AlleleColor; +import binnie.botany.genetics.EnumFlowerColor; import binnie.core.BinnieCore; import binnie.core.ManagerBase; import forestry.api.apiculture.BeeManager; @@ -199,7 +199,7 @@ public class ManagerGenetics extends ManagerBase { if (o1 instanceof IAlleleFloat && o2 instanceof IAlleleFloat) { return Float.valueOf(((IAlleleFloat) o1).getValue()).compareTo(((IAlleleFloat) o2).getValue()); } - if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof AlleleColor)) { + if (o1 instanceof IAlleleInteger && o2 instanceof IAlleleInteger && !(o1 instanceof EnumFlowerColor)) { return Integer.valueOf(((IAlleleInteger) o1).getValue()).compareTo(((IAlleleInteger) o2).getValue()); } if (o1.getName() != null && o2.getName() != null) { diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index 391ff507..3206f5e6 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -10,11 +10,11 @@ botany.moisture.dry=Dry botany.moisture.normal=Normal botany.moisture.damp=Damp -botany.soil.weedkiller=Weedkiller - botany.soil.soil=Soil botany.soil.loam=Loam botany.soil.flowerbed=Flowerbed +botany.soil.type=Type +botany.soil.weedkiller=Weedkiller botany.plant.weeds=Weed botany.plant.weeds_long=Weed Long @@ -28,6 +28,9 @@ item.trowelIron.name=Iron Trowel item.trowelGold.name=Gold Trowel item.trowelDiamond.name=Diamond Trowel +item.botany.encylopedia=Florist's Encyclopaedia +item.botany.encylopedia_reinforced=Reinforced Florist's Encyclopaedia + botany.colour.aquamarine=Aquamarine botany.colour.black=Black botany.colour.blue=Deep Blue diff --git a/src/main/resources/assets/botany/models/item/botanistDatabase.json b/src/main/resources/assets/botany/models/item/botanistDatabase.json new file mode 100644 index 00000000..67874645 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/botanistDatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/botanistDatabase" + } +} diff --git a/src/main/resources/assets/botany/models/item/encylopedia.json b/src/main/resources/assets/botany/models/item/encylopedia.json new file mode 100644 index 00000000..0a3dc152 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/encylopedia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/encylopedia" + } +} diff --git a/src/main/resources/assets/botany/models/item/encylopediaReinforced.json b/src/main/resources/assets/botany/models/item/encylopediaReinforced.json new file mode 100644 index 00000000..3e42f539 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/encylopediaReinforced.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/encylopediaReinforced" + } +} diff --git a/src/main/resources/assets/botany/models/item/masterBotanistDatabase.json b/src/main/resources/assets/botany/models/item/masterBotanistDatabase.json new file mode 100644 index 00000000..6edab2dc --- /dev/null +++ b/src/main/resources/assets/botany/models/item/masterBotanistDatabase.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/masterBotanistDatabase" + } +} diff --git a/src/main/resources/assets/botany/models/item/pigment.json b/src/main/resources/assets/botany/models/item/pigment.json new file mode 100644 index 00000000..7cc567b3 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/pigment.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/pigment" + } +} diff --git a/src/main/resources/assets/botany/models/item/soilMeter.json b/src/main/resources/assets/botany/models/item/soilMeter.json new file mode 100644 index 00000000..a96bb699 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/soilMeter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/soilMeter" + } +} diff --git a/src/main/resources/assets/botany/textures/items/encylopediaIron.png b/src/main/resources/assets/botany/textures/items/encylopediaReinforced.png similarity index 100% rename from src/main/resources/assets/botany/textures/items/encylopediaIron.png rename to src/main/resources/assets/botany/textures/items/encylopediaReinforced.png