From db2f4b7360c35b3c68c6c54e64cf53def603496f Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 24 Jun 2017 01:50:32 +0200 Subject: [PATCH] Add hops crop --- .../binnie/extratrees/block/BlockHops.java | 237 ++++++++++++++++++ .../binnie/extratrees/block/ItemETDoor.java | 108 -------- .../binnie/extratrees/block/ModuleBlocks.java | 6 +- .../extratrees/item/ExtraTreeItems.java | 37 ++- .../java/binnie/extratrees/item/ItemHops.java | 91 +++++++ .../binnie/extratrees/item/ModuleItems.java | 9 +- .../assets/extratrees/blockstates/hops.json | 101 ++++++++ .../assets/extratrees/lang/en_US.lang | 15 ++ .../models/item/{misc => }/hops.json | 2 +- .../blocks/hops/hops_stage_0_down.png | Bin 0 -> 1180 bytes .../textures/blocks/hops/hops_stage_0_up.png | Bin 0 -> 1086 bytes .../blocks/hops/hops_stage_1_down.png | Bin 0 -> 1261 bytes .../textures/blocks/hops/hops_stage_1_up.png | Bin 0 -> 1086 bytes .../blocks/hops/hops_stage_2_down.png | Bin 0 -> 1338 bytes .../textures/blocks/hops/hops_stage_2_up.png | Bin 0 -> 1086 bytes .../blocks/hops/hops_stage_3_down.png | Bin 0 -> 1356 bytes .../textures/blocks/hops/hops_stage_3_up.png | Bin 0 -> 1130 bytes .../blocks/hops/hops_stage_4_down.png | Bin 0 -> 1403 bytes .../textures/blocks/hops/hops_stage_4_up.png | Bin 0 -> 1258 bytes .../blocks/hops/hops_stage_5_down.png | Bin 0 -> 1429 bytes .../textures/blocks/hops/hops_stage_5_up.png | Bin 0 -> 1408 bytes .../blocks/hops/hops_stage_6_down.png | Bin 0 -> 1464 bytes .../textures/blocks/hops/hops_stage_6_up.png | Bin 0 -> 1425 bytes .../blocks/hops/hops_stage_7_down.png | Bin 0 -> 1537 bytes .../textures/blocks/hops/hops_stage_7_up.png | Bin 0 -> 1484 bytes .../textures/items/{misc => }/hops.png | Bin 26 files changed, 472 insertions(+), 134 deletions(-) create mode 100644 src/main/java/binnie/extratrees/block/BlockHops.java delete mode 100644 src/main/java/binnie/extratrees/block/ItemETDoor.java create mode 100644 src/main/java/binnie/extratrees/item/ItemHops.java create mode 100644 src/main/resources/assets/extratrees/blockstates/hops.json rename src/main/resources/assets/extratrees/models/item/{misc => }/hops.json (55%) create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png create mode 100644 src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png rename src/main/resources/assets/extratrees/textures/items/{misc => }/hops.png (100%) diff --git a/src/main/java/binnie/extratrees/block/BlockHops.java b/src/main/java/binnie/extratrees/block/BlockHops.java new file mode 100644 index 00000000..ec057387 --- /dev/null +++ b/src/main/java/binnie/extratrees/block/BlockHops.java @@ -0,0 +1,237 @@ +package binnie.extratrees.block; + +import java.util.List; +import java.util.Locale; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockCrops; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.common.EnumPlantType; + +import binnie.extratrees.ExtraTrees; + +public class BlockHops extends BlockCrops{ + public static final PropertyEnum HALF = PropertyEnum.create("half", HopsHalf.class); + + public BlockHops() { + this.setDefaultState(this.blockState.getBaseState().withProperty(getAgeProperty(), 0).withProperty(HALF, HopsHalf.DOWN)); + setUnlocalizedName("hops"); + setRegistryName("hops"); + } + + @Override + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + state = getActualState(state, world, pos); + int age = getAge(state); + if(age == getMaxAge()) { + if (!world.isRemote) { + List items = NonNullList.create(); + items.addAll(getDrops(world, pos, state, 0)); + + for (ItemStack item : items) { + spawnAsEntity(world, pos, item); + } + BlockPos cropPos = pos; + if(state.getValue(HALF) == HopsHalf.UP){ + cropPos = cropPos.down(); + } + placeAt(world, cropPos, 2); + } + return true; + } + return false; + } + + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { + return FULL_BLOCK_AABB; + } + + @Override + public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos) { + return EnumPlantType.Crop; + } + + public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { + return super.canPlaceBlockAt(worldIn, pos) && worldIn.isAirBlock(pos.up()); + } + + protected void checkAndDropBlock(World worldIn, BlockPos pos, IBlockState state) { + if (!this.canBlockStay(worldIn, pos, state)) { + boolean flag = state.getValue(HALF) == HopsHalf.UP; + BlockPos blockpos = flag ? pos : pos.up(); + BlockPos blockpos1 = flag ? pos.down() : pos; + Block block = (Block)(flag ? this : worldIn.getBlockState(blockpos).getBlock()); + Block block1 = (Block)(flag ? worldIn.getBlockState(blockpos1).getBlock() : this); + + if (!flag){ + this.dropBlockAsItem(worldIn, pos, state, 0); + } + + if (block == this) { + worldIn.setBlockState(blockpos, Blocks.AIR.getDefaultState(), 2); + } + + if (block1 == this) { + worldIn.setBlockState(blockpos1, Blocks.AIR.getDefaultState(), 3); + } + } + } + + public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state) { + if (state.getValue(HALF) == HopsHalf.UP) { + return worldIn.getBlockState(pos.down()).getBlock() == this; + } else { + IBlockState iblockstate = worldIn.getBlockState(pos.up()); + return iblockstate.getBlock() == this && super.canBlockStay(worldIn, pos, iblockstate); + } + } + + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + if (state.getValue(HALF) == HopsHalf.UP) { + return Items.AIR; + } else { + return super.getItemDropped(state, rand, fortune); + } + } + + @Override + protected Item getCrop() { + return ExtraTrees.items().itemHops; + } + + @Override + protected Item getSeed() { + return ExtraTrees.items().itemHops; + } + + public void placeAt(World worldIn, BlockPos lowerPos, int flags) { + worldIn.setBlockState(lowerPos, this.getDefaultState().withProperty(HALF, HopsHalf.DOWN), flags); + worldIn.setBlockState(lowerPos.up(), this.getDefaultState().withProperty(HALF, HopsHalf.UP), flags); + } + + public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + worldIn.setBlockState(pos.up(), this.getDefaultState().withProperty(HALF, HopsHalf.UP), 2); + } + + public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) { + if (state.getValue(HALF) == HopsHalf.UP) { + if (worldIn.getBlockState(pos.down()).getBlock() == this) { + if (player.capabilities.isCreativeMode) { + worldIn.setBlockToAir(pos.down()); + } else { + worldIn.destroyBlock(pos.down(), true); + } + } + } else if (worldIn.getBlockState(pos.up()).getBlock() == this) { + worldIn.setBlockState(pos.up(), Blocks.AIR.getDefaultState(), 2); + } + + super.onBlockHarvested(worldIn, pos, state, player); + } + + public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { + return new ItemStack(getCrop()); + } + + @Override + public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) { + if(state.getValue(HALF) == HopsHalf.UP){ + IBlockState stateDrown = world.getBlockState(pos.down()); + Block block = stateDrown.getBlock(); + if(block instanceof BlockHops) { + return ((BlockHops) block).canGrow(world, pos.down(), stateDrown, isClient); + } + return false; + } + return super.canGrow(world, pos, state, isClient); + } + + @Override + public void grow(World world, BlockPos pos, IBlockState state) { + if(state.getValue(HALF) == HopsHalf.UP){ + IBlockState stateDrown = world.getBlockState(pos.down()); + Block block = stateDrown.getBlock(); + if(block instanceof BlockHops) { + ((BlockHops) block).grow(world, pos.down(), stateDrown); + } + return; + } + super.grow(world, pos, state); + } + + @Override + public void updateTick(World worldIn, BlockPos pos, IBlockState state, Random rand) { + if(state.getValue(HALF) == HopsHalf.DOWN){ + super.updateTick(worldIn, pos, state, rand); + }else { + checkAndDropBlock(worldIn, pos, state); + } + } + + @Override + public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { + if (state.getBlock() == this && state.getValue(HALF) == HopsHalf.DOWN && world.getBlockState(pos.up()).getBlock() == this) { + world.setBlockToAir(pos.up()); + } + return world.setBlockToAir(pos); + } + + @Override + protected BlockStateContainer createBlockState() { + return new BlockStateContainer(this, new IProperty[] {AGE, HALF}); + } + + public IBlockState getStateFromMeta(int meta) { + return (meta & 8) > 0 ? this.getDefaultState().withProperty(HALF, HopsHalf.UP) : this.getDefaultState().withProperty(HALF, HopsHalf.DOWN).withProperty(getAgeProperty(), meta & 7); + } + + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + if (state.getValue(HALF) == HopsHalf.UP) { + IBlockState iblockstate = worldIn.getBlockState(pos.down()); + + if (iblockstate.getBlock() == this) { + state = state.withProperty(getAgeProperty(), iblockstate.getValue(getAgeProperty())); + } + } + + return state; + } + + public int getMetaFromState(IBlockState state) { + return state.getValue(HALF) == HopsHalf.UP ? 8 : getAge(state); + } + + public enum HopsHalf implements IStringSerializable { + UP, + DOWN; + + public String toString() + { + return this.getName(); + } + + public String getName() + { + return name().toLowerCase(Locale.ENGLISH); + } + } +} diff --git a/src/main/java/binnie/extratrees/block/ItemETDoor.java b/src/main/java/binnie/extratrees/block/ItemETDoor.java deleted file mode 100644 index 569e20f9..00000000 --- a/src/main/java/binnie/extratrees/block/ItemETDoor.java +++ /dev/null @@ -1,108 +0,0 @@ -package binnie.extratrees.block; - -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -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.world.World; - -import binnie.core.block.ItemMetadata; - -public class ItemETDoor extends ItemMetadata { - /*@Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister register) { - for (final DoorType type : DoorType.values()) { - type.iconItem = ExtraTrees.proxy.getIcon(register, "door." + type.id); - } - }*/ - - public ItemETDoor(final Block block) { - super(block); - this.maxStackSize = 1; - this.setCreativeTab(CreativeTabs.REDSTONE); - } - - public static void placeDoorBlock(final World par0World, final int par1, final int par2, final int par3, final int par4, final Block par5Block, final ItemStack item, final EntityPlayer player) { - /*byte b0 = 0; - byte b2 = 0; - if (par4 == 0) { - b2 = 1; - } - if (par4 == 1) { - b0 = -1; - } - if (par4 == 2) { - b2 = -1; - } - if (par4 == 3) { - b0 = 1; - } - - final int i1 = (par0World.isBlockNormalCubeDefault(par1 - b0, par2, par3 - b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 - b0, par2 + 1, par3 - b2, false) ? 1 : 0); - final int j1 = (par0World.isBlockNormalCubeDefault(par1 + b0, par2, par3 + b2, false) ? 1 : 0) + (par0World.isBlockNormalCubeDefault(par1 + b0, par2 + 1, par3 + b2, false) ? 1 : 0); - final boolean flag = par0World.getBlock(par1 - b0, par2, par3 - b2) == par5Block || par0World.getBlock(par1 - b0, par2 + 1, par3 - b2) == par5Block; - final boolean flag2 = par0World.getBlock(par1 + b0, par2, par3 + b2) == par5Block || par0World.getBlock(par1 + b0, par2 + 1, par3 + b2) == par5Block; - boolean flag3 = false; - if (flag && !flag2) { - flag3 = true; - } - else if (j1 > i1) { - flag3 = true; - } - par0World.setBlock(par1, par2, par3, par5Block, par4, 2); - par0World.setBlock(par1, par2 + 1, par3, par5Block, 0x8 | (flag3 ? 1 : 0), 2); - if (par0World.getBlock(par1, par2, par3) == par5Block) { - final TileEntityMetadata tile = TileEntityMetadata.getTile(par0World, par1, par2, par3); - if (tile != null) { - tile.setTileMetadata(TileEntityMetadata.getItemDamage(item), false); - } - par5Block.onBlockPlacedBy(par0World, par1, par2, par3, player, item); - par5Block.onPostBlockPlaced(par0World, par1, par2, par3, par4); - } - par0World.notifyBlocksOfNeighborChange(par1, par2, par3, par5Block); - par0World.notifyBlocksOfNeighborChange(par1, par2 + 1, par3, par5Block);*/ - } - - @Override - public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { - /*if (par7 != 1) { - return false; - } - ++par5; - final Block block = ExtraTrees.blockDoor; - if (!par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) || !par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)) { - return false; - } - if (!block.canPlaceBlockAt(par3World, pos)) { - return false; - } - final int i1 = MathHelper.floor((par2EntityPlayer.rotationYaw + 180.0f) * 4.0f / 360.0f - 0.5) & 0x3; - placeDoorBlock(par3World, par4, par5, par6, i1, block, par1ItemStack, par2EntityPlayer); - par1ItemStack.shrink(1);*/ - return super.onItemUse(player, worldIn, pos, hand, facing, hitX, hitY, hitZ); - } - - /*@Override - @SideOnly(Side.CLIENT) - public int getSpriteNumber() { - return 1; - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(final int par1) { - final DoorType type = BlockETDoor.getDoorType(par1); - return type.iconItem; - } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(final ItemStack par1ItemStack, final int par2) { - return WoodManager.getPlankType((par1ItemStack.isEmpty()) ? 0 : (par1ItemStack.getItemDamage() & 0xFF)).getColour(); - }*/ -} diff --git a/src/main/java/binnie/extratrees/block/ModuleBlocks.java b/src/main/java/binnie/extratrees/block/ModuleBlocks.java index 091d4032..858ae66d 100644 --- a/src/main/java/binnie/extratrees/block/ModuleBlocks.java +++ b/src/main/java/binnie/extratrees/block/ModuleBlocks.java @@ -84,8 +84,7 @@ public class ModuleBlocks implements IInitializable { public BlockMultiFence blockMultiFence; public BlockHedge blockHedge; public BlockShrubLog shrubLog; - //???? - public Block blockBranch; + public BlockHops hops; private static void addRecipeAtPosition(int position, IRecipe recipe) { CraftingManager manager = CraftingManager.getInstance(); @@ -285,6 +284,9 @@ public class ModuleBlocks implements IInitializable { ExtraTrees.proxy.registerBlock(shrubLog, new ItemBlockETWood(shrubLog)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, false, shrubLog.getStateFromMeta(0), new ItemStack(shrubLog, 1, 0)); woodAccess.register(EnumShrubLog.INSTANCE, WoodBlockKind.LOG, true, shrubLog.getStateFromMeta(1), new ItemStack(shrubLog, 1, 1)); + + hops = new BlockHops(); + ExtraTrees.proxy.registerBlock(hops); } public void registerDoors(WoodAccess woodAccess, List blocks) { diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index 4367acbc..c113ee87 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -8,32 +8,29 @@ import binnie.core.item.IItemMiscProvider; import binnie.extratrees.ExtraTrees; public enum ExtraTreeItems implements IItemMiscProvider { - CarpentryHammer("Fake Hammer", "carpentry_hammer"), - Sawdust("Sawdust", "sawdust"), - Bark("Bark", "bark"), - ProvenGear("Proven Gear", "proven_gear"), - WoodWax("Wood Polish", "wood_wax"), - Hops("Hops", "hops"), - Yeast("Yeast", "yeast"), - LagerYeast("Lager Yeast", "yeast_lager"), - GrainWheat("Wheat Grain", "grain_wheat"), - GrainBarley("Barley Grain", "grain_barley"), - GrainRye("Rye Grain", "grain_rye"), - GrainCorn("Corn Grain", "grain_corn"), - GrainRoasted("Roasted Grain", "grain_roasted"), - GlassFitting("Glass Fittings", "glass_fitting"); - + CarpentryHammer("carpentry_hammer"), + Sawdust("sawdust"), + Bark("bark"), + ProvenGear("proven_gear"), + WoodWax("wood_wax"), + Yeast("yeast"), + LagerYeast("yeast_lager"), + GrainWheat("grain_wheat"), + GrainBarley("grain_barley"), + GrainRye("grain_rye"), + GrainCorn("grain_corn"), + GrainRoasted("grain_roasted"), + GlassFitting("glass_fitting"); + String name; - String modelPath; - ExtraTreeItems(final String name, final String modelPath) { + ExtraTreeItems(String name) { this.name = name; - this.modelPath = modelPath; } @Override public String getModelPath() { - return modelPath; + return name; } @Override @@ -42,7 +39,7 @@ public enum ExtraTreeItems implements IItemMiscProvider { @Override public String getName(final ItemStack stack) { - return this.name; + return ExtraTrees.proxy.localise("item." + name + ".name"); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHops.java b/src/main/java/binnie/extratrees/item/ItemHops.java new file mode 100644 index 00000000..57111ea2 --- /dev/null +++ b/src/main/java/binnie/extratrees/item/ItemHops.java @@ -0,0 +1,91 @@ +package binnie.extratrees.item; + +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +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.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.EnumPlantType; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import forestry.api.core.Tabs; + +import binnie.extratrees.ExtraTrees; + +public class ItemHops extends Item implements net.minecraftforge.common.IPlantable, IItemModelRegister { + private final Block crops; + private final Block soil; + + public ItemHops(Block crops, Block soil) { + this.crops = crops; + this.soil = soil; + setUnlocalizedName("hops"); + setRegistryName("hops"); + this.setCreativeTab(Tabs.tabArboriculture); + } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + } + + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + IBlockState state = worldIn.getBlockState(pos); + Block block = state.getBlock(); + + ItemStack itemstack = player.getHeldItem(hand); + + if (!itemstack.isEmpty() && facing == EnumFacing.UP && player.canPlayerEdit(pos, facing, itemstack) && state.getBlock().canSustainPlant(state, worldIn, pos, EnumFacing.UP, this) && worldIn.isAirBlock(pos.up())) { + pos = pos.up(); + IBlockState blockState = crops.getStateForPlacement(worldIn, pos, facing, hitX, hitY, hitZ, 0, player, hand); + + if (!worldIn.setBlockState(pos, blockState, 11)) { + return EnumActionResult.FAIL; + } else { + blockState = worldIn.getBlockState(pos); + + if (blockState.getBlock() == crops) { + blockState.getBlock().onBlockPlacedBy(worldIn, pos, blockState, player, itemstack); + } + + SoundType soundtype = blockState.getBlock().getSoundType(blockState, worldIn, pos, player); + worldIn.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + itemstack.shrink(1); + return EnumActionResult.SUCCESS; + } + } else { + return EnumActionResult.FAIL; + } + } + + @Override + public String getItemStackDisplayName(ItemStack itemStack) { + return ExtraTrees.proxy.localise("item.hops.name"); + } + + @Override + public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos) { + return EnumPlantType.Crop; + } + + @Override + public IBlockState getPlant(IBlockAccess world, BlockPos pos) { + return crops.getDefaultState(); + } +} diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index 8a88ac50..41c9c415 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -36,6 +36,7 @@ public class ModuleItems implements IInitializable { public Item itemFood; public Item itemHammer; public Item itemDurableHammer; + public Item itemHops; @Override public void preInit() { @@ -58,10 +59,13 @@ public class ModuleItems implements IInitializable { itemDurableHammer = new ItemHammer(true); ExtraTrees.proxy.registerItem(itemDurableHammer); + itemHops = new ItemHops(ExtraTrees.blocks().hops, Blocks.FARMLAND); + ExtraTrees.proxy.registerItem(itemHops); + OreDictionary.registerOre("pulpWood", ExtraTreeItems.Sawdust.get(1)); Food.registerOreDictionary(); OreDictionary.registerOre("cropApple", Items.APPLE); - OreDictionary.registerOre("cropHops", ExtraTreeItems.Hops.get(1)); + OreDictionary.registerOre("cropHops", itemHops); OreDictionary.registerOre("seedWheat", Items.WHEAT_SEEDS); OreDictionary.registerOre("seedWheat", ExtraTreeItems.GrainWheat.get(1)); OreDictionary.registerOre("seedBarley", ExtraTreeItems.GrainBarley.get(1)); @@ -129,7 +133,7 @@ public class ModuleItems implements IInitializable { @Override public void postInit() { ModuleItems items = ExtraTrees.items(); - + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(items.itemDurableHammer, 1, 0), "wiw", " s ", " s ", 'w', Blocks.OBSIDIAN, 'i', Items.GOLD_INGOT, 's', Items.STICK)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(items.itemHammer, 1, 0), "wiw", " s ", " s ", 'w', "plankWood", 'i', Items.IRON_INGOT, 's', Items.STICK)); GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.Yeast.get(8), " m ", "mbm", 'b', Items.BREAD, 'm', Blocks.BROWN_MUSHROOM)); @@ -138,7 +142,6 @@ public class ModuleItems implements IInitializable { GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.GrainBarley.get(3), false, " s ", "s ", " s ", 's', ExtraTreeItems.GrainWheat.get(1))); GameRegistry.addRecipe(new ShapedOreRecipe(ExtraTreeItems.GrainCorn.get(3), false, " s ", " s", " s ", 's', ExtraTreeItems.GrainWheat.get(1))); GameRegistry.addRecipe(ExtraTreeItems.GrainRye.get(3), " ", "s s", " s ", 's', ExtraTreeItems.GrainWheat.get(1)); - GameRegistry.addRecipe(ExtraTreeItems.Hops.get(3), " s ", "sps", " s ", 's', Items.WHEAT_SEEDS, 'p', Items.APPLE); GameRegistry.addRecipe(ExtraTreeItems.ProvenGear.get(1), " s ", "s s", " s ", 's', Mods.Forestry.stack("oak_stick")); GameRegistry.addRecipe(ExtraTreeItems.GlassFitting.get(6), "s s", " i ", "s s", 'i', Items.IRON_INGOT, 's', Items.STICK); GameRegistry.addSmelting(ExtraTreeItems.GrainWheat.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f); diff --git a/src/main/resources/assets/extratrees/blockstates/hops.json b/src/main/resources/assets/extratrees/blockstates/hops.json new file mode 100644 index 00000000..3b1e50bc --- /dev/null +++ b/src/main/resources/assets/extratrees/blockstates/hops.json @@ -0,0 +1,101 @@ +{ + "forge_marker": 1, + "variants": { + "age=0,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_0_down" + } + }, + "age=1,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_1_down" + } + }, + "age=2,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_2_down" + } + }, + "age=3,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_3_down" + } + }, + "age=4,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_4_down" + } + }, + "age=5,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_5_down" + } + }, + "age=6,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_6_down" + } + }, + "age=7,half=down": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_7_down" + } + }, + "age=0,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_0_up" + } + }, + "age=1,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_1_up" + } + }, + "age=2,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_2_up" + } + }, + "age=3,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_3_up" + } + }, + "age=4,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_4_up" + } + }, + "age=5,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_5_up" + } + }, + "age=6,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_6_up" + } + }, + "age=7,half=up": { + "model": "crop", + "textures":{ + "crop": "extratrees:blocks/hops/hops_stage_7_up" + } + } + } +} diff --git a/src/main/resources/assets/extratrees/lang/en_US.lang b/src/main/resources/assets/extratrees/lang/en_US.lang index 4dd1abc2..0fab037e 100644 --- a/src/main/resources/assets/extratrees/lang/en_US.lang +++ b/src/main/resources/assets/extratrees/lang/en_US.lang @@ -434,6 +434,21 @@ extratrees.item.food.mango=Mango extratrees.item.food.starfruit=Starfruit extratrees.item.food.candlenut=Candlenut +extratrees.item.carpentry_hammer.name=Fake Hammer +extratrees.item.sawdust.name=Sawdust +extratrees.item.bark.name=Bark +extratrees.item.proven_gear.name=Proven Gear +extratrees.item.wood_wax.name=Wood Polish +extratrees.item.hops.name=Hops +extratrees.item.yeast.name=Yeast +extratrees.item.yeast_lager.name=Lager LagerYeast +extratrees.item.grain_wheat.name=Wheat Grain +extratrees.item.grain_barley.name=Barley Grain +extratrees.item.grain_rye.name=Rye Grain +extratrees.item.grain_corn.name=Corn Grain +extratrees.item.grain_roasted.name=Roasted Grain +extratrees.item.glass_fitting.name=Glass Fittings + extratrees.item.glassware.beermug=Beer Mug extratrees.item.glassware.pint=Pint Glass extratrees.item.glassware.snifter=Snifter Glass diff --git a/src/main/resources/assets/extratrees/models/item/misc/hops.json b/src/main/resources/assets/extratrees/models/item/hops.json similarity index 55% rename from src/main/resources/assets/extratrees/models/item/misc/hops.json rename to src/main/resources/assets/extratrees/models/item/hops.json index 971cd850..9f97da5b 100644 --- a/src/main/resources/assets/extratrees/models/item/misc/hops.json +++ b/src/main/resources/assets/extratrees/models/item/hops.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extratrees:items/misc/hops" + "layer0": "extratrees:items/hops" } } diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png new file mode 100644 index 0000000000000000000000000000000000000000..f7939222025c1d2dc57fe18bb280a34b3db53ad7 GIT binary patch literal 1180 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 KelF{r5}E*#g6Wt5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png new file mode 100644 index 0000000000000000000000000000000000000000..f656cddeb4b49fa9ec6626ccff375808e24d28e3 GIT binary patch literal 1086 zcmaJ=O-K|`93KyiseI6L#yVV!x?%(Gpk zM6*mgcIgsCr|M!5bScPgX*VeR2`nx*y#38`g07TJk(AI7G@FxhO@ zo%Onr)yuFv&ods5;W!sTxa>g#%Q=@}*X9)@Xe*XxVhtIkZw z^)``)F*(^}ShvS1DG!Xr{twml4YZ9Da5LX6h3({^37G`6(SW6pi|eU%LYYF?f-*){ z5~2Ql7vp^hBfAfoARKnO<_C41nxUesePopriwRM~#fDR3u=c=3Bz_wh+4!TJqOVH9TLbb(0I#?}R z(6-KnYY8<-+v=@z)va@JxRGtS3`vG@F880y&L0s6Im->}lFf$sp+OvP5o@10S~pLg z#Z*)ZCUfu8%PT8Qg@;BaM?)j&=Ck)_SKf5B-frJ9JNi1lxI-&BzxQMr_x1CwJLTn! znHm1Q;4Q4IJZLa&H-0QUu2M%q%?YFM+2y5c^U_Ua{?ENTfqj_=6Wuf3`7+QyKGrq) zii(4~OS{hnKKUr|>RiFh#o_A4(c(u{i=~$|>S5W`hrzM8MeoXAOcaGaHlIFLw{v9q pdiBezd-jw)`SvSaAW}gJJg3I*HqF^3U#6WG9gVb0Q=#rFe*tz+VEX_7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png new file mode 100644 index 0000000000000000000000000000000000000000..0c9fcabad6c72f6e1dc9fd7c63ce46aeda389680 GIT binary patch literal 1356 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SeY1^I~tlfo0?h}I~f|fnmZaB8acbT zxf(h;Iy;)U8pHIu|LG`BKc8dv4z4}1M=z}5`DY9Wgz!U^x!jmqL15f;^dB7B31Wej7*A&ed7#R0> zx;TbZ+)4@F?Zq4@Fn9Mc-mI|BA1a(2O=5Pl8hU$gNLU*tB__*$karQNcMPa^Fi2WH zb!kV!!i0qiU7U=8A4KJ)r@o$-m|k2id*kfgnLCZ2&zTt!m3_#$+;i^)>1(UKg{`(t zK4k96)BpT&M55m6iQ0wTHQjSff}@rEPXB%W#rWGo&7@slJpI?_P2d)fb7cJepfSjn z@2LK&IS&KZu61Qo&;~!oPJx#{);JkIWwe`Z^&>cNW?sAWf(1Ta8U;o|3PKlL zOao@B?Q39j5MHEUV5lT1{>D0<&*Z=h2gcn^#Trpn=)GiK|8~iaWOvT|k!5SsUCHA`H>Ye_*?6j)^{Vy21qBF7o;=QJFc&%n%(%O$CK TN{?qIsC@Hu^>bP0l+XkKuWs2d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png new file mode 100644 index 0000000000000000000000000000000000000000..ee1ae76f9d99fab045e24dd403c571bc0baecf99 GIT binary patch literal 1130 zcmaJ=UuY9|96tz+MJ#M88fB$FuA8Ws`;(+e?o7QyqdO zsOsaNKY%HU3LG%X6sZN?&} zG(C*5EwXIAUT5l220244F9-t5Mc7CrOb}sr+`_6Cw%qQff&yL5F>Gug3;2p^6^-FE zO)}jm!L+wzEqAj`q+zV5+APm-eo0MWq40jFX>OriT!L@&eW$Qn9=9P|f-V|!G%~na zw;#$DWe2JlIc0=Kn_VmpBaGZ(WCL0DyOsb42MtR{b@$LZr%({{mWx$OgLx%Q6BWiV zbTJl5#DsXXwnEmLh#!_`D^zpXR#UuBWtJA;kym|24 z9{tIEHnT5u`q^)5ukQ{88797)-@Ui*^2&>!JM{~o>!=l&KmXtKbETK+-tp(;>de60 z?B(_^Q@iG=#aeRd`(y{zw(~~U+;pHn@Kg?UPK~~Nd3)C-@P~A5;fLU>8_$-nB)n5o zkL|B3)cD1fxu=uhUNQA(^;qtt#8ZD|UKex0=SP1E9av2-UinUna}S-!^&ekU*R+2- k?oi*fHM%B`e;8=zs2SFoJrg^3m{dvSv;E4o-p{^x1BM%QD*ylh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png new file mode 100644 index 0000000000000000000000000000000000000000..7e5c1709af64123d62139aeae6e56c52346768d0 GIT binary patch literal 1403 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SeY1^I~tlfTbf!JI~f|fnmZaB8acbT zxf(h;Iy;)U8pHIu@1IxR%U-k9;Og!Zf6m-| zbBS?TK7aDJuge${?k4MbnU?6-ZQAxryf|8a!{%`JpMT}9h=0^IuRq2;`S^Lm&ndEc zGdS7)Z7?{0G1IsvexKF$939qkr+f|V_RM#GzMjqJPV1AO=3yL1{iJ+N=6`)~ZIR&Y zj{<9qJ&fk+Jh0mG=i|a(y`Q6hW$xFCY?QcoQoPmRV{L$yrJqj`S9r*z`*m-pmp@PM zaWJrBnD4&ryhCyRMCuVabx9Zp72L$tNI0pQx(BZsuQ?g z?4Jc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SeY1^n^>9|yO~-TI~f|fnmZaB8acbT zxf(h;Iy;)U8pHIu}1{rUgjo>{eFVi2>01KWXuw2qJer^&ScKaq4oLWMo3S?8F`s@6+Fdo*gq zQqCRMx0jTNdvNW~m!s)ydU|Feh9cq~T^}E9l}%|>khjib-dFpZwM^-8^1}ZPJy$1G zJ@w|%5pLNi&A`OVw_P&Auh1~*@|vYehXM-X=042-P``s!gH1d({ zS*Ch{$>11=i@=N*-#LW#ZhCLPGvi#@w1>+T`I!$Vv$?rN`h|!${F(dn^o)fM8?+9~ zZ_bxUWSG?df5GVqWg&vq3QcoZxDo?G9Ot$tad_~E9N4_(ee=)#&GQ#Xefa;eye+%@ zp23+u26Yy#OnC3xsp*=!Excg`SaW7K3s0b-^I WfAf@3)&(0trH`kppUXO@geCy@d92L< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png new file mode 100644 index 0000000000000000000000000000000000000000..adf93452dd97d4d8bbe8bc46afcff03b4ad0bcf5 GIT binary patch literal 1429 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SeY1^J6k%Nnwwe}I~f|fnmZaB8acbT zxf(h;Iy;)U8pHIu~iOg`@&QYdot{dY-aOXFiMS(d!llv$koRuMH_@KY_f)i(q z#y9yD+}oA(n6}1t8&vHuy3Ly8qH^hwtCP!0!$}s)!umSS|BTsletB);v$N&z_CB9e z{jT=h_u7X~-j%VZuAj?OyH|O8^l#bn|Cfu+_s^VsF-L31hmB5b_wP>n`e&U_*|XGJ z(${CW7rty)vx(fHsr>u>(!VSGyF0hWd~A)#c{g38tSgC~De2zHyAvnun>D35XDZ9; z|A$--{N8pgcBA3K@As=+S&f-k9hCfUXzIn^3ua?h|F0h~LS z8rVKReyjGfB6_t}Popz;?)_>J18cGA>u#QV@ZnxO>vpjzm5=_J?+lw8(j36RY^buB zp~-ybS!0%Yl7}X9DhQiJBtGCixnW)2n^OmZ4o3Vm_%%< z^@eY9CfU+CPk)B;T`zz0uzy2G%kpAY)+HUB8qt|v>bi4gb=Xwp%=glqQR!s&HZY~T zW!45(A?>#RD|8$dP2xRrPxQ&=S5Jf<7wa5g*!kE+@a-{wP;txP>FVdQ&MBb@0MeEV AoB#j- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png new file mode 100644 index 0000000000000000000000000000000000000000..0b69dc3ee1ece36752b50c610cdfef255e3d6306 GIT binary patch literal 1408 zcmaJ>ZA=?=9KHgjyp#>35jxSGw~V-??cKGdr8hcOdPSP7rIbckGLfTqg^sm%UJqI@ zLnw^lURW2+bcs=niC@G?ri(7qm5my<(Uh5JbfR%Oj4@*ZV^Pe|^U5gm!|;;3|4W|d z`Mo{4R~+_d^K!Q20059@t-+nbnxA~LGKKHfC7uu#IcI6)>S+%bBv=YCk#q|MT75(- z<)jF*>&2^71puU%dR>iNqiql7rhO_RiBW}ojKBtfipmf}xZ5cXY@u4cej_x0Aqs(B z(g-z_*$^9JrrNwU-7Hn#ZFjl5+ua5ds@w%ugfKzCM{xug@*VI8u#gd2)y0H;@*0M~ zRS4H^gdQZ-XmfyOnx()pl}_nKHRYh*phC+G7^_jpG;$hJ(SNDyUJ>Y%7c!3O4 zj}#8Lx)=&}QUSVybqj;@Y)gh>Ff&UL9L>6D`ar6Sjy9U318p<|n$5|s>A`0jynd1n z26n7+Y&Oj54{(IvO<8dxB&evoUJ}!)^*VzZHk{jnzwILT4 zl7W-M{m-ydSAv6*+jZ*-hjsH)e!=mqVC~KCSOx$uSg7hz4yeSf6~!G=JUJTGrieOGE*sO`)G7tQ*m%n z9v2%n{Sf*1-6PVxO`p^$n)gO~j01}&jy}zQRx+U{mMK;<}ML(PQ$A`LmkX%FuFjSVUya41Xgfo;uIh_cf8_ zIkL#)W5>Z6@n7Fw`f_>7ESsy1ESXras81>qFI4qSNk za3d}9lc@HqaaH&?(PSE8mp4pJ6W@b@+>&c!ZIz2TW71@C=#Vf Yf!mqIm(>^YE+zkoR*M}!Q`H>)7o^Vg&;S4c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png new file mode 100644 index 0000000000000000000000000000000000000000..0b3dfd51bf95fe833caabeba20613871e34b5545 GIT binary patch literal 1464 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk*h0bFQqR!T z(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAddqG{Q6U zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SeY1^J6k%NI+;G@P*wZA={r?e{e(DeB3D5iM zH>Sr)+1%RGIc=Tc&wjB{&!vY2I-g~K&S%{_X=%{o>({0~Fsd}{OG?*$b1r{@;f}{e z?QN~sST=CU$cd-i++&`8;hn^kZHkk-Ij!1HU+;J1y!h1iH~TZsH^R@_KhM}}>z?^7 z_T2VO2QHc)4bf$*zvFO!cGZV+m!`-Z@1%u#irm4Mr%FV;;-7w+>6gQk<+AaGFP-jO zoXsg1p`L1_a3I@WogwCo|A7TA(>W(RySw&b@E6aUo?EPcyH{+uRddRvU&E(im;Ji8 zkIrpZo6)vek;zwO_LZNDGFNnSGe~L``v+FsaG2~7*?&!RBEuI4+eIvgMLHG;c6R19 zaICRreySUAXy>Y;mH($V6-No|vWs_o$(N<{w9t?@WI_hlG%I)hP0y}A` zAUw+>L{Evi*W9PE*SK?us#Wrn;A?De)n0jgoOVKEOW0p;N9m_OcNyQ^+xtTD{1aFG z_8AQhyQjS9T(W>~vYhERyY&;@UHxw?&@Awf5Bd<#ky4ejX2u`YEjv`aB9|Jd%3XRM goUWh!=Z|OtgO951S{DCSF;H3R>FVdQ&MBb@00F}zUjP6A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png new file mode 100644 index 0000000000000000000000000000000000000000..a72e41b917e77f4915a77c4864e7eb16680808c3 GIT binary patch literal 1425 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 Cbv9T4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/extratrees/textures/items/misc/hops.png b/src/main/resources/assets/extratrees/textures/items/hops.png similarity index 100% rename from src/main/resources/assets/extratrees/textures/items/misc/hops.png rename to src/main/resources/assets/extratrees/textures/items/hops.png