diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index b948834e6..b620e46e8 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -19,9 +19,9 @@ public class BOPBlocks public static Block white_sand; public static Block white_sandstone; - public static Block smooth_white_sandstone; public static Block cut_white_sandstone; public static Block chiseled_white_sandstone; + public static Block smooth_white_sandstone; public static Block white_sandstone_slab; public static Block white_sandstone_stairs; diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java index e249faa01..b63052495 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -13,10 +13,11 @@ public class BOPItems { public static Item bop_icon; - public static Item fleshchunk; public static Item mudball; - public static Item ash; public static Item mud_brick; + + public static Item pile_of_ashes; + public static Item chunk_of_flesh; public static Item fir_boat; public static Item redwood_boat; diff --git a/src/main/java/biomesoplenty/common/block/BlockAsh.java b/src/main/java/biomesoplenty/common/block/BlockAsh.java index c4b2bb6f6..c5ed5b1c0 100644 --- a/src/main/java/biomesoplenty/common/block/BlockAsh.java +++ b/src/main/java/biomesoplenty/common/block/BlockAsh.java @@ -42,7 +42,7 @@ public class BlockAsh extends Block @Override public IItemProvider getItemDropped(IBlockState state, World worldIn, BlockPos pos, int fortune) { - return BOPItems.ash; + return BOPItems.pile_of_ashes; } @Override diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index b31e098e9..1b85ff1be 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -44,9 +44,9 @@ public class ModBlocks { 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"); - smooth_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "smooth_white_sandstone"); chiseled_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "chiseled_white_sandstone"); cut_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(0.8F)), "cut_white_sandstone"); + smooth_white_sandstone = registerBlock(new Block(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "smooth_white_sandstone"); white_sandstone_slab = registerBlock(new BlockSlab(Block.Builder.create(Material.ROCK, MapColor.QUARTZ).hardnessAndResistance(2.0F, 6.0F)), "white_sandstone_slab"); white_sandstone_stairs = registerBlock(new BlockStairs(white_sandstone.getDefaultState(), Block.Builder.from(white_sandstone)), "white_sandstone_stairs"); @@ -68,7 +68,7 @@ public class ModBlocks orange_autumn_leaves = registerBlock(new BlockLeavesBOP(Block.Builder.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)), "orange_autumn_leaves"); //maple_sapling maple_leaves = registerBlock(new BlockLeavesBOP(Block.Builder.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)), "maple_leaves"); - + //fir_sapling fir_leaves = registerBlock(new BlockLeavesBOP(Block.Builder.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)), "fir_leaves"); fir_log = registerBlock(new BlockLog(MapColor.WOOD, Block.Builder.create(Material.WOOD, MapColor.OBSIDIAN).hardnessAndResistance(2.0F).sound(SoundType.WOOD)), "fir_log"); diff --git a/src/main/java/biomesoplenty/init/ModItems.java b/src/main/java/biomesoplenty/init/ModItems.java index 65a973a15..5ca98c099 100644 --- a/src/main/java/biomesoplenty/init/ModItems.java +++ b/src/main/java/biomesoplenty/init/ModItems.java @@ -22,8 +22,8 @@ public class ModItems // TODO: This should be ItemMudball mudball = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "mudball"); mud_brick = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "mud_brick"); - ash = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "ash"); - fleshchunk = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "fleshchunk"); + pile_of_ashes = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "pile_of_ashes"); + chunk_of_flesh = registerItem(new Item(new Item.Builder().group(ItemGroupBOP.instance)), "chunk_of_flesh"); record_wanderer = registerItem(new ItemBOPRecord(BOPSounds.records_wanderer), "record_wanderer"); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_us.json b/src/main/resources/assets/biomesoplenty/lang/en_us.json index 81b692018..95aca2619 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_us.json +++ b/src/main/resources/assets/biomesoplenty/lang/en_us.json @@ -22,12 +22,11 @@ "effect.biomesoplenty.curse": "Curse", - "item.biomesoplenty.ash": "Pile of Ashes", "item.biomesoplenty.bop_icon": "BOP Icon", "item.biomesoplenty.cherry_boat": "Cherry Boat", + "item.biomesoplenty.chunk_of_flesh": "Chunk of Flesh", "item.biomesoplenty.ethereal_boat": "Ethereal Boat", "item.biomesoplenty.fir_boat": "Fir Boat", - "item.biomesoplenty.fleshchunk": "Chunk of Flesh", "item.biomesoplenty.hellbark_boat": "Hellbark Boat", "item.biomesoplenty.jacaranda_boat": "Jacaranda Boat", "item.biomesoplenty.magic_boat": "Magic Boat", @@ -35,6 +34,7 @@ "item.biomesoplenty.mud_brick": "Mud Brick", "item.biomesoplenty.mudball": "Mud Ball", "item.biomesoplenty.palm_boat": "Palm Boat", + "item.biomesoplenty.pile_of_ashes": "Pile of Ashes", "item.biomesoplenty.record_wanderer": "Music Disc", "item.biomesoplenty.record_wanderer.desc": "Tim Rurkowski - Wanderer", "item.biomesoplenty.redwood_boat": "Redwood Boat", diff --git a/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json index e0fdcefa5..2130d29b0 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json +++ b/src/main/resources/assets/biomesoplenty/models/block/chiseled_white_sandstone.json @@ -1,7 +1,7 @@ { "parent": "block/cube_column", "textures": { - "end": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/chiseled_white_sandstone" + "end": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/chiseled_white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json index c89ddb1bf..aa983c0d4 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json +++ b/src/main/resources/assets/biomesoplenty/models/block/cut_white_sandstone.json @@ -1,7 +1,7 @@ { "parent": "block/cube_column", "textures": { - "end": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/cut_white_sandstone" + "end": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/cut_white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json index 9cca50b37..55ab3912e 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab.json @@ -1,8 +1,8 @@ { "parent": "block/slab", "textures": { - "bottom": "biomesoplenty:block/mud_brick_bottom", - "top": "biomesoplenty:block/mud_brick_top", - "side": "biomesoplenty:block/mud_brick_block" + "bottom": "biomesoplenty:blocks/mud_brick_block", + "top": "biomesoplenty:blocks/mud_brick_block", + "side": "biomesoplenty:blocks/mud_brick_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json index dfafc7d82..50fb163a5 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_slab_top.json @@ -1,8 +1,8 @@ { "parent": "block/slab_top", "textures": { - "bottom": "biomesoplenty:block/mud_brick_bottom", - "top": "biomesoplenty:block/mud_brick_top", - "side": "biomesoplenty:block/mud_brick_block" + "bottom": "biomesoplenty:blocks/mud_brick_block", + "top": "biomesoplenty:blocks/mud_brick_block", + "side": "biomesoplenty:blocks/mud_brick_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json index 22158f944..166655284 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "biomesoplenty:block/mud_brick_bottom", - "top": "biomesoplenty:block/mud_brick_top", - "side": "biomesoplenty:block/mud_brick_block" + "bottom": "biomesoplenty:blocks/mud_brick_block", + "top": "biomesoplenty:blocks/mud_brick_block", + "side": "biomesoplenty:blocks/mud_brick_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json index b6980070b..4345873ca 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "biomesoplenty:block/mud_brick_bottom", - "top": "biomesoplenty:block/mud_brick_top", - "side": "biomesoplenty:block/mud_brick_block" + "bottom": "biomesoplenty:blocks/mud_brick_block", + "top": "biomesoplenty:blocks/mud_brick_block", + "side": "biomesoplenty:blocks/mud_brick_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json index dc6363c70..1f5719f69 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json +++ b/src/main/resources/assets/biomesoplenty/models/block/mud_brick_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "biomesoplenty:block/mud_brick_bottom", - "top": "biomesoplenty:block/mud_brick_top", - "side": "biomesoplenty:block/mud_brick_block" + "bottom": "biomesoplenty:blocks/mud_brick_block", + "top": "biomesoplenty:blocks/mud_brick_block", + "side": "biomesoplenty:blocks/mud_brick_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json index cccdc4019..f6fa4f4c7 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json +++ b/src/main/resources/assets/biomesoplenty/models/block/smooth_white_sandstone.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:block/white_sandstone_top" + "all": "biomesoplenty:blocks/white_sandstone_top" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json index 82d9dc53c..18fff9d1c 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone.json @@ -1,8 +1,8 @@ { "parent": "block/cube_bottom_top", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_bottom", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_bottom", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json index 0dc002d62..0694ecdcf 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab.json @@ -1,8 +1,8 @@ { "parent": "block/slab", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_bottom", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_bottom", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json index aacf693da..d9e7d3728 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_slab_top.json @@ -1,8 +1,8 @@ { "parent": "block/slab_top", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_bottom", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_bottom", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json index 8c1ddc91b..21ab0a531 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_bottom", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_bottom", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json index 371a42e01..563ea132c 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_bottom", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_bottom", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json index 60811a098..cee8e17c4 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json +++ b/src/main/resources/assets/biomesoplenty/models/block/white_sandstone_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "biomesoplenty:block/white_sandstone_bottom", - "top": "biomesoplenty:block/white_sandstone_top", - "side": "biomesoplenty:block/white_sandstone" + "bottom": "biomesoplenty:blocks/white_sandstone_bottom", + "top": "biomesoplenty:blocks/white_sandstone_top", + "side": "biomesoplenty:blocks/white_sandstone" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/fleshchunk.json b/src/main/resources/assets/biomesoplenty/models/item/chunk_of_flesh.json similarity index 51% rename from src/main/resources/assets/biomesoplenty/models/item/fleshchunk.json rename to src/main/resources/assets/biomesoplenty/models/item/chunk_of_flesh.json index 469be98e0..dcced1ac9 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/fleshchunk.json +++ b/src/main/resources/assets/biomesoplenty/models/item/chunk_of_flesh.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:items/fleshchunk" + "layer0": "biomesoplenty:items/chunk_of_flesh" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json index fd207b0e7..ad7592d78 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/dead_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/dead_sapling" + "layer0": "biomesoplenty:blocks/dead_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json index 47f88efb0..14ead6a34 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/ethereal_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/ethereal_sapling" + "layer0": "biomesoplenty:blocks/ethereal_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json index 4d4cf05d3..67d98e7a1 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/fir_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/fir_sapling" + "layer0": "biomesoplenty:blocks/fir_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/flowering_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/flowering_sapling.json index b8c592b63..923430753 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/flowering_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/flowering_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/flowering_sapling" + "layer0": "biomesoplenty:blocks/flowering_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json index 6037cc1bd..c8973cc47 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/hellbark_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/hellbark_sapling" + "layer0": "biomesoplenty:blocks/hellbark_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json index 636110a94..65c117a55 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/jacaranda_sapling" + "layer0": "biomesoplenty:blocks/jacaranda_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json index 7405e1c45..56ccaa96c 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/magic_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/magic_sapling" + "layer0": "biomesoplenty:blocks/magic_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json index d2ae14425..d1138c203 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/mahogany_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/mahogany_sapling" + "layer0": "biomesoplenty:blocks/mahogany_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json index a191fa800..27b410a20 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/maple_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/maple_sapling" + "layer0": "biomesoplenty:blocks/maple_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json index e2c6a8269..e6145ce15 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_autumn_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/orange_autumn_sapling" + "layer0": "biomesoplenty:blocks/orange_autumn_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json index 5a16d875b..9e9864773 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/origin_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/origin_sapling" + "layer0": "biomesoplenty:blocks/origin_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json index 7a7cf672b..af7c05419 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/palm_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/palm_sapling" + "layer0": "biomesoplenty:blocks/palm_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/ash.json b/src/main/resources/assets/biomesoplenty/models/item/pile_of_ashes.json similarity index 52% rename from src/main/resources/assets/biomesoplenty/models/item/ash.json rename to src/main/resources/assets/biomesoplenty/models/item/pile_of_ashes.json index 7809220a4..c656849d1 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/ash.json +++ b/src/main/resources/assets/biomesoplenty/models/item/pile_of_ashes.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:items/ash" + "layer0": "biomesoplenty:items/pile_of_ashes" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json index dba768cc2..c14f6d4b0 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/pink_cherry_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/pink_cherry_sapling" + "layer0": "biomesoplenty:blocks/pink_cherry_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json index 3f564e5e2..3c0385e7f 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/redwood_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/redwood_sapling" + "layer0": "biomesoplenty:blocks/redwood_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json index 52fd3e6a3..98e146636 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/umbran_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/umbran_sapling" + "layer0": "biomesoplenty:blocks/umbran_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json index a45f1b60e..f76a25433 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/white_cherry_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/white_cherry_sapling" + "layer0": "biomesoplenty:blocks/white_cherry_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json index a76e53dab..18b3460a3 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/willow_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/willow_sapling" + "layer0": "biomesoplenty:blocks/willow_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json index 8e63c69bb..cb93799c9 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json +++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_autumn_sapling.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/yellow_autumn_sapling" + "layer0": "biomesoplenty:blocks/yellow_autumn_sapling" } } diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png index 40d9b34cc..d0958b1c4 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png index 6eaa85386..9fbe53781 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_trapdoor.png new file mode 100644 index 000000000..afd0224f6 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log.png new file mode 100644 index 000000000..0efa4f209 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log_top.png new file mode 100644 index 000000000..f47529a71 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_dead_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log.png new file mode 100644 index 000000000..383b45ca8 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log_top.png new file mode 100644 index 000000000..a62f240df Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/stripped_hellbark_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png b/src/main/resources/assets/biomesoplenty/textures/items/chunk_of_flesh.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png rename to src/main/resources/assets/biomesoplenty/textures/items/chunk_of_flesh.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ash.png b/src/main/resources/assets/biomesoplenty/textures/items/pile_of_ashes.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/ash.png rename to src/main/resources/assets/biomesoplenty/textures/items/pile_of_ashes.png