From 088195c315e04bb5dcfc57a44545a35770766356 Mon Sep 17 00:00:00 2001 From: Forstride Date: Sat, 12 Jan 2019 15:49:17 -0500 Subject: [PATCH] Started adding grass/dirt blocks, fixed some recipes --- .../biomesoplenty/api/block/BOPBlocks.java | 38 ++++++++--- .../common/block/BlockDoublePlantBOP.java | 60 ++++++++++++++++++ .../common/block/BlockFlatPlantBOP.java | 26 ++++++++ .../common/block/BlockGrassBOP.java | 19 ++++++ .../common/block/BlockPlantBOP.java | 6 ++ .../java/biomesoplenty/init/ModBlocks.java | 39 ++++++++++-- .../blockstates/coarse_loamy_dirt.json | 5 ++ .../blockstates/coarse_sandy_dirt.json | 5 ++ .../blockstates/coarse_silty_dirt.json | 5 ++ .../biomesoplenty/blockstates/loamy_dirt.json | 10 +++ .../blockstates/loamy_farmland.json | 12 ++++ .../blockstates/loamy_grass_block.json | 11 ++++ .../blockstates/loamy_grass_path.json | 5 ++ .../blockstates/origin_grass_block.json | 11 ++++ .../biomesoplenty/blockstates/sandy_dirt.json | 10 +++ .../blockstates/sandy_farmland.json | 12 ++++ .../blockstates/sandy_grass_block.json | 11 ++++ .../blockstates/sandy_grass_path.json | 5 ++ .../biomesoplenty/blockstates/silty_dirt.json | 10 +++ .../blockstates/silty_farmland.json | 12 ++++ .../blockstates/silty_grass_block.json | 11 ++++ .../blockstates/silty_grass_path.json | 5 ++ .../blockstates/tall_cattail.json | 6 ++ .../assets/biomesoplenty/lang/en_us.json | 21 +++++- .../models/block/coarse_loamy_dirt.json | 6 ++ .../models/block/coarse_sandy_dirt.json | 6 ++ .../models/block/coarse_silty_dirt.json | 6 ++ .../models/block/loamy_dirt.json | 6 ++ .../models/block/loamy_farmland.json | 8 +++ .../models/block/loamy_farmland_moist.json | 8 +++ .../models/block/loamy_grass_block.json | 31 +++++++++ .../models/block/loamy_grass_block_snow.json | 9 +++ .../models/block/loamy_grass_path.json | 21 ++++++ .../models/block/origin_grass_block.json | 21 ++++++ .../models/block/origin_grass_block_snow.json | 9 +++ .../models/block/sandy_dirt.json | 6 ++ .../models/block/sandy_farmland.json | 8 +++ .../models/block/sandy_farmland_moist.json | 8 +++ .../models/block/sandy_grass_block.json | 31 +++++++++ .../models/block/sandy_grass_block_snow.json | 9 +++ .../models/block/sandy_grass_path.json | 21 ++++++ .../models/block/silty_dirt.json | 6 ++ .../models/block/silty_farmland.json | 8 +++ .../models/block/silty_farmland_moist.json | 8 +++ .../models/block/silty_grass_block.json | 31 +++++++++ .../models/block/silty_grass_block_snow.json | 9 +++ .../models/block/silty_grass_path.json | 21 ++++++ .../models/block/tall_cattail_bottom.json | 6 ++ .../models/block/tall_cattail_top.json | 6 ++ .../models/item/coarse_loamy_dirt.json | 3 + .../models/item/coarse_sandy_dirt.json | 3 + .../models/item/coarse_silty_dirt.json | 3 + .../biomesoplenty/models/item/loamy_dirt.json | 3 + .../models/item/loamy_farmland.json | 3 + .../models/item/loamy_grass_block.json | 3 + .../models/item/loamy_grass_path.json | 3 + .../models/item/origin_grass_block.json | 3 + .../biomesoplenty/models/item/sandy_dirt.json | 3 + .../models/item/sandy_farmland.json | 3 + .../models/item/sandy_grass_block.json | 3 + .../models/item/sandy_grass_path.json | 3 + .../biomesoplenty/models/item/silty_dirt.json | 3 + .../models/item/silty_farmland.json | 3 + .../models/item/silty_grass_block.json | 3 + .../models/item/silty_grass_path.json | 3 + .../models/item/tall_cattail.json | 15 +---- .../biomesoplenty/recipes/ash_block.json | 5 +- .../recipes/chiseled_white_sandstone.json | 8 +-- .../recipes/coarse_loamy_dirt.json | 22 +++---- .../recipes/coarse_sandy_dirt.json | 22 +++---- .../recipes/coarse_silty_dirt.json | 22 +++---- .../recipes/cut_white_sandstone.json | 16 +++++ .../recipes/cyan_dye_from_glowflower.json | 8 +-- .../biomesoplenty/recipes/flesh_block.json | 5 +- .../recipes/gray_dye_from_ash.json | 7 +- .../recipes/gray_dye_from_wilted_lily.json | 8 +-- .../recipes/grey_dye_from_deathbloom.json | 8 +-- .../light_blue_dye_from_blue_hydrangea.json | 8 +-- .../recipes/light_blue_dye_from_flax.json | 14 ---- .../recipes/magenta_dye_from_wildflower.json | 8 +-- .../assets/biomesoplenty/recipes/mud.json | 3 +- .../biomesoplenty/recipes/mud_bricks.json | 3 +- .../recipes/mud_bricks_slab.json | 8 +-- .../recipes/mud_bricks_stairs.json | 6 +- .../orange_dye_from_burning_blossom.json | 8 +-- .../orange_dye_from_orange_cosmos.json | 8 +-- .../recipes/pink_dye_from_pink_daffodil.json | 8 +-- .../recipes/pink_dye_from_pink_hibiscus.json | 8 +-- .../recipes/purple_dye_from_lavender.json | 8 +-- .../recipes/purple_dye_from_violet.json | 8 +-- .../recipes/red_dye_from_rose.json | 8 +-- .../recipes/smooth_white_sandstone.json | 18 ------ .../recipes/white_sandstone.json | 8 +-- .../recipes/white_sandstone_slab.json | 22 ++++--- .../recipes/white_sandstone_stairs.json | 24 ++++--- .../recipes/yellow_dye_from_goldenrod.json | 8 +-- ...e_dirt_loamy.png => coarse_loamy_dirt.png} | Bin ...e_dirt_sandy.png => coarse_sandy_dirt.png} | Bin ...e_dirt_silty.png => coarse_silty_dirt.png} | Bin .../textures/blocks/flax_flowers.png | Bin 567 -> 0 bytes .../textures/blocks/flax_lower.png | Bin 550 -> 0 bytes .../textures/blocks/flax_upper.png | Bin 487 -> 0 bytes .../textures/blocks/grass_side_overlay.png | Bin 219 -> 0 bytes .../textures/blocks/grass_top.png | Bin 560 -> 0 bytes .../blocks/{dirt_loamy.png => loamy_dirt.png} | Bin ...d_dry_loamy.png => loamy_farmland_dry.png} | Bin ...ist_loamy.png => loamy_farmland_moist.png} | Bin ...my_side.png => loamy_grass_block_side.png} | Bin ..._snowed.png => loamy_grass_block_snow.png} | Bin ...ath_side.png => loamy_grass_path_side.png} | Bin ...n_side.png => origin_grass_block_side.png} | Bin ...snowed.png => origin_grass_block_snow.png} | Bin ...gin_top.png => origin_grass_block_top.png} | Bin ...owed.png => overgrown_stone_side_snow.png} | Bin .../blocks/{dirt_sandy.png => sandy_dirt.png} | Bin ...d_dry_sandy.png => sandy_farmland_dry.png} | Bin ...ist_sandy.png => sandy_farmland_moist.png} | Bin ...dy_side.png => sandy_grass_block_side.png} | Bin ..._snowed.png => sandy_grass_block_snow.png} | Bin ...ath_side.png => sandy_grass_path_side.png} | Bin .../blocks/{dirt_silty.png => silty_dirt.png} | Bin ...d_dry_silty.png => silty_farmland_dry.png} | Bin ...ist_silty.png => silty_farmland_moist.png} | Bin ...ty_side.png => silty_grass_block_side.png} | Bin ..._snowed.png => silty_grass_block_snow.png} | Bin ...ath_side.png => silty_grass_path_side.png} | Bin ...tail_lower.png => tall_cattail_bottom.png} | Bin ...cattail_upper.png => tall_cattail_top.png} | Bin .../biomesoplenty/textures/items/flax.png | Bin 571 -> 0 bytes 129 files changed, 826 insertions(+), 218 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/block/BlockDoublePlantBOP.java create mode 100644 src/main/java/biomesoplenty/common/block/BlockFlatPlantBOP.java create mode 100644 src/main/java/biomesoplenty/common/block/BlockGrassBOP.java create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/coarse_loamy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/coarse_sandy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/coarse_silty_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/loamy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/loamy_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/sandy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/sandy_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/silty_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/silty_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/silty_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/silty_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/blockstates/tall_cattail.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/coarse_loamy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/coarse_sandy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/coarse_silty_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/loamy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/loamy_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/loamy_farmland_moist.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block_snow.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/loamy_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/origin_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sandy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sandy_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sandy_farmland_moist.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block_snow.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/sandy_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/silty_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/silty_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/silty_farmland_moist.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/silty_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/silty_grass_block_snow.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/silty_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/coarse_loamy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/coarse_sandy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/coarse_silty_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/loamy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/loamy_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/loamy_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/loamy_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/origin_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/sandy_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/sandy_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/sandy_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/sandy_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/silty_dirt.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/silty_farmland.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/silty_grass_block.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/silty_grass_path.json create mode 100644 src/main/resources/assets/biomesoplenty/recipes/cut_white_sandstone.json delete mode 100644 src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_flax.json delete mode 100644 src/main/resources/assets/biomesoplenty/recipes/smooth_white_sandstone.json rename src/main/resources/assets/biomesoplenty/textures/blocks/{coarse_dirt_loamy.png => coarse_loamy_dirt.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{coarse_dirt_sandy.png => coarse_sandy_dirt.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{coarse_dirt_silty.png => coarse_silty_dirt.png} (100%) delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flax_upper.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png rename src/main/resources/assets/biomesoplenty/textures/blocks/{dirt_loamy.png => loamy_dirt.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{farmland_dry_loamy.png => loamy_farmland_dry.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{farmland_moist_loamy.png => loamy_farmland_moist.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_loamy_side.png => loamy_grass_block_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_loamy_side_snowed.png => loamy_grass_block_snow.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_loamy_path_side.png => loamy_grass_path_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_origin_side.png => origin_grass_block_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_origin_side_snowed.png => origin_grass_block_snow.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_origin_top.png => origin_grass_block_top.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{overgrown_stone_side_snowed.png => overgrown_stone_side_snow.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{dirt_sandy.png => sandy_dirt.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{farmland_dry_sandy.png => sandy_farmland_dry.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{farmland_moist_sandy.png => sandy_farmland_moist.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_sandy_side.png => sandy_grass_block_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_sandy_side_snowed.png => sandy_grass_block_snow.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_sandy_path_side.png => sandy_grass_path_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{dirt_silty.png => silty_dirt.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{farmland_dry_silty.png => silty_farmland_dry.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{farmland_moist_silty.png => silty_farmland_moist.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_silty_side.png => silty_grass_block_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_silty_side_snowed.png => silty_grass_block_snow.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{grass_silty_path_side.png => silty_grass_path_side.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{tall_cattail_lower.png => tall_cattail_bottom.png} (100%) rename src/main/resources/assets/biomesoplenty/textures/blocks/{tall_cattail_upper.png => tall_cattail_top.png} (100%) delete mode 100644 src/main/resources/assets/biomesoplenty/textures/items/flax.png diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 6f577b049..8cc801430 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -11,11 +11,30 @@ import net.minecraft.block.Block; public class BOPBlocks { - //public static Block grass; - //public static Block dirt; - //public static Block grass_path; - //public static Block farmland_0; - //public static Block farmland_1; + public static Block origin_grass_block; + + public static Block loamy_grass_block; + public static Block loamy_dirt; + public static Block coarse_loamy_dirt; + public static Block loamy_grass_path; + public static Block loamy_farmland; + + public static Block sandy_grass_block; + public static Block sandy_dirt; + public static Block coarse_sandy_dirt; + public static Block sandy_grass_path; + public static Block sandy_farmland; + + public static Block silty_grass_block; + public static Block silty_dirt; + public static Block coarse_silty_dirt; + public static Block silty_grass_path; + public static Block silty_farmland; + + //public static Block overgrown_stone; + //public static Block overgrown_netherrack; + //public static Block mycelial_netherrack; + //public static Block spectral_moss; public static Block white_sand; public static Block white_sandstone; @@ -31,12 +50,9 @@ public class BOPBlocks public static Block mud_brick_stairs; public static Block dried_sand; - public static Block ash_block; public static Block flesh; - public static Block blue_fire; - public static Block origin_sapling; public static Block origin_leaves; public static Block flowering_sapling; @@ -271,18 +287,20 @@ public class BOPBlocks public static Block thorn; public static Block tiny_cactus; public static Block cattail; + public static Block tall_cattail; public static Block root; public static Block reed; public static Block watergrass; - //public static Block flat_plant; - //public static Block double_plant; + public static Block dead_leaf_pile; public static Block toadstool; public static Block glowshroom; //public static Block bramble_plant; + //public static Block blue_fire; + //public static Block blood; //public static Block hot_spring_water; } diff --git a/src/main/java/biomesoplenty/common/block/BlockDoublePlantBOP.java b/src/main/java/biomesoplenty/common/block/BlockDoublePlantBOP.java new file mode 100644 index 000000000..c9319fb10 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockDoublePlantBOP.java @@ -0,0 +1,60 @@ +/******************************************************************************* + * Copyright 2014-2019, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ +package biomesoplenty.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.ItemStack; +import net.minecraft.state.EnumProperty; +import net.minecraft.state.properties.DoubleBlockHalf; +import net.minecraft.util.IItemProvider; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockDoublePlantBOP extends BlockDoublePlant +{ + public static final EnumProperty field_208063_b = BlockDoublePlant.HALF; + private final Block field_196392_b; + + public BlockDoublePlantBOP(Block p_i48335_1_, Block.Builder properties) + { + super(properties); + this.field_196392_b = p_i48335_1_; + } + + public boolean isReplaceable(IBlockState state, BlockItemUseContext useContext) { + boolean flag = super.isReplaceable(state, useContext); + return flag && useContext.getItem().getItem() == this.asItem() ? false : flag; + } + + protected void harvest(IBlockState p_196391_1_, World p_196391_2_, BlockPos p_196391_3_, ItemStack p_196391_4_) { + { + super.harvest(p_196391_1_, p_196391_2_, p_196391_3_, p_196391_4_); + } + + } + + public IItemProvider getItemDropped(IBlockState state, World worldIn, BlockPos pos, int fortune) { + return state.get(field_208063_b) == DoubleBlockHalf.LOWER && this == Blocks.TALL_GRASS && worldIn.rand.nextInt(8) == 0 ? Items.WHEAT_SEEDS : Items.AIR; + } + + public boolean isShearable(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos) { + return false; + } + + public java.util.List onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) { + world.setBlockState(pos, Blocks.AIR.getDefaultState(), 11); + return java.util.Arrays.asList(new ItemStack(this.field_196392_b, 2)); + } +} diff --git a/src/main/java/biomesoplenty/common/block/BlockFlatPlantBOP.java b/src/main/java/biomesoplenty/common/block/BlockFlatPlantBOP.java new file mode 100644 index 000000000..fe9188e94 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockFlatPlantBOP.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright 2014-2019, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ +package biomesoplenty.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; +import net.minecraft.block.material.Material; + +public class BlockFlatPlantBOP extends BlockBush +{ + public BlockFlatPlantBOP(Block.Builder properties) + { + super(properties); + } + + @Override + public Block.EnumOffsetType getOffsetType() + { + return Block.EnumOffsetType.NONE; + } +} diff --git a/src/main/java/biomesoplenty/common/block/BlockGrassBOP.java b/src/main/java/biomesoplenty/common/block/BlockGrassBOP.java new file mode 100644 index 000000000..0a5f713c0 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockGrassBOP.java @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright 2014-2019, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ +package biomesoplenty.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockGrass; + +public class BlockGrassBOP extends BlockGrass +{ + public BlockGrassBOP(Block.Builder properties) + { + super(properties); + } +} diff --git a/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java b/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java index 99b3173ff..bd6d366e0 100644 --- a/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java +++ b/src/main/java/biomesoplenty/common/block/BlockPlantBOP.java @@ -17,4 +17,10 @@ public class BlockPlantBOP extends BlockBush { super(properties); } + + @Override + public Block.EnumOffsetType getOffsetType() + { + return Block.EnumOffsetType.XZ; + } } diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index b8ba224a1..76014537a 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -10,9 +10,12 @@ package biomesoplenty.init; import static biomesoplenty.api.block.BOPBlocks.*; import biomesoplenty.common.block.BlockAsh; +import biomesoplenty.common.block.BlockDoublePlantBOP; +import biomesoplenty.common.block.BlockFlatPlantBOP; import biomesoplenty.common.block.BlockFlesh; import biomesoplenty.common.block.BlockFlowerBOP; import biomesoplenty.common.block.BlockFoliageBOP; +import biomesoplenty.common.block.BlockGrassBOP; import biomesoplenty.common.block.BlockLeavesBOP; import biomesoplenty.common.block.BlockMud; import biomesoplenty.common.block.BlockMushroomBOP; @@ -21,8 +24,11 @@ import biomesoplenty.common.util.inventory.ItemGroupBOP; import net.minecraft.block.Block; import net.minecraft.block.BlockButtonWood; import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockFarmland; import net.minecraft.block.BlockFence; import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockGrass; +import net.minecraft.block.BlockGrassPath; import net.minecraft.block.Block.Builder; import net.minecraft.block.BlockLog; import net.minecraft.block.BlockPressurePlate; @@ -43,6 +49,26 @@ public class ModBlocks { public static void init() { + origin_grass_block = registerBlock(new BlockGrassBOP(Block.Builder.create(Material.GRASS).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.PLANT)), "origin_grass_block"); + + loamy_grass_block = registerBlock(new BlockGrassBOP(Block.Builder.create(Material.GRASS).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.PLANT)), "loamy_grass_block"); + loamy_dirt = registerBlock(new Block(Block.Builder.create(Material.GROUND, MapColor.DIRT).hardnessAndResistance(0.5F).sound(SoundType.GROUND)), "loamy_dirt"); + coarse_loamy_dirt = registerBlock(new Block(Block.Builder.create(Material.GROUND, MapColor.DIRT).hardnessAndResistance(0.5F).sound(SoundType.GROUND)), "coarse_loamy_dirt"); + //loamy_grass_path = registerBlock(new BlockGrassPath(Block.Builder.create(Material.GROUND).hardnessAndResistance(0.65F).sound(SoundType.PLANT)), "loamy_grass_path"); + //loamy_farmland = registerBlock(new BlockFarmland(Block.Builder.create(Material.GROUND).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.GROUND)), "loamy_farmland"); + + sandy_grass_block = registerBlock(new BlockGrassBOP(Block.Builder.create(Material.GRASS).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.PLANT)), "sandy_grass_block"); + sandy_dirt = registerBlock(new Block(Block.Builder.create(Material.GROUND, MapColor.DIRT).hardnessAndResistance(0.5F).sound(SoundType.GROUND)), "sandy_dirt"); + coarse_sandy_dirt = registerBlock(new Block(Block.Builder.create(Material.GROUND, MapColor.DIRT).hardnessAndResistance(0.5F).sound(SoundType.GROUND)), "coarse_sandy_dirt"); + //sandy_grass_path = registerBlock(new BlockGrassPath(Block.Builder.create(Material.GROUND).hardnessAndResistance(0.65F).sound(SoundType.PLANT)), "sandy_grass_path"); + //sandy_farmland = registerBlock(new BlockFarmland(Block.Builder.create(Material.GROUND).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.GROUND)), "sandy_farmland"); + + silty_grass_block = registerBlock(new BlockGrassBOP(Block.Builder.create(Material.GRASS).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.PLANT)), "silty_grass_block"); + silty_dirt = registerBlock(new Block(Block.Builder.create(Material.GROUND, MapColor.DIRT).hardnessAndResistance(0.5F).sound(SoundType.GROUND)), "silty_dirt"); + coarse_silty_dirt = registerBlock(new Block(Block.Builder.create(Material.GROUND, MapColor.DIRT).hardnessAndResistance(0.5F).sound(SoundType.GROUND)), "coarse_silty_dirt"); + //silty_grass_path = registerBlock(new BlockGrassPath(Block.Builder.create(Material.GROUND).hardnessAndResistance(0.65F).sound(SoundType.PLANT)), "silty_grass_path"); + //silty_farmland = registerBlock(new BlockFarmland(Block.Builder.create(Material.GROUND).needsRandomTick().hardnessAndResistance(0.6F).sound(SoundType.GROUND)), "silty_farmland"); + white_sand = registerBlock(new BlockSand(0xF3F1E4, Block.Builder.create(Material.SAND, MapColor.QUARTZ).hardnessAndResistance(0.5F).sound(SoundType.SAND)), "white_sand"); white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "white_sandstone"); chiseled_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "chiseled_white_sandstone"); @@ -291,13 +317,16 @@ public class ModBlocks devilweed = registerBlock(new BlockFoliageBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "devilweed"); spectral_fern = registerBlock(new BlockFoliageBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "spectral_fern"); - thorn = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "thorn"); - tiny_cactus = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tiny_cactus"); - cattail = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "cattail"); - root = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "root"); - reed = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "reed"); + thorn = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "thorn"); + tiny_cactus = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tiny_cactus"); + cattail = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "cattail"); + tall_cattail = registerBlock(new BlockDoublePlantBOP(cattail, Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "tall_cattail"); + root = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "root"); + reed = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "reed"); watergrass = registerBlock(new BlockPlantBOP(Block.Builder.create(Material.VINE).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "watergrass"); + dead_leaf_pile = registerBlock(new BlockFlatPlantBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "dead_leaf_pile"); + toadstool = registerBlock(new BlockMushroomBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT)), "toadstool"); glowshroom = registerBlock(new BlockMushroomBOP(Block.Builder.create(Material.PLANTS).doesNotBlockMovement().zeroHardnessAndResistance().sound(SoundType.PLANT).lightValue(6)), "glowshroom"); } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/coarse_loamy_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/coarse_loamy_dirt.json new file mode 100644 index 000000000..4a4a3f085 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/coarse_loamy_dirt.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/coarse_loamy_dirt" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/coarse_sandy_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/coarse_sandy_dirt.json new file mode 100644 index 000000000..6dabe6e12 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/coarse_sandy_dirt.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/coarse_sandy_dirt" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/coarse_silty_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/coarse_silty_dirt.json new file mode 100644 index 000000000..d7ecfc3f0 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/coarse_silty_dirt.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/coarse_silty_dirt" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/loamy_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/loamy_dirt.json new file mode 100644 index 000000000..a79dd6a6c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/loamy_dirt.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "biomesoplenty:block/loamy_dirt" }, + { "model": "biomesoplenty:block/loamy_dirt", "y": 90 }, + { "model": "biomesoplenty:block/loamy_dirt", "y": 180 }, + { "model": "biomesoplenty:block/loamy_dirt", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/loamy_farmland.json b/src/main/resources/assets/biomesoplenty/blockstates/loamy_farmland.json new file mode 100644 index 000000000..f27013c8d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/loamy_farmland.json @@ -0,0 +1,12 @@ +{ + "variants": { + "moisture=0": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=1": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=2": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=3": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=4": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=5": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=6": { "model": "biomesoplenty:block/loamy_farmland" }, + "moisture=7": { "model": "biomesoplenty:block/loamy_farmland_moist" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_block.json b/src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_block.json new file mode 100644 index 000000000..a3bf88f04 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_block.json @@ -0,0 +1,11 @@ +{ + "variants": { + "snowy=false": [ + { "model": "biomesoplenty:block/loamy_grass_block" }, + { "model": "biomesoplenty:block/loamy_grass_block", "y": 90 }, + { "model": "biomesoplenty:block/loamy_grass_block", "y": 180 }, + { "model": "biomesoplenty:block/loamy_grass_block", "y": 270 } + ], + "snowy=true": { "model": "biomesoplenty:block/loamy_grass_block_snow" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_path.json b/src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_path.json new file mode 100644 index 000000000..c1069faa0 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/loamy_grass_path.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/loamy_grass_path" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json b/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json new file mode 100644 index 000000000..34a44fdb7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/origin_grass_block.json @@ -0,0 +1,11 @@ +{ + "variants": { + "snowy=false": [ + { "model": "biomesoplenty:block/origin_grass_block" }, + { "model": "biomesoplenty:block/origin_grass_block", "y": 90 }, + { "model": "biomesoplenty:block/origin_grass_block", "y": 180 }, + { "model": "biomesoplenty:block/origin_grass_block", "y": 270 } + ], + "snowy=true": { "model": "biomesoplenty:block/silty_grass_block_snow" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sandy_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/sandy_dirt.json new file mode 100644 index 000000000..217da0aad --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/sandy_dirt.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "biomesoplenty:block/sandy_dirt" }, + { "model": "biomesoplenty:block/sandy_dirt", "y": 90 }, + { "model": "biomesoplenty:block/sandy_dirt", "y": 180 }, + { "model": "biomesoplenty:block/sandy_dirt", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sandy_farmland.json b/src/main/resources/assets/biomesoplenty/blockstates/sandy_farmland.json new file mode 100644 index 000000000..eadc45c8b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/sandy_farmland.json @@ -0,0 +1,12 @@ +{ + "variants": { + "moisture=0": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=1": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=2": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=3": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=4": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=5": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=6": { "model": "biomesoplenty:block/sandy_farmland" }, + "moisture=7": { "model": "biomesoplenty:block/sandy_farmland_moist" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_block.json b/src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_block.json new file mode 100644 index 000000000..072b21685 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_block.json @@ -0,0 +1,11 @@ +{ + "variants": { + "snowy=false": [ + { "model": "biomesoplenty:block/sandy_grass_block" }, + { "model": "biomesoplenty:block/sandy_grass_block", "y": 90 }, + { "model": "biomesoplenty:block/sandy_grass_block", "y": 180 }, + { "model": "biomesoplenty:block/sandy_grass_block", "y": 270 } + ], + "snowy=true": { "model": "biomesoplenty:block/sandy_grass_block_snow" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_path.json b/src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_path.json new file mode 100644 index 000000000..39aa4e7db --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/sandy_grass_path.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/sandy_grass_path" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/silty_dirt.json b/src/main/resources/assets/biomesoplenty/blockstates/silty_dirt.json new file mode 100644 index 000000000..02c6d85ae --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/silty_dirt.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "biomesoplenty:block/silty_dirt" }, + { "model": "biomesoplenty:block/silty_dirt", "y": 90 }, + { "model": "biomesoplenty:block/silty_dirt", "y": 180 }, + { "model": "biomesoplenty:block/silty_dirt", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/silty_farmland.json b/src/main/resources/assets/biomesoplenty/blockstates/silty_farmland.json new file mode 100644 index 000000000..809af62d1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/silty_farmland.json @@ -0,0 +1,12 @@ +{ + "variants": { + "moisture=0": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=1": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=2": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=3": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=4": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=5": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=6": { "model": "biomesoplenty:block/silty_farmland" }, + "moisture=7": { "model": "biomesoplenty:block/silty_farmland_moist" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/silty_grass_block.json b/src/main/resources/assets/biomesoplenty/blockstates/silty_grass_block.json new file mode 100644 index 000000000..b7b4febf4 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/silty_grass_block.json @@ -0,0 +1,11 @@ +{ + "variants": { + "snowy=false": [ + { "model": "biomesoplenty:block/silty_grass_block" }, + { "model": "biomesoplenty:block/silty_grass_block", "y": 90 }, + { "model": "biomesoplenty:block/silty_grass_block", "y": 180 }, + { "model": "biomesoplenty:block/silty_grass_block", "y": 270 } + ], + "snowy=true": { "model": "biomesoplenty:block/silty_grass_block_snow" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/silty_grass_path.json b/src/main/resources/assets/biomesoplenty/blockstates/silty_grass_path.json new file mode 100644 index 000000000..3206061a0 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/silty_grass_path.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "biomesoplenty:block/silty_grass_path" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/tall_cattail.json b/src/main/resources/assets/biomesoplenty/blockstates/tall_cattail.json new file mode 100644 index 000000000..f40b7a27b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/tall_cattail.json @@ -0,0 +1,6 @@ +{ + "variants": { + "half=lower": { "model": "biomesoplenty:block/tall_cattail_bottom" }, + "half=upper": { "model": "biomesoplenty:block/tall_cattail_top" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 2752c3d40..4ae467803 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -63,13 +63,16 @@ "block.biomesoplenty.cherry_wood": "Cherry Wood", "block.biomesoplenty.cherry_wood_slab": "Cherry Slab", "block.biomesoplenty.chiseled_white_sandstone": "Chiseled White Sandstone", + "block.biomesoplenty.coarse_loamy_dirt": "Coarse Loamy Dirt", + "block.biomesoplenty.coarse_sandy_dirt": "Coarse Sandy Dirt", + "block.biomesoplenty.coarse_silty_dirt": "Coarse Silty Dirt", "block.biomesoplenty.cut_white_sandstone": "Cut White Sandstone", - "block.biomesoplenty.dead_grass": "Dead Grass", - "block.biomesoplenty.dead_leaf_pile": "Dead Leaf Pile", "block.biomesoplenty.dead_button": "Dead Button", "block.biomesoplenty.dead_door": "Dead Door", "block.biomesoplenty.dead_fence": "Dead Fence", "block.biomesoplenty.dead_fence_gate": "Dead Fence Gate", + "block.biomesoplenty.dead_grass": "Dead Grass", + "block.biomesoplenty.dead_leaf_pile": "Dead Leaf Pile", "block.biomesoplenty.dead_leaves": "Dead Leaves", "block.biomesoplenty.dead_log": "Dead Log", "block.biomesoplenty.dead_planks": "Dead Planks", @@ -113,7 +116,6 @@ "block.biomesoplenty.fir_trapdoor": "Fir Trapdoor", "block.biomesoplenty.fir_wood": "Fir Wood", "block.biomesoplenty.fir_wood_slab": "Fir Slab", - "block.biomesoplenty.flax": "Flax", "block.biomesoplenty.flesh": "Flesh", "block.biomesoplenty.flowering_leaves": "Flowering Oak Leaves", "block.biomesoplenty.flowering_sapling": "Flowering Oak Sapling", @@ -150,6 +152,10 @@ "block.biomesoplenty.jacaranda_wood": "Jacaranda Wood", "block.biomesoplenty.jacaranda_wood_slab": "Jacaranda Slab", "block.biomesoplenty.lavender": "Lavender", + "block.biomesoplenty.loamy_dirt": "Loamy Dirt", + "block.biomesoplenty.loamy_farmland": "Loamy Farmland", + "block.biomesoplenty.loamy_grass_block": "Loamy Grass Block", + "block.biomesoplenty.loamy_grass_path": "Loamy Grass Path", "block.biomesoplenty.magic_button": "Magic Button", "block.biomesoplenty.magic_door": "Magic Door", "block.biomesoplenty.magic_fence": "Magic Fence", @@ -187,6 +193,7 @@ "block.biomesoplenty.orange_autumn_leaves": "Orange Autumn Leaves", "block.biomesoplenty.orange_autumn_sapling": "Orange Autumn Sapling", "block.biomesoplenty.orange_cosmos": "Orange Cosmos", + "block.biomesoplenty.origin_grass_block": "Origin Grass Block", "block.biomesoplenty.origin_leaves": "Origin Leaves", "block.biomesoplenty.origin_sapling": "Origin Sapling", "block.biomesoplenty.palm_button": "Palm Button", @@ -224,7 +231,15 @@ "block.biomesoplenty.reed": "Reed", "block.biomesoplenty.root": "Root", "block.biomesoplenty.rose": "Rose", + "block.biomesoplenty.sandy_dirt": "Sandy Dirt", + "block.biomesoplenty.sandy_farmland": "Sandy Farmland", + "block.biomesoplenty.sandy_grass_block": "Sandy Grass Block", + "block.biomesoplenty.sandy_grass_path": "Sandy Grass Path", "block.biomesoplenty.short_grass": "Short Grass", + "block.biomesoplenty.silty_dirt": "Silty Dirt", + "block.biomesoplenty.silty_farmland": "Silty Farmland", + "block.biomesoplenty.silty_grass_block": "Silty Grass Block", + "block.biomesoplenty.silty_grass_path": "Silty Grass Path", "block.biomesoplenty.smooth_white_sandstone": "Smooth White Sandstone", "block.biomesoplenty.spectral_fern": "Spectral Fern", "block.biomesoplenty.stripped_cherry_log": "Stripped Cherry Log", diff --git a/src/main/resources/assets/biomesoplenty/models/block/coarse_loamy_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/coarse_loamy_dirt.json new file mode 100644 index 000000000..e2bd570b9 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/coarse_loamy_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/coarse_loamy_dirt" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/coarse_sandy_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/coarse_sandy_dirt.json new file mode 100644 index 000000000..85f7aeadd --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/coarse_sandy_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/coarse_sandy_dirt" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/coarse_silty_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/coarse_silty_dirt.json new file mode 100644 index 000000000..7e07cfd87 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/coarse_silty_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/coarse_silty_dirt" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/loamy_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/loamy_dirt.json new file mode 100644 index 000000000..e1d0712a7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/loamy_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/loamy_dirt" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/loamy_farmland.json b/src/main/resources/assets/biomesoplenty/models/block/loamy_farmland.json new file mode 100644 index 000000000..7da366e95 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/loamy_farmland.json @@ -0,0 +1,8 @@ +{ + "parent": "block/template_farmland", + "textures": { + "particle": "biomesoplenty:blocks/loamy_dirt", + "dirt": "biomesoplenty:blocks/loamy_dirt", + "top": "biomesoplenty:blocks/loamy_farmland" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/loamy_farmland_moist.json b/src/main/resources/assets/biomesoplenty/models/block/loamy_farmland_moist.json new file mode 100644 index 000000000..8a3d15fe7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/loamy_farmland_moist.json @@ -0,0 +1,8 @@ +{ + "parent": "block/template_farmland", + "textures": { + "particle": "biomesoplenty:blocks/loamy_dirt", + "dirt": "biomesoplenty:blocks/loamy_dirt", + "top": "biomesoplenty:blocks/loamy_farmland_moist" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block.json b/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block.json new file mode 100644 index 000000000..c092e8f3b --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "biomesoplenty:blocks/loamy_dirt", + "bottom": "biomesoplenty:blocks/loamy_dirt", + "top": "block/grass_block_top", + "side": "biomesoplenty:blocks/loamy_grass_block_side", + "overlay": "block/grass_block_side_overlay" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block_snow.json b/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block_snow.json new file mode 100644 index 000000000..3d187d760 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_block_snow.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "particle": "biomesoplenty:blocks/loamy_dirt", + "bottom": "biomesoplenty:blocks/loamy_dirt", + "top": "block/grass_block_top", + "side": "biomesoplenty:blocks/loamy_grass_block_snow" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_path.json b/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_path.json new file mode 100644 index 000000000..f557d2f79 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/loamy_grass_path.json @@ -0,0 +1,21 @@ +{ "parent": "block/block", + "textures": { + "particle": "biomesoplenty:blocks/loamy_dirt", + "top": "block/grass_path_top", + "side": "biomesoplenty:blocks/loamy_grass_path_side", + "bottom": "biomesoplenty:blocks/loamy_dirt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block.json b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block.json new file mode 100644 index 000000000..779249e34 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block.json @@ -0,0 +1,21 @@ +{ "parent": "block/block", + "textures": { + "particle": "block/dirt", + "bottom": "block/dirt", + "top": "biomesoplenty:blocks/origin_grass_block_top", + "side": "biomesoplenty:blocks/origin_grass_block_side" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up"}, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json new file mode 100644 index 000000000..092b728ff --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/origin_grass_block_snow.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "particle": "block/dirt", + "bottom": "block/dirt", + "top": "biomesoplenty:blocks/origin_grass_block_top", + "side": "biomesoplenty:blocks/origin_grass_block_snow" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sandy_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/sandy_dirt.json new file mode 100644 index 000000000..dcb669c87 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sandy_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/sandy_dirt" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sandy_farmland.json b/src/main/resources/assets/biomesoplenty/models/block/sandy_farmland.json new file mode 100644 index 000000000..e3b66fdbd --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sandy_farmland.json @@ -0,0 +1,8 @@ +{ + "parent": "block/template_farmland", + "textures": { + "particle": "biomesoplenty:blocks/sandy_dirt", + "dirt": "biomesoplenty:blocks/sandy_dirt", + "top": "biomesoplenty:blocks/sandy_farmland" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sandy_farmland_moist.json b/src/main/resources/assets/biomesoplenty/models/block/sandy_farmland_moist.json new file mode 100644 index 000000000..4f5c188ab --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sandy_farmland_moist.json @@ -0,0 +1,8 @@ +{ + "parent": "block/template_farmland", + "textures": { + "particle": "biomesoplenty:blocks/sandy_dirt", + "dirt": "biomesoplenty:blocks/sandy_dirt", + "top": "biomesoplenty:blocks/sandy_farmland_moist" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block.json b/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block.json new file mode 100644 index 000000000..69eb46458 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "biomesoplenty:blocks/sandy_dirt", + "bottom": "biomesoplenty:blocks/sandy_dirt", + "top": "block/grass_block_top", + "side": "biomesoplenty:blocks/sandy_grass_block_side", + "overlay": "block/grass_block_side_overlay" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block_snow.json b/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block_snow.json new file mode 100644 index 000000000..1d80b1a50 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_block_snow.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "particle": "biomesoplenty:blocks/sandy_dirt", + "bottom": "biomesoplenty:blocks/sandy_dirt", + "top": "block/grass_block_top", + "side": "biomesoplenty:blocks/sandy_grass_block_snow" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_path.json b/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_path.json new file mode 100644 index 000000000..2e57ce937 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/sandy_grass_path.json @@ -0,0 +1,21 @@ +{ "parent": "block/block", + "textures": { + "particle": "biomesoplenty:blocks/sandy_dirt", + "top": "block/grass_path_top", + "side": "biomesoplenty:blocks/sandy_grass_path_side", + "bottom": "biomesoplenty:blocks/sandy_dirt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/silty_dirt.json b/src/main/resources/assets/biomesoplenty/models/block/silty_dirt.json new file mode 100644 index 000000000..5a8bc6bde --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/silty_dirt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "biomesoplenty:blocks/silty_dirt" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/silty_farmland.json b/src/main/resources/assets/biomesoplenty/models/block/silty_farmland.json new file mode 100644 index 000000000..d3665a5bc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/silty_farmland.json @@ -0,0 +1,8 @@ +{ + "parent": "block/template_farmland", + "textures": { + "particle": "biomesoplenty:blocks/silty_dirt", + "dirt": "biomesoplenty:blocks/silty_dirt", + "top": "biomesoplenty:blocks/silty_farmland" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/silty_farmland_moist.json b/src/main/resources/assets/biomesoplenty/models/block/silty_farmland_moist.json new file mode 100644 index 000000000..2c0cd8011 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/silty_farmland_moist.json @@ -0,0 +1,8 @@ +{ + "parent": "block/template_farmland", + "textures": { + "particle": "biomesoplenty:blocks/silty_dirt", + "dirt": "biomesoplenty:blocks/silty_dirt", + "top": "biomesoplenty:blocks/silty_farmland_moist" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/silty_grass_block.json b/src/main/resources/assets/biomesoplenty/models/block/silty_grass_block.json new file mode 100644 index 000000000..6120813ab --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/silty_grass_block.json @@ -0,0 +1,31 @@ +{ "parent": "block/block", + "textures": { + "particle": "biomesoplenty:blocks/silty_dirt", + "bottom": "biomesoplenty:blocks/silty_dirt", + "top": "block/grass_block_top", + "side": "biomesoplenty:blocks/silty_grass_block_side", + "overlay": "block/grass_block_side_overlay" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up", "tintindex": 0 }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" } + } + }, + { "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#overlay", "tintindex": 0, "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/silty_grass_block_snow.json b/src/main/resources/assets/biomesoplenty/models/block/silty_grass_block_snow.json new file mode 100644 index 000000000..482aa8c9d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/silty_grass_block_snow.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "particle": "biomesoplenty:blocks/silty_dirt", + "bottom": "biomesoplenty:blocks/silty_dirt", + "top": "block/grass_block_top", + "side": "biomesoplenty:blocks/silty_grass_block_snow" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/silty_grass_path.json b/src/main/resources/assets/biomesoplenty/models/block/silty_grass_path.json new file mode 100644 index 000000000..7602d5c65 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/silty_grass_path.json @@ -0,0 +1,21 @@ +{ "parent": "block/block", + "textures": { + "particle": "biomesoplenty:blocks/silty_dirt", + "top": "block/grass_path_top", + "side": "biomesoplenty:blocks/silty_grass_path_side", + "bottom": "biomesoplenty:blocks/silty_dirt" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 15, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "north" }, + "south": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "south" }, + "west": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "west" }, + "east": { "uv": [ 0, 1, 16, 16 ], "texture": "#side", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json new file mode 100644 index 000000000..703dd2b3e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/tall_cattail_bottom" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json new file mode 100644 index 000000000..94e002327 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/tall_cattail_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/tall_cattail_top" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/coarse_loamy_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/coarse_loamy_dirt.json new file mode 100644 index 000000000..672470b3f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/coarse_loamy_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/coarse_loamy_dirt" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/coarse_sandy_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/coarse_sandy_dirt.json new file mode 100644 index 000000000..e3ed4843a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/coarse_sandy_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/coarse_sandy_dirt" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/coarse_silty_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/coarse_silty_dirt.json new file mode 100644 index 000000000..e7b8ca2fe --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/coarse_silty_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/coarse_silty_dirt" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/loamy_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/loamy_dirt.json new file mode 100644 index 000000000..a61e7e6bb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/loamy_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/loamy_dirt" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/loamy_farmland.json b/src/main/resources/assets/biomesoplenty/models/item/loamy_farmland.json new file mode 100644 index 000000000..72019d493 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/loamy_farmland.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/loamy_farmland" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/loamy_grass_block.json b/src/main/resources/assets/biomesoplenty/models/item/loamy_grass_block.json new file mode 100644 index 000000000..628e51eec --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/loamy_grass_block.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/loamy_grass_block" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/loamy_grass_path.json b/src/main/resources/assets/biomesoplenty/models/item/loamy_grass_path.json new file mode 100644 index 000000000..2f9ce87cb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/loamy_grass_path.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/loamy_grass_path" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/origin_grass_block.json b/src/main/resources/assets/biomesoplenty/models/item/origin_grass_block.json new file mode 100644 index 000000000..f1bf1d499 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/origin_grass_block.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/origin_grass_block" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/sandy_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/sandy_dirt.json new file mode 100644 index 000000000..af6274830 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/sandy_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/sandy_dirt" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/sandy_farmland.json b/src/main/resources/assets/biomesoplenty/models/item/sandy_farmland.json new file mode 100644 index 000000000..de19c4a32 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/sandy_farmland.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/sandy_farmland" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/sandy_grass_block.json b/src/main/resources/assets/biomesoplenty/models/item/sandy_grass_block.json new file mode 100644 index 000000000..2ac610225 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/sandy_grass_block.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/sandy_grass_block" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/sandy_grass_path.json b/src/main/resources/assets/biomesoplenty/models/item/sandy_grass_path.json new file mode 100644 index 000000000..509ce736e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/sandy_grass_path.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/sandy_grass_path" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/silty_dirt.json b/src/main/resources/assets/biomesoplenty/models/item/silty_dirt.json new file mode 100644 index 000000000..34e011a6e --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/silty_dirt.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/silty_dirt" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/silty_farmland.json b/src/main/resources/assets/biomesoplenty/models/item/silty_farmland.json new file mode 100644 index 000000000..f25cdf37c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/silty_farmland.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/silty_farmland" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/silty_grass_block.json b/src/main/resources/assets/biomesoplenty/models/item/silty_grass_block.json new file mode 100644 index 000000000..1b0d82838 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/silty_grass_block.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/silty_grass_block" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/silty_grass_path.json b/src/main/resources/assets/biomesoplenty/models/item/silty_grass_path.json new file mode 100644 index 000000000..bff414ed2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/silty_grass_path.json @@ -0,0 +1,3 @@ +{ + "parent": "biomesoplenty:block/silty_grass_path" +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json b/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json index 5ec6c6304..9c10e0cab 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json +++ b/src/main/resources/assets/biomesoplenty/models/item/tall_cattail.json @@ -1,19 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:blocks/tall_cattail_upper" - }, - "display": { - "thirdperson": { - "rotation": [ -90, 0, 0 ], - "translation": [ 0, 1, -3 ], - "scale": [ 0.55, 0.55, 0.55 ] - }, - "firstperson": { - "rotation": [ 0, -135, 25 ], - "translation": [ 0, 4, 2 ], - "scale": [ 1.7, 1.7, 1.7 ] - } + "layer0": "biomesoplenty:blocks/tall_cattail_top" } } - diff --git a/src/main/resources/assets/biomesoplenty/recipes/ash_block.json b/src/main/resources/assets/biomesoplenty/recipes/ash_block.json index 7b0482b7e..a08450ab9 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/ash_block.json +++ b/src/main/resources/assets/biomesoplenty/recipes/ash_block.json @@ -6,11 +6,10 @@ ], "key": { "#": { - "item": "biomesoplenty:ash" + "item": "biomesoplenty:pile_of_ashes" } }, "result": { - "item": "biomesoplenty:ash_block", - "data": 0 + "item": "biomesoplenty:ash_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/chiseled_white_sandstone.json b/src/main/resources/assets/biomesoplenty/recipes/chiseled_white_sandstone.json index 4cff44440..4f439800d 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/chiseled_white_sandstone.json +++ b/src/main/resources/assets/biomesoplenty/recipes/chiseled_white_sandstone.json @@ -1,17 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "#", "#" ], "key": { "#": { - "item": "biomesoplenty:other_slab", - "data": 1 + "item": "biomesoplenty:white_sandstone_slab" } }, "result": { - "item": "biomesoplenty:white_sandstone", - "data": 1 + "item": "biomesoplenty:chiseled_white_sandstone" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/coarse_loamy_dirt.json b/src/main/resources/assets/biomesoplenty/recipes/coarse_loamy_dirt.json index b580b3dff..96cf2231e 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/coarse_loamy_dirt.json +++ b/src/main/resources/assets/biomesoplenty/recipes/coarse_loamy_dirt.json @@ -1,23 +1,19 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ - "#D", - "D#" + "DG", + "GD" ], "key": { - "#": { - "item": "minecraft:gravel", - "data": 32767 - }, "D": { - "item": "biomesoplenty:dirt", - "count": 4, - "data": 0 + "item": "biomesplenty:loamy_dirt" + }, + "G": { + "item": "minecraft:gravel" } }, "result": { - "item": "biomesoplenty:dirt", - "count": 4, - "data": 8 + "item": "biomesoplenty:coarse_loamy_dirt", + "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/coarse_sandy_dirt.json b/src/main/resources/assets/biomesoplenty/recipes/coarse_sandy_dirt.json index 4ba8bc219..9b4d6825c 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/coarse_sandy_dirt.json +++ b/src/main/resources/assets/biomesoplenty/recipes/coarse_sandy_dirt.json @@ -1,23 +1,19 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ - "#D", - "D#" + "DG", + "GD" ], "key": { - "#": { - "item": "minecraft:gravel", - "data": 32767 - }, "D": { - "item": "biomesoplenty:dirt", - "count": 4, - "data": 1 + "item": "biomesplenty:sandy_dirt" + }, + "G": { + "item": "minecraft:gravel" } }, "result": { - "item": "biomesoplenty:dirt", - "count": 4, - "data": 9 + "item": "biomesoplenty:coarse_sandy_dirt", + "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/coarse_silty_dirt.json b/src/main/resources/assets/biomesoplenty/recipes/coarse_silty_dirt.json index c8673e657..7aa68c0a7 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/coarse_silty_dirt.json +++ b/src/main/resources/assets/biomesoplenty/recipes/coarse_silty_dirt.json @@ -1,23 +1,19 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ - "#D", - "D#" + "DG", + "GD" ], "key": { - "#": { - "item": "minecraft:gravel", - "data": 32767 - }, "D": { - "item": "biomesoplenty:dirt", - "count": 4, - "data": 2 + "item": "biomesplenty:silty_dirt" + }, + "G": { + "item": "minecraft:gravel" } }, "result": { - "item": "biomesoplenty:dirt", - "count": 4, - "data": 10 + "item": "biomesoplenty:coarse_silty_dirt", + "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/cut_white_sandstone.json b/src/main/resources/assets/biomesoplenty/recipes/cut_white_sandstone.json new file mode 100644 index 000000000..93c159879 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/recipes/cut_white_sandstone.json @@ -0,0 +1,16 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "biomesoplenty:white_sandstone" + } + }, + "result": { + "item": "biomesoplenty:cut_white_sandstone", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/cyan_dye_from_glowflower.json b/src/main/resources/assets/biomesoplenty/recipes/cyan_dye_from_glowflower.json index 04edff494..aa139f616 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/cyan_dye_from_glowflower.json +++ b/src/main/resources/assets/biomesoplenty/recipes/cyan_dye_from_glowflower.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 9 + "item": "biomesoplenty:glowflower" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 6 + "item": "minecraft:cyan_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/flesh_block.json b/src/main/resources/assets/biomesoplenty/recipes/flesh_block.json index 767f1d608..483c4dd96 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/flesh_block.json +++ b/src/main/resources/assets/biomesoplenty/recipes/flesh_block.json @@ -6,11 +6,10 @@ ], "key": { "#": { - "item": "biomesoplenty:fleshchunk" + "item": "biomesoplenty:chunk_of_flesh" } }, "result": { - "item": "biomesoplenty:flesh", - "data": 0 + "item": "biomesoplenty:flesh" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_ash.json b/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_ash.json index c35f665c2..da76c46bb 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_ash.json +++ b/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_ash.json @@ -2,12 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:ash" + "item": "biomesoplenty:pile_of_ashes" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 8 + "item": "minecraft:gray_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_wilted_lily.json b/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_wilted_lily.json index 026564eaa..04dcd8056 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_wilted_lily.json +++ b/src/main/resources/assets/biomesoplenty/recipes/gray_dye_from_wilted_lily.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 11 + "item": "biomesoplenty:wilted_lily" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 8 + "item": "minecraft:gray_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/grey_dye_from_deathbloom.json b/src/main/resources/assets/biomesoplenty/recipes/grey_dye_from_deathbloom.json index 39eb5cace..5af4dadcd 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/grey_dye_from_deathbloom.json +++ b/src/main/resources/assets/biomesoplenty/recipes/grey_dye_from_deathbloom.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 10 + "item": "biomesoplenty:deathbloom" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 8 + "item": "minecraft:gray_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_blue_hydrangea.json b/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_blue_hydrangea.json index 3ae02a012..ee6050417 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_blue_hydrangea.json +++ b/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_blue_hydrangea.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 1 + "item": "biomesoplenty:blue_hydrangea" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 12 + "item": "minecraft:light_blue_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_flax.json b/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_flax.json deleted file mode 100644 index 7114916de..000000000 --- a/src/main/resources/assets/biomesoplenty/recipes/light_blue_dye_from_flax.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "biomesoplenty:double_plant", - "data": 0 - } - ], - "result": { - "item": "minecraft:dye", - "count": 2, - "data": 12 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/magenta_dye_from_wildflower.json b/src/main/resources/assets/biomesoplenty/recipes/magenta_dye_from_wildflower.json index 76df25c5c..5d1c4c721 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/magenta_dye_from_wildflower.json +++ b/src/main/resources/assets/biomesoplenty/recipes/magenta_dye_from_wildflower.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 5 + "item": "biomesoplenty:wildflower" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 13 + "item": "minecraft:magenta_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/mud.json b/src/main/resources/assets/biomesoplenty/recipes/mud.json index 1ff1a5868..98da376b7 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/mud.json +++ b/src/main/resources/assets/biomesoplenty/recipes/mud.json @@ -11,7 +11,6 @@ } }, "result": { - "item": "biomesoplenty:mud", - "data": 0 + "item": "biomesoplenty:mud" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/mud_bricks.json b/src/main/resources/assets/biomesoplenty/recipes/mud_bricks.json index 1b41d0e19..2feb26121 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/mud_bricks.json +++ b/src/main/resources/assets/biomesoplenty/recipes/mud_bricks.json @@ -10,7 +10,6 @@ } }, "result": { - "item": "biomesoplenty:mud_brick_block", - "data": 0 + "item": "biomesoplenty:mud_brick_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_slab.json b/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_slab.json index d9d2a91b5..3a1892002 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_slab.json +++ b/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_slab.json @@ -5,13 +5,11 @@ ], "key": { "#": { - "item": "biomesoplenty:mud_brick_block", - "data": 0 + "item": "biomesoplenty:mud_brick_block" } }, "result": { - "item": "biomesoplenty:other_slab", - "count": 6, - "data": 0 + "item": "biomesoplenty:mud_brick_slab", + "count": 6 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_stairs.json b/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_stairs.json index 8c4669207..0931e30a8 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_stairs.json +++ b/src/main/resources/assets/biomesoplenty/recipes/mud_bricks_stairs.json @@ -7,13 +7,11 @@ ], "key": { "#": { - "item": "biomesoplenty:mud_brick_block", - "data": 32767 + "item": "biomesoplenty:mud_brick_block" } }, "result": { "item": "biomesoplenty:mud_brick_stairs", - "count": 4, - "data": 0 + "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_burning_blossom.json b/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_burning_blossom.json index 3c8c2a8e2..f948e5e75 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_burning_blossom.json +++ b/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_burning_blossom.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 12 + "item": "biomesoplenty:burning_blossom" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 14 + "item": "minecraft:orange_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_orange_cosmos.json b/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_orange_cosmos.json index 5eac057d9..291621b64 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_orange_cosmos.json +++ b/src/main/resources/assets/biomesoplenty/recipes/orange_dye_from_orange_cosmos.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 6 + "item": "biomesoplenty:orange_cosmos" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 14 + "item": "minecraft:orange_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_daffodil.json b/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_daffodil.json index 98c48e4b3..d39c565d7 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_daffodil.json +++ b/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_daffodil.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 7 + "item": "biomesoplenty:pink_daffodil" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 9 + "item": "minecraft:pink_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_hibiscus.json b/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_hibiscus.json index abd25a779..c3d8937c4 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_hibiscus.json +++ b/src/main/resources/assets/biomesoplenty/recipes/pink_dye_from_pink_hibiscus.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 8 + "item": "biomesoplenty:pink_hibiscus" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 9 + "item": "minecraft:pink_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_lavender.json b/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_lavender.json index 7c16cd477..a90fc5492 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_lavender.json +++ b/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_lavender.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 3 + "item": "biomesoplenty:lavender" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 5 + "item": "minecraft:purple_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_violet.json b/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_violet.json index fa9bf4ba3..5e229eb3c 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_violet.json +++ b/src/main/resources/assets/biomesoplenty/recipes/purple_dye_from_violet.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 2 + "item": "biomesoplenty:violet" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 5 + "item": "minecraft:purple_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/red_dye_from_rose.json b/src/main/resources/assets/biomesoplenty/recipes/red_dye_from_rose.json index 6a8056834..108f085b0 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/red_dye_from_rose.json +++ b/src/main/resources/assets/biomesoplenty/recipes/red_dye_from_rose.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 0 + "item": "biomesoplenty:rose" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 1 + "item": "minecraft:red_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/smooth_white_sandstone.json b/src/main/resources/assets/biomesoplenty/recipes/smooth_white_sandstone.json deleted file mode 100644 index f5734214f..000000000 --- a/src/main/resources/assets/biomesoplenty/recipes/smooth_white_sandstone.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "biomesoplenty:white_sandstone", - "data": 32767 - } - }, - "result": { - "item": "biomesoplenty:white_sandstone", - "count": 4, - "data": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/white_sandstone.json b/src/main/resources/assets/biomesoplenty/recipes/white_sandstone.json index 3204bce3a..4bc07d02b 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/white_sandstone.json +++ b/src/main/resources/assets/biomesoplenty/recipes/white_sandstone.json @@ -1,17 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "##", "##" ], "key": { "#": { - "item": "biomesoplenty:white_sand", - "data": 32767 + "item": "biomesoplenty:white_sand" } }, "result": { - "item": "biomesoplenty:white_sandstone", - "data": 0 + "item": "biomesoplenty:white_sandstone" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_slab.json index db411bcb4..e3c898dfa 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_slab.json +++ b/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_slab.json @@ -1,17 +1,23 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ "###" ], "key": { - "#": { - "item": "biomesoplenty:white_sandstone", - "data": 0 - } + "#": [ + { + "item": "biomesoplenty:white_sandstone" + }, + { + "item": "biomesoplenty:chiseled_white_sandstone" + }, + { + "item": "biomesoplenty:cut_white_sandstone" + } + ] }, "result": { - "item": "biomesoplenty:other_slab", - "count": 6, - "data": 1 + "item": "biomesoplenty:white_sandstone_slab", + "count": 6 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_stairs.json index 26fec288e..a3463c1c1 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_stairs.json +++ b/src/main/resources/assets/biomesoplenty/recipes/white_sandstone_stairs.json @@ -1,19 +1,25 @@ { - "type": "minecraft:crafting_shaped", + "type": "crafting_shaped", "pattern": [ - " #", - " ##", + "# ", + "## ", "###" ], "key": { - "#": { - "item": "biomesoplenty:white_sandstone", - "data": 32767 - } + "#": [ + { + "item": "biomesoplenty:white_sandstone" + }, + { + "item": "biomesoplenty:chiseled_white_sandstone" + }, + { + "item": "biomesoplenty:cut_white_sandstone" + } + ] }, "result": { "item": "biomesoplenty:white_sandstone_stairs", - "count": 4, - "data": 0 + "count": 4 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/yellow_dye_from_goldenrod.json b/src/main/resources/assets/biomesoplenty/recipes/yellow_dye_from_goldenrod.json index 6c802d98c..abfeb6b3a 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/yellow_dye_from_goldenrod.json +++ b/src/main/resources/assets/biomesoplenty/recipes/yellow_dye_from_goldenrod.json @@ -2,13 +2,11 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "biomesoplenty:flower_0", - "data": 4 + "item": "biomesoplenty:goldenrod" } ], "result": { - "item": "minecraft:dye", - "count": 2, - "data": 11 + "item": "minecraft:yellow_dye", + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_loamy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_loamy_dirt.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_loamy.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/coarse_loamy_dirt.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_sandy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_sandy_dirt.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_sandy.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/coarse_sandy_dirt.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_silty.png b/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_silty_dirt.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_silty.png rename to src/main/resources/assets/biomesoplenty/textures/blocks/coarse_silty_dirt.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png deleted file mode 100644 index f136990328c59774a21d34d94d2b2ec9e1d4a690..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmV-70?7S|P)N2bZe?^J zG%heMGmPe!Pyhe{wMj%lR5(w4l1Xn9K@f%e4|6~WK`bGJL}Z*`Cnka*C1hbcz=b<^ zlzXJyxLL8hFEif8%VWMW)tLy1!|U!URlR=ox`QM`qtOV{>D11P#UiZN>#$m_4CFSO zO{^{AUO;1(W!BX1_hY`->xJcVX`sf*sEb98{d0-J!C(+(vso;DT>I1GoM zr8G^WPmo6fW@L9FP^t~3-v@fQ+swl|l@M?dYKcRq(+RbY+qp?#3`TN(`93oRoPm#Y z@JYJ;`9SPpr#g^sUI`MMM<$Z-pw(*GyiQR6BJtduPk-cVzT1t=N5BXuDZaV?gXc#R zGx*7V&uSgE(BM+J`Q0~((TYUm_s%3Ibl5T)jbh?iJ<;ZRSFbPf=x@%6*m1s?j{$Ha zd2i2kyItEc3>BVt{F88}0k>gd z$Pxrd<$Dst%u{;9|6p_boB+x0g~LBqyWNgCE=bcf`~e;E_^>?(v_1d;002ovPDHLk FV1k^s{*3?t diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png deleted file mode 100644 index 973b7dbdac8b9cfa08164a17d8cd7a010b0dc731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmV+>0@?kEP)N2bZe?^J zG%heMF)*zP3cvsW0i#JoK~y+TRg*`K0znK#izvbhaZc2T1wrJTL=-tJK;oR9d7gF+ zZK-gow!gm%XHu`%B{Wqwn~nPUd|v(Wc!tQ`xs*gA z;dZ;7bUGc4VWWG!p7;*PXf%?^WTMI8a46kw*B4x`*J{sZGx>Zzk(`(7_3DH3`CLF1 zy6%3zODq;syIQRZ$kah>-tBg)8YBiYnM}IrbSnLRUwx2Kn3$n;@p#-l9uH}^+ZrHg z-Aq7$HdOETJAzOX=kr-$yV-1NVzF5G3$Qx^=V^s-~i2*Alc%s zSS%_E3J~Bi!M2e^jFp+qfn2loha|zvN2bZe?^J zG%heMF)*zP3cvsW0c1%;K~y+TeN)S-!Y~w!kNT>0<#$@a2Uv>Mjk-{&im14B>p$i) zV<#pEcc5f)9&=7kQX_Oaor;C1*XtGgLbf=Lxdv!78Wl69*=)LC@NTzDF7$f64^dDQ zMW$A(kqfW^gTa7t@&~a{_W|eSa2$Jb znliz!?28CNXUF5wN_nwZSRE_Rb0)4A zoX=JRh>2OJKE dK=8wi`2%e|x9EF@#d`n%002ovPDHLkV1hxk+yejr diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png deleted file mode 100644 index fc3fa9d727b3b8d66bcedd4a3ff057b89b3b9377..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmV<103`p3P)6I!Nu zI;ORT*!P_m?)!$6l0Q)HoMTT4*LB5l9JsEFYiXJy&vTA{===VwK?=yT+?SV^zdXRi Vczl&7)+PV|002ovPDHLkV1ku5TnqpJ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png deleted file mode 100644 index eaa7e458f702c46fe6eb7d58efdd091cca089530..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmV-00?+-4P)nJC=}8J zv-|z7b5;sF3}>C>1NIICKE7TrnZl0ogeHsw8QL_1h<1j;1Rw`G(-?#g41*1YAbr1I z3xz_`jW;x6;(rg&30)#gsQADch=huFo?#Y=M1+ohGJw&JJyQf74p=Lc(Hahib;dh) znn)!~VMU*#k(iQ5kSJmZ=j495TuKTx$Ylda;GMwfzd#XMJ&L4_kkE+J1c?hnG16N( yEF4rx9#hfG{@H>z05dwG5;T%S-EWC!Q4gw0000u4^P)N2bZe?^J zG%heMGmPe!Pyhe{xk*GpR5(wiQrj!TVHnfg{57<;t0UE6Kx_Z2;PkkLGt_k3inzFX4@IwZ%5GDbp*TjNoFDv z!t~}RjQ!`B+4^FV-dTtejRO;lL9|#7V4r&ATB;Gr%w~Af^Mw_r{!@(12chZCLPB;N zi!6>yj%DrX=v=81Cc=OYhv$N5>pJ8}HHqs7)u`>u=DMgk4F*psjI$M}AIM=7VGx;Q zv;{a;cVsew`uSQF3L8_=J$%V#26qXY%M7F@xpm1*ph?uPv8vJIyhD?D50lFwAtng1 zbwdNwTqW|f$xzoM!L=GDR+=+lv|sbP(EAvy$B=$0VL;@DfdUqdF1$cz+Q-oB6Edq4 zc`MfnJ@N@}Ky{RX*;kGNoeJZNZ|E7jLFmc`ea8W8o(CqAsMmQf6B9&Iq)*}LL>TkE z^2%fu5wuK%{|V{+2_lgm5Ye+PU-hRjf~ZCWQt@wy+59_{if@9?DW*OQh;{$~002ov JPDHLkV1gpK`pEzQ