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 00000000..f7939222 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_down.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png new file mode 100644 index 00000000..e8efd9a9 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_0_up.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png new file mode 100644 index 00000000..42323469 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_down.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png new file mode 100644 index 00000000..d32a1015 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_1_up.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png new file mode 100644 index 00000000..8cb3aeff Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_down.png differ 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 00000000..f656cdde Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_2_up.png differ 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 00000000..0c9fcaba Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_down.png differ 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 00000000..ee1ae76f Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_3_up.png differ 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 00000000..7e5c1709 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_down.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png new file mode 100644 index 00000000..2b328a5a Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_4_up.png differ 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 00000000..adf93452 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_down.png differ 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 00000000..0b69dc3e Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_5_up.png differ 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 00000000..0b3dfd51 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_down.png differ 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 00000000..a72e41b9 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_6_up.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png new file mode 100644 index 00000000..7b0fbe1c Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_down.png differ diff --git a/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png new file mode 100644 index 00000000..0d0875ad Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/blocks/hops/hops_stage_7_up.png differ 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