diff --git a/src/main/resources/assets/biomesoplenty/blockstates/coral.json b/src/main/resources/assets/biomesoplenty/blockstates/coral.json deleted file mode 100644 index 1a6ac5f08..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/coral.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "variant=pink": { "model": "biomesoplenty:pink_coral" }, - "variant=orange": { "model": "biomesoplenty:orange_coral" }, - "variant=blue": { "model": "biomesoplenty:blue_coral" }, - "variant=glowing": { "model": "biomesoplenty:glowing_coral" }, - "variant=algae": { "model": "biomesoplenty:algae" } - } -} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/seaweed.json b/src/main/resources/assets/biomesoplenty/blockstates/seaweed.json deleted file mode 100644 index 20c2af6e8..000000000 --- a/src/main/resources/assets/biomesoplenty/blockstates/seaweed.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "position=single,variant=kelp": { "model": "biomesoplenty:kelp_single" }, - "position=bottom,variant=kelp": { "model": "biomesoplenty:kelp_bottom" }, - "position=middle,variant=kelp": { "model": "biomesoplenty:kelp_middle" }, - "position=top,variant=kelp": { "model": "biomesoplenty:kelp_top" } - } -} - \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 358f20ce6..2a98cf38c 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -81,185 +81,185 @@ item.redwood_door.name=Redwood Door item.umbran_door.name=Umbran Door item.willow_door.name=Willow Door -tile.ash_block.name=Ash Block -tile.blue_fire.name=Blue Fire -tile.bramble_plant.name=Bramble -tile.cherry_fence.name=Cherry Fence -tile.cherry_fence_gate.name=Cherry Fence Gate -tile.cherry_wood_slab.name=Cherry Wood Slab -tile.cherry_stairs.name=Cherry Wood Stairs -tile.coral.pink_coral.name=Pink Coral -tile.coral.orange_coral.name=Orange Coral -tile.coral.blue_coral.name=Blue Coral -tile.coral.glowing_coral.name=Glowing Coral -tile.coral.algae.name=Algae -tile.dirt.loamy_dirt.name=Loamy Dirt -tile.dirt.sandy_dirt.name=Sandy Dirt -tile.dirt.silty_dirt.name=Silty Dirt -tile.dirt.coarse_loamy_dirt.name=Coarse Loamy Dirt -tile.dirt.coarse_sandy_dirt.name=Coarse Sandy Dirt -tile.dirt.coarse_silty_dirt.name=Coarse Silty Dirt -tile.double_plant.flax.name=Flax -tile.double_plant.tall_cattail.name=Tall Cattail -tile.dried_sand.name=Dried Sand -tile.ethereal_fence.name=Ethereal Fence -tile.ethereal_fence_gate.name=Ethereal Fence Gate -tile.ethereal_wood_slab.name=Ethereal Wood Slab -tile.ethereal_stairs.name=Ethereal Wood Stairs -tile.farmland_0.loamy_farmland.name=Loamy Farmland -tile.farmland_0.sandy_farmland.name=Sandy Farmland -tile.farmland_1.silty_farmland.name=Silty Farmland -tile.fir_fence.name=Fir Fence -tile.fir_fence_gate.name=Fir Fence Gate -tile.fir_wood_slab.name=Fir Wood Slab -tile.fir_stairs.name=Fir Wood Stairs -tile.flat_plant.deadleafpile.name=Dead Leaf Pile -tile.flesh.name=Flesh -tile.flower_0.rose.name=Rose -tile.flower_0.blue_hydrangea.name=Blue Hydrangea -tile.flower_0.violet.name=Violet -tile.flower_0.lavender.name=Lavender -tile.flower_0.goldenrod.name=Goldenrod -tile.flower_0.wildflower.name=Wildflower -tile.flower_0.orange_cosmos.name=Orange Cosmos -tile.flower_0.pink_daffodil.name=Pink Daffodil -tile.flower_0.pink_hibiscus.name=Pink Hibiscus -tile.flower_0.glowflower.name=Glowflower -tile.flower_0.deathbloom.name=Deathbloom -tile.flower_0.wilted_lily.name=Wilted Lily -tile.flower_0.burning_blossom.name=Burning Blossom -tile.foliage_0.shortgrass.name=Short Grass -tile.foliage_0.bush.name=Bush -tile.foliage_0.berrybush.name=Berry Bush -tile.foliage_0.barley.name=Barley -tile.foliage_0.dunegrass.name=Dune Grass -tile.foliage_0.desertgrass.name=Desert Grass -tile.foliage_0.deadgrass.name=Dead Grass -tile.foliage_0.devilweed.name=Devilweed -tile.foliage_0.spectralfern.name=Spectral Fern -tile.grass.origin_grass_block.name=Origin Grass Block -tile.grass.loamy_grass_block.name=Loamy Grass Block -tile.grass.sandy_grass_block.name=Sandy Grass Block -tile.grass.silty_grass_block.name=Silty Grass Block -tile.grass.overgrown_stone.name=Overgrown Stone -tile.grass.overgrown_netherrack.name=Overgrown Netherrack -tile.grass.mycelial_netherrack.name=Mycelial Netherrack -tile.grass.spectral_moss.name=Spectral Moss -tile.grass_path.grass_loamy_path.name=Loamy Grass Path -tile.grass_path.grass_sandy_path.name=Sandy Grass Path -tile.grass_path.grass_silty_path.name=Silty Grass Path -tile.hellbark_fence.name=Hellbark Fence -tile.hellbark_fence_gate.name=Hellbark Fence Gate -tile.hellbark_wood_slab.name=Hellbark Wood Slab -tile.hellbark_stairs.name=Hellbark Wood Stairs -tile.ivy.name=Ivy -tile.jacaranda_fence.name=Jacaranda Fence -tile.jacaranda_fence_gate.name=Jacaranda Fence Gate -tile.jacaranda_wood_slab.name=Jacaranda Wood Slab -tile.jacaranda_stairs.name=Jacaranda Wood Stairs -tile.leaves_0.origin_leaves.name=Origin Leaves -tile.leaves_0.flowering_leaves.name=Flowering Oak Leaves -tile.leaves_0.orange_autumn_leaves.name=Orange Autumn Leaves -tile.leaves_0.yellow_autumn_leaves.name=Yellow Autumn Leaves -tile.leaves_1.fir_leaves.name=Fir Leaves -tile.leaves_1.redwood_leaves.name=Redwood Leaves -tile.leaves_1.white_cherry_leaves.name=White Cherry Leaves -tile.leaves_1.pink_cherry_leaves.name=Pink Cherry Leaves -tile.leaves_2.maple_leaves.name=Maple Leaves -tile.leaves_2.mahogany_leaves.name=Mahogany Leaves -tile.leaves_2.jacaranda_leaves.name=Jacaranda Leaves -tile.leaves_2.palm_leaves.name=Palm Leaves -tile.leaves_3.willow_leaves.name=Willow Leaves -tile.leaves_3.dead_leaves.name=Dead Leaves -tile.leaves_3.magic_leaves.name=Magic Leaves -tile.leaves_3.umbran_leaves.name=Umbran Leaves -tile.leaves_4.hellbark_leaves.name=Hellbark Leaves -tile.leaves_4.ethereal_leaves.name=Ethereal Leaves -tile.log_0.fir_log.name=Fir Wood -tile.log_0.redwood_log.name=Redwood Wood -tile.log_0.cherry_log.name=Cherry Wood -tile.log_0.mahogany_log.name=Mahogany Wood -tile.log_1.jacaranda_log.name=Jacaranda Wood -tile.log_1.palm_log.name=Palm Wood -tile.log_1.willow_log.name=Willow Wood -tile.log_1.dead_log.name=Dead Wood -tile.log_2.magic_log.name=Magic Wood -tile.log_2.umbran_log.name=Umbran Wood -tile.log_2.hellbark_log.name=Hellbark Wood -tile.log_2.ethereal_log.name=Ethereal Wood -tile.magic_fence.name=Magic Fence -tile.magic_fence_gate.name=Magic Fence Gate -tile.magic_wood_slab.name=Magic Wood Slab -tile.magic_stairs.name=Magic Wood Stairs -tile.mahogany_fence.name=Mahogany Fence -tile.mahogany_fence_gate.name=Mahogany Fence Gate -tile.mahogany_wood_slab.name=Mahogany Wood Slab -tile.mahogany_stairs.name=Mahogany Wood Stairs -tile.mud.mud.name=Mud -tile.mud_brick_block.name=Mud Bricks -tile.mud_brick_slab.name=Mud Bricks Slab -tile.mud_brick_stairs.name=Mud Bricks Stairs -tile.mushroom.toadstool.name=Toadstool -tile.mushroom.glowshroom.name=Glowshroom -tile.palm_fence.name=Palm Fence -tile.palm_fence_gate.name=Palm Fence Gate -tile.palm_wood_slab.name=Palm Wood Slab -tile.palm_stairs.name=Palm Wood Stairs -tile.planks_0.fir_planks.name=Fir Wood Planks -tile.planks_0.redwood_planks.name=Redwood Wood Planks -tile.planks_0.cherry_planks.name=Cherry Wood Planks -tile.planks_0.mahogany_planks.name=Mahogany Wood Planks -tile.planks_0.jacaranda_planks.name=Jacaranda Wood Planks -tile.planks_0.palm_planks.name=Palm Wood Planks -tile.planks_0.willow_planks.name=Willow Wood Planks -tile.planks_0.magic_planks.name=Magic Wood Planks -tile.planks_0.umbran_planks.name=Umbran Wood Planks -tile.planks_0.hellbark_planks.name=Hellbark Wood Planks -tile.planks_0.ethereal_planks.name=Ethereal Wood Planks -tile.plant_0.thorn.name=Thorns -tile.plant_0.tinycactus.name=Tiny Cactus -tile.plant_0.cattail.name=Cattail -tile.plant_0.root.name=Root -tile.plant_0.reed.name=Reed -tile.plant_0.watergrass.name=Watergrass -tile.redwood_fence.name=Redwood Fence -tile.redwood_fence_gate.name=Redwood Fence Gate -tile.redwood_wood_slab.name=Redwood Wood Slab -tile.redwood_stairs.name=Redwood Wood Stairs -tile.sapling_0.origin_sapling.name=Origin Sapling -tile.sapling_0.flowering_sapling.name=Flowering Oak Sapling -tile.sapling_0.orange_autumn_sapling.name=Orange Autumn Sapling -tile.sapling_0.yellow_autumn_sapling.name=Yellow Autumn Sapling -tile.sapling_0.fir_sapling.name=Fir Sapling -tile.sapling_0.redwood_sapling.name=Redwood Sapling -tile.sapling_0.white_cherry_sapling.name=White Cherry Sapling -tile.sapling_0.pink_cherry_sapling.name=Pink Cherry Sapling -tile.sapling_1.maple_sapling.name=Maple Sapling -tile.sapling_1.mahogany_sapling.name=Mahogany Sapling -tile.sapling_1.jacaranda_sapling.name=Jacaranda Sapling -tile.sapling_1.palm_sapling.name=Palm Sapling -tile.sapling_1.willow_sapling.name=Willow Sapling -tile.sapling_1.dead_sapling.name=Dead Sapling -tile.sapling_1.magic_sapling.name=Magic Sapling -tile.sapling_1.umbran_sapling.name=Umbran Sapling -tile.sapling_2.hellbark_sapling.name=Hellbark Sapling -tile.sapling_2.ethereal_sapling.name=Ethereal Sapling -tile.seaweed.kelp.name=Kelp -tile.umbran_fence.name=Umbran Fence -tile.umbran_fence_gate.name=Umbran Fence Gate -tile.umbran_wood_slab.name=Umbran Wood Slab -tile.umbran_stairs.name=Umbran Wood Stairs -tile.white_sand.name=White Sand -tile.white_sandstone.white_sandstone.name=White Sandstone -tile.white_sandstone.chiseled_white_sandstone.name=Chiseled White Sandstone -tile.white_sandstone.smooth_white_sandstone.name=Smooth White Sandstone -tile.white_sandstone_slab.name=White Sandstone Slab -tile.white_sandstone_stairs.name=White Sandstone Stairs -tile.willow_fence.name=Willow Fence -tile.willow_fence_gate.name=Willow Fence Gate -tile.willow_wood_slab.name=Willow Wood Slab -tile.willow_stairs.name=Willow Wood Stairs -tile.willow_vine.name=Willow Vine +block.ash_block.name=Ash Block +block.blue_fire.name=Blue Fire +block.bramble_plant.name=Bramble +block.cherry_fence.name=Cherry Fence +block.cherry_fence_gate.name=Cherry Fence Gate +block.cherry_wood_slab.name=Cherry Wood Slab +block.cherry_stairs.name=Cherry Wood Stairs +block.coral.pink_coral.name=Pink Coral +block.coral.orange_coral.name=Orange Coral +block.coral.blue_coral.name=Blue Coral +block.coral.glowing_coral.name=Glowing Coral +block.coral.algae.name=Algae +block.dirt.loamy_dirt.name=Loamy Dirt +block.dirt.sandy_dirt.name=Sandy Dirt +block.dirt.silty_dirt.name=Silty Dirt +block.dirt.coarse_loamy_dirt.name=Coarse Loamy Dirt +block.dirt.coarse_sandy_dirt.name=Coarse Sandy Dirt +block.dirt.coarse_silty_dirt.name=Coarse Silty Dirt +block.double_plant.flax.name=Flax +block.double_plant.tall_cattail.name=Tall Cattail +block.dried_sand.name=Dried Sand +block.ethereal_fence.name=Ethereal Fence +block.ethereal_fence_gate.name=Ethereal Fence Gate +block.ethereal_wood_slab.name=Ethereal Wood Slab +block.ethereal_stairs.name=Ethereal Wood Stairs +block.farmland_0.loamy_farmland.name=Loamy Farmland +block.farmland_0.sandy_farmland.name=Sandy Farmland +block.farmland_1.silty_farmland.name=Silty Farmland +block.fir_fence.name=Fir Fence +block.fir_fence_gate.name=Fir Fence Gate +block.fir_wood_slab.name=Fir Wood Slab +block.fir_stairs.name=Fir Wood Stairs +block.flat_plant.deadleafpile.name=Dead Leaf Pile +block.flesh.name=Flesh +block.flower_0.rose.name=Rose +block.flower_0.blue_hydrangea.name=Blue Hydrangea +block.flower_0.violet.name=Violet +block.flower_0.lavender.name=Lavender +block.flower_0.goldenrod.name=Goldenrod +block.flower_0.wildflower.name=Wildflower +block.flower_0.orange_cosmos.name=Orange Cosmos +block.flower_0.pink_daffodil.name=Pink Daffodil +block.flower_0.pink_hibiscus.name=Pink Hibiscus +block.flower_0.glowflower.name=Glowflower +block.flower_0.deathbloom.name=Deathbloom +block.flower_0.wilted_lily.name=Wilted Lily +block.flower_0.burning_blossom.name=Burning Blossom +block.foliage_0.shortgrass.name=Short Grass +block.foliage_0.bush.name=Bush +block.foliage_0.berrybush.name=Berry Bush +block.foliage_0.barley.name=Barley +block.foliage_0.dunegrass.name=Dune Grass +block.foliage_0.desertgrass.name=Desert Grass +block.foliage_0.deadgrass.name=Dead Grass +block.foliage_0.devilweed.name=Devilweed +block.foliage_0.spectralfern.name=Spectral Fern +block.grass.origin_grass_block.name=Origin Grass Block +block.grass.loamy_grass_block.name=Loamy Grass Block +block.grass.sandy_grass_block.name=Sandy Grass Block +block.grass.silty_grass_block.name=Silty Grass Block +block.grass.overgrown_stone.name=Overgrown Stone +block.grass.overgrown_netherrack.name=Overgrown Netherrack +block.grass.mycelial_netherrack.name=Mycelial Netherrack +block.grass.spectral_moss.name=Spectral Moss +block.grass_path.grass_loamy_path.name=Loamy Grass Path +block.grass_path.grass_sandy_path.name=Sandy Grass Path +block.grass_path.grass_silty_path.name=Silty Grass Path +block.hellbark_fence.name=Hellbark Fence +block.hellbark_fence_gate.name=Hellbark Fence Gate +block.hellbark_wood_slab.name=Hellbark Wood Slab +block.hellbark_stairs.name=Hellbark Wood Stairs +block.ivy.name=Ivy +block.jacaranda_fence.name=Jacaranda Fence +block.jacaranda_fence_gate.name=Jacaranda Fence Gate +block.jacaranda_wood_slab.name=Jacaranda Wood Slab +block.jacaranda_stairs.name=Jacaranda Wood Stairs +block.leaves_0.origin_leaves.name=Origin Leaves +block.leaves_0.flowering_leaves.name=Flowering Oak Leaves +block.leaves_0.orange_autumn_leaves.name=Orange Autumn Leaves +block.leaves_0.yellow_autumn_leaves.name=Yellow Autumn Leaves +block.leaves_1.fir_leaves.name=Fir Leaves +block.leaves_1.redwood_leaves.name=Redwood Leaves +block.leaves_1.white_cherry_leaves.name=White Cherry Leaves +block.leaves_1.pink_cherry_leaves.name=Pink Cherry Leaves +block.leaves_2.maple_leaves.name=Maple Leaves +block.leaves_2.mahogany_leaves.name=Mahogany Leaves +block.leaves_2.jacaranda_leaves.name=Jacaranda Leaves +block.leaves_2.palm_leaves.name=Palm Leaves +block.leaves_3.willow_leaves.name=Willow Leaves +block.leaves_3.dead_leaves.name=Dead Leaves +block.leaves_3.magic_leaves.name=Magic Leaves +block.leaves_3.umbran_leaves.name=Umbran Leaves +block.leaves_4.hellbark_leaves.name=Hellbark Leaves +block.leaves_4.ethereal_leaves.name=Ethereal Leaves +block.log_0.fir_log.name=Fir Wood +block.log_0.redwood_log.name=Redwood Wood +block.log_0.cherry_log.name=Cherry Wood +block.log_0.mahogany_log.name=Mahogany Wood +block.log_1.jacaranda_log.name=Jacaranda Wood +block.log_1.palm_log.name=Palm Wood +block.log_1.willow_log.name=Willow Wood +block.log_1.dead_log.name=Dead Wood +block.log_2.magic_log.name=Magic Wood +block.log_2.umbran_log.name=Umbran Wood +block.log_2.hellbark_log.name=Hellbark Wood +block.log_2.ethereal_log.name=Ethereal Wood +block.magic_fence.name=Magic Fence +block.magic_fence_gate.name=Magic Fence Gate +block.magic_wood_slab.name=Magic Wood Slab +block.magic_stairs.name=Magic Wood Stairs +block.mahogany_fence.name=Mahogany Fence +block.mahogany_fence_gate.name=Mahogany Fence Gate +block.mahogany_wood_slab.name=Mahogany Wood Slab +block.mahogany_stairs.name=Mahogany Wood Stairs +block.mud.mud.name=Mud +block.mud_brick_block.name=Mud Bricks +block.mud_brick_slab.name=Mud Bricks Slab +block.mud_brick_stairs.name=Mud Bricks Stairs +block.mushroom.toadstool.name=Toadstool +block.mushroom.glowshroom.name=Glowshroom +block.palm_fence.name=Palm Fence +block.palm_fence_gate.name=Palm Fence Gate +block.palm_wood_slab.name=Palm Wood Slab +block.palm_stairs.name=Palm Wood Stairs +block.planks_0.fir_planks.name=Fir Wood Planks +block.planks_0.redwood_planks.name=Redwood Wood Planks +block.planks_0.cherry_planks.name=Cherry Wood Planks +block.planks_0.mahogany_planks.name=Mahogany Wood Planks +block.planks_0.jacaranda_planks.name=Jacaranda Wood Planks +block.planks_0.palm_planks.name=Palm Wood Planks +block.planks_0.willow_planks.name=Willow Wood Planks +block.planks_0.magic_planks.name=Magic Wood Planks +block.planks_0.umbran_planks.name=Umbran Wood Planks +block.planks_0.hellbark_planks.name=Hellbark Wood Planks +block.planks_0.ethereal_planks.name=Ethereal Wood Planks +block.plant_0.thorn.name=Thorns +block.plant_0.tinycactus.name=Tiny Cactus +block.plant_0.cattail.name=Cattail +block.plant_0.root.name=Root +block.plant_0.reed.name=Reed +block.plant_0.watergrass.name=Watergrass +block.redwood_fence.name=Redwood Fence +block.redwood_fence_gate.name=Redwood Fence Gate +block.redwood_wood_slab.name=Redwood Wood Slab +block.redwood_stairs.name=Redwood Wood Stairs +block.sapling_0.origin_sapling.name=Origin Sapling +block.sapling_0.flowering_sapling.name=Flowering Oak Sapling +block.sapling_0.orange_autumn_sapling.name=Orange Autumn Sapling +block.sapling_0.yellow_autumn_sapling.name=Yellow Autumn Sapling +block.sapling_0.fir_sapling.name=Fir Sapling +block.sapling_0.redwood_sapling.name=Redwood Sapling +block.sapling_0.white_cherry_sapling.name=White Cherry Sapling +block.sapling_0.pink_cherry_sapling.name=Pink Cherry Sapling +block.sapling_1.maple_sapling.name=Maple Sapling +block.sapling_1.mahogany_sapling.name=Mahogany Sapling +block.sapling_1.jacaranda_sapling.name=Jacaranda Sapling +block.sapling_1.palm_sapling.name=Palm Sapling +block.sapling_1.willow_sapling.name=Willow Sapling +block.sapling_1.dead_sapling.name=Dead Sapling +block.sapling_1.magic_sapling.name=Magic Sapling +block.sapling_1.umbran_sapling.name=Umbran Sapling +block.sapling_2.hellbark_sapling.name=Hellbark Sapling +block.sapling_2.ethereal_sapling.name=Ethereal Sapling +block.seaweed.kelp.name=Kelp +block.umbran_fence.name=Umbran Fence +block.umbran_fence_gate.name=Umbran Fence Gate +block.umbran_wood_slab.name=Umbran Wood Slab +block.umbran_stairs.name=Umbran Wood Stairs +block.white_sand.name=White Sand +block.white_sandstone.white_sandstone.name=White Sandstone +block.white_sandstone.chiseled_white_sandstone.name=Chiseled White Sandstone +block.white_sandstone.smooth_white_sandstone.name=Smooth White Sandstone +block.white_sandstone_slab.name=White Sandstone Slab +block.white_sandstone_stairs.name=White Sandstone Stairs +block.willow_fence.name=Willow Fence +block.willow_fence_gate.name=Willow Fence Gate +block.willow_wood_slab.name=Willow Wood Slab +block.willow_stairs.name=Willow Wood Stairs +block.willow_vine.name=Willow Vine entity.mudball.name=Mudball entity.bop_boat.name=Boat \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/algae.json b/src/main/resources/assets/biomesoplenty/models/block/algae.json deleted file mode 100644 index 57b397a58..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/algae.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/algae" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json index c6f5ffc9b..e3304b3f7 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/ash_block.json +++ b/src/main/resources/assets/biomesoplenty/models/block/ash_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "biomesoplenty:blocks/ash_block" + "all": "biomesoplenty:block/ash_block" } } diff --git a/src/main/resources/assets/biomesoplenty/models/block/blue_coral.json b/src/main/resources/assets/biomesoplenty/models/block/blue_coral.json deleted file mode 100644 index 3538308cb..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/blue_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/blue_coral" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json b/src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json deleted file mode 100644 index c369ee78a..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/glowing_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/glowing_coral" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json deleted file mode 100644 index 790fbfa25..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/kelp_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/kelp_bottom" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json deleted file mode 100644 index e3a0be56b..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/kelp_middle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/kelp_middle" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_single.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_single.json deleted file mode 100644 index 316487d40..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/kelp_single.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/kelp_single" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/kelp_top.json b/src/main/resources/assets/biomesoplenty/models/block/kelp_top.json deleted file mode 100644 index 5070d476c..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/kelp_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/kelp_top" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/lily_flower.json b/src/main/resources/assets/biomesoplenty/models/block/lily_flower.json deleted file mode 100644 index f4df52aee..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/lily_flower.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "biomesoplenty:items/lily_flower", - "lilypad": "minecraft:blocks/waterlily", - "flower": "biomesoplenty:blocks/waterlily" - }, - "elements": [ - { "from": [ 0, 0.25, 0 ], - "to": [ 16, 0.25, 16 ], - "faces": { - "down": { "uv": [ 16, 16, 0, 0 ], "texture": "#lilypad", "tintindex": 0 }, - "up": { "uv": [ 16, 0, 0, 16 ], "texture": "#lilypad", "tintindex": 0 } - } - }, - { "from": [ 0.8, 0.25, 8 ], - "to": [ 15.2, 16.25, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#flower", "tintindex": 1 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower", "tintindex": 1 } - } - }, - { "from": [ 8, 0.25, 0.8 ], - "to": [ 8, 16.25, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower", "tintindex": 1 }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#flower", "tintindex": 1 } - } - } - ] -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json b/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json deleted file mode 100644 index 88c4370a2..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/mediumgrass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/tinted_cross", - "textures": { - "cross": "biomesoplenty:blocks/mediumgrass" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_coral.json b/src/main/resources/assets/biomesoplenty/models/block/orange_coral.json deleted file mode 100644 index 1cf377934..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/orange_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/orange_coral" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_coral.json b/src/main/resources/assets/biomesoplenty/models/block/pink_coral.json deleted file mode 100644 index 30bd0dbf4..000000000 --- a/src/main/resources/assets/biomesoplenty/models/block/pink_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "biomesoplenty:blocks/pink_coral" - } -} diff --git a/src/main/resources/assets/biomesoplenty/models/item/algae.json b/src/main/resources/assets/biomesoplenty/models/item/algae.json deleted file mode 100644 index 1aecfe96b..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/algae.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/algae" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/blue_coral.json b/src/main/resources/assets/biomesoplenty/models/item/blue_coral.json deleted file mode 100644 index 0562812fa..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/blue_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/blue_coral" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json b/src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json deleted file mode 100644 index c66dd482b..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/glowing_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/glowing_coral" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/kelp.json b/src/main/resources/assets/biomesoplenty/models/item/kelp.json deleted file mode 100644 index 60414900f..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/kelp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/kelp" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/mediumgrass.json b/src/main/resources/assets/biomesoplenty/models/item/mediumgrass.json deleted file mode 100644 index ea0badeae..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/mediumgrass.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/mediumgrass" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_coral.json b/src/main/resources/assets/biomesoplenty/models/item/orange_coral.json deleted file mode 100644 index 23e696499..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/orange_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/orange_coral" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_coral.json b/src/main/resources/assets/biomesoplenty/models/item/pink_coral.json deleted file mode 100644 index f5d96afa1..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/pink_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:blocks/pink_coral" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/white_dye.json b/src/main/resources/assets/biomesoplenty/models/item/white_dye.json deleted file mode 100644 index 9065215ab..000000000 --- a/src/main/resources/assets/biomesoplenty/models/item/white_dye.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "biomesoplenty:items/white_dye" - }, - "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 ] - } - } -} diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png b/src/main/resources/assets/biomesoplenty/textures/block/ash_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/ash_block.png rename to src/main/resources/assets/biomesoplenty/textures/block/ash_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/barley.png b/src/main/resources/assets/biomesoplenty/textures/block/barley.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/barley.png rename to src/main/resources/assets/biomesoplenty/textures/block/barley.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/block/berrybush.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/berrybush.png rename to src/main/resources/assets/biomesoplenty/textures/block/berrybush.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png b/src/main/resources/assets/biomesoplenty/textures/block/berrybush_berry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png rename to src/main/resources/assets/biomesoplenty/textures/block/berrybush_berry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png b/src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png rename to src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blood_flowing.png.mcmeta rename to src/main/resources/assets/biomesoplenty/textures/block/blood_flowing.png.mcmeta diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png b/src/main/resources/assets/biomesoplenty/textures/block/blood_still.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png rename to src/main/resources/assets/biomesoplenty/textures/block/blood_still.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/block/blood_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blood_still.png.mcmeta rename to src/main/resources/assets/biomesoplenty/textures/block/blood_still.png.mcmeta diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png b/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png rename to src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png.mcmeta similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_0.png.mcmeta rename to src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_0.png.mcmeta diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png rename to src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png.mcmeta similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blue_fire_layer_1.png.mcmeta rename to src/main/resources/assets/biomesoplenty/textures/block/blue_fire_layer_1.png.mcmeta diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_hydrangea.png b/src/main/resources/assets/biomesoplenty/textures/block/blue_hydrangea.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/blue_hydrangea.png rename to src/main/resources/assets/biomesoplenty/textures/block/blue_hydrangea.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bramble_plant.png b/src/main/resources/assets/biomesoplenty/textures/block/bramble_plant.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/bramble_plant.png rename to src/main/resources/assets/biomesoplenty/textures/block/bramble_plant.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bramble_thorns.png b/src/main/resources/assets/biomesoplenty/textures/block/bramble_thorns.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/bramble_thorns.png rename to src/main/resources/assets/biomesoplenty/textures/block/bramble_thorns.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png b/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png rename to src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bush.png b/src/main/resources/assets/biomesoplenty/textures/block/bush.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/bush.png rename to src/main/resources/assets/biomesoplenty/textures/block/bush.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png b/src/main/resources/assets/biomesoplenty/textures/block/bush_branch.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/bush_branch.png rename to src/main/resources/assets/biomesoplenty/textures/block/bush_branch.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png b/src/main/resources/assets/biomesoplenty/textures/block/cattail.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png rename to src/main/resources/assets/biomesoplenty/textures/block/cattail.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cherry_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/cherry_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/cherry_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png new file mode 100644 index 000000000..7471333a8 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/cherry_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_loamy.png b/src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_loamy.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/block/coarse_dirt_loamy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_sandy.png b/src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_sandy.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/block/coarse_dirt_sandy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/coarse_dirt_silty.png b/src/main/resources/assets/biomesoplenty/textures/block/coarse_dirt_silty.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/block/coarse_dirt_silty.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/dead_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/dead_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/dead_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png b/src/main/resources/assets/biomesoplenty/textures/block/deadgrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/deadgrass.png rename to src/main/resources/assets/biomesoplenty/textures/block/deadgrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/deadleafpile.png b/src/main/resources/assets/biomesoplenty/textures/block/deadleafpile.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/deadleafpile.png rename to src/main/resources/assets/biomesoplenty/textures/block/deadleafpile.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/deathbloom.png b/src/main/resources/assets/biomesoplenty/textures/block/deathbloom.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/deathbloom.png rename to src/main/resources/assets/biomesoplenty/textures/block/deathbloom.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png b/src/main/resources/assets/biomesoplenty/textures/block/desertgrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/desertgrass.png rename to src/main/resources/assets/biomesoplenty/textures/block/desertgrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/devilweed.png b/src/main/resources/assets/biomesoplenty/textures/block/devilweed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/devilweed.png rename to src/main/resources/assets/biomesoplenty/textures/block/devilweed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dirt_loamy.png b/src/main/resources/assets/biomesoplenty/textures/block/dirt_loamy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dirt_loamy.png rename to src/main/resources/assets/biomesoplenty/textures/block/dirt_loamy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dirt_sandy.png b/src/main/resources/assets/biomesoplenty/textures/block/dirt_sandy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dirt_sandy.png rename to src/main/resources/assets/biomesoplenty/textures/block/dirt_sandy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dirt_silty.png b/src/main/resources/assets/biomesoplenty/textures/block/dirt_silty.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dirt_silty.png rename to src/main/resources/assets/biomesoplenty/textures/block/dirt_silty.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_cherry_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_cherry_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_cherry_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_cherry_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_cherry_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_ethereal_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_ethereal_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_fir_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_fir_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_fir_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_fir_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_fir_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_hellbark_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_hellbark_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_jacaranda_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_jacaranda_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_magic_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_magic_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_magic_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_magic_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_magic_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_mahogany_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_mahogany_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_palm_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_palm_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_palm_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_palm_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_palm_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_redwood_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_redwood_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_redwood_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_redwood_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_redwood_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_umbran_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_umbran_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_umbran_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_umbran_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_umbran_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/door_willow_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_willow_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/door_willow_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/door_willow_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/door_willow_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png b/src/main/resources/assets/biomesoplenty/textures/block/dried_sand.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dried_sand.png rename to src/main/resources/assets/biomesoplenty/textures/block/dried_sand.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dunegrass.png b/src/main/resources/assets/biomesoplenty/textures/block/dunegrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/dunegrass.png rename to src/main/resources/assets/biomesoplenty/textures/block/dunegrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/ethereal_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/ethereal_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png new file mode 100644 index 000000000..aee59aeea Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/ethereal_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_loamy.png b/src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_loamy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_loamy.png rename to src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_loamy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_sandy.png b/src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_sandy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_sandy.png rename to src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_sandy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_silty.png b/src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_silty.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/farmland_dry_silty.png rename to src/main/resources/assets/biomesoplenty/textures/block/farmland_dry_silty.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_loamy.png b/src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_loamy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_loamy.png rename to src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_loamy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_sandy.png b/src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_sandy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_sandy.png rename to src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_sandy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_silty.png b/src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_silty.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/farmland_moist_silty.png rename to src/main/resources/assets/biomesoplenty/textures/block/farmland_moist_silty.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_log.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/fir_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/fir_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/fir_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/fir_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/fir_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png new file mode 100644 index 000000000..325eb6330 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/fir_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png b/src/main/resources/assets/biomesoplenty/textures/block/flax_flowers.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png rename to src/main/resources/assets/biomesoplenty/textures/block/flax_flowers.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/flax_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/flax_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/flax_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flax_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/flax_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/flax_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/flax_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flesh.png b/src/main/resources/assets/biomesoplenty/textures/block/flesh.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/flesh.png rename to src/main/resources/assets/biomesoplenty/textures/block/flesh.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/glowflower.png b/src/main/resources/assets/biomesoplenty/textures/block/glowflower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/glowflower.png rename to src/main/resources/assets/biomesoplenty/textures/block/glowflower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png b/src/main/resources/assets/biomesoplenty/textures/block/glowshroom.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/glowshroom.png rename to src/main/resources/assets/biomesoplenty/textures/block/glowshroom.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png b/src/main/resources/assets/biomesoplenty/textures/block/goldenrod.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png rename to src/main/resources/assets/biomesoplenty/textures/block/goldenrod.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_path_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_path_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_path_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_path_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side_snowed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_loamy_side_snowed.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_loamy_side_snowed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side_snowed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_side_snowed.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_origin_side_snowed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_top.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_origin_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_origin_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_origin_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_path_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_path_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_path_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_path_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side_snowed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_sandy_side_snowed.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_sandy_side_snowed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_side_overlay.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_side_overlay.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_side_overlay.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_path_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_silty_path_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_path_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_silty_path_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side_snowed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_silty_side_snowed.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_silty_side_snowed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png b/src/main/resources/assets/biomesoplenty/textures/block/grass_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/grass_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/grass_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/hellbark_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hellbark_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/hellbark_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png b/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png rename to src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png.mcmeta similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_flowing.png.mcmeta rename to src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_flowing.png.mcmeta diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png b/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png rename to src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png.mcmeta b/src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png.mcmeta similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/hot_spring_water_still.png.mcmeta rename to src/main/resources/assets/biomesoplenty/textures/block/hot_spring_water_still.png.mcmeta diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png b/src/main/resources/assets/biomesoplenty/textures/block/ivy.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/ivy.png rename to src/main/resources/assets/biomesoplenty/textures/block/ivy.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/jacaranda_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png new file mode 100644 index 000000000..e028deee0 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/jacaranda_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png b/src/main/resources/assets/biomesoplenty/textures/block/lavender.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png rename to src/main/resources/assets/biomesoplenty/textures/block/lavender.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_dead.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_dead.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_dead.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_dead.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_ethereal.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_ethereal.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_fir.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_fir.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_fir.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_fir.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_fast.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_fast.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_fast.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_fast.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_overlay.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_overlay.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_flowering_overlay.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_flowering_overlay.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_hellbark.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_hellbark.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_hellbark.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_jacaranda.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_jacaranda.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_jacaranda.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_magic.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_magic.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_magic.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_magic.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_mahogany.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_mahogany.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_maple.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_maple.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_maple.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_maple.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_orange_autumn.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_orange_autumn.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_orange_autumn.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_orange_autumn.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_origin.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_origin.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_origin.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_origin.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_palm.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_palm.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_palm.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_palm.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_pink_cherry.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_pink_cherry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_pink_cherry.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_pink_cherry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_redwood.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_redwood.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_redwood.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_redwood.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_umbran.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_umbran.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_white_cherry.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_white_cherry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_white_cherry.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_white_cherry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_willow.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_willow.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_willow.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_willow.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_yellow_autumn.png b/src/main/resources/assets/biomesoplenty/textures/block/leaves_yellow_autumn.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/leaves_yellow_autumn.png rename to src/main/resources/assets/biomesoplenty/textures/block/leaves_yellow_autumn.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_log.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/magic_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/magic_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/magic_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/magic_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/magic_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png new file mode 100644 index 000000000..bf46ca2d8 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/magic_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/mahogany_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png new file mode 100644 index 000000000..a21d29835 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/mahogany_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mud.png b/src/main/resources/assets/biomesoplenty/textures/block/mud.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mud.png rename to src/main/resources/assets/biomesoplenty/textures/block/mud.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick_block.png b/src/main/resources/assets/biomesoplenty/textures/block/mud_brick_block.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mud_brick_block.png rename to src/main/resources/assets/biomesoplenty/textures/block/mud_brick_block.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mycelial_netherrack_side.png b/src/main/resources/assets/biomesoplenty/textures/block/mycelial_netherrack_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/mycelial_netherrack_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/mycelial_netherrack_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/orange_cosmos.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/orange_cosmos.png rename to src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_side.png b/src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_top.png b/src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_netherrack_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/overgrown_netherrack_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side.png b/src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_overlay.png b/src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_overlay.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_overlay.png rename to src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_overlay.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_snowed.png b/src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_snowed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/overgrown_stone_side_snowed.png rename to src/main/resources/assets/biomesoplenty/textures/block/overgrown_stone_side_snowed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_log.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/palm_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/palm_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/palm_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/palm_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/palm_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png new file mode 100644 index 000000000..8d2ac876c Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/palm_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_daffodil.png b/src/main/resources/assets/biomesoplenty/textures/block/pink_daffodil.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/pink_daffodil.png rename to src/main/resources/assets/biomesoplenty/textures/block/pink_daffodil.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png b/src/main/resources/assets/biomesoplenty/textures/block/pink_hibiscus.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png rename to src/main/resources/assets/biomesoplenty/textures/block/pink_hibiscus.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/redwood_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/redwood_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/redwood_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png new file mode 100644 index 000000000..68040b1c5 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/redwood_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/reed.png b/src/main/resources/assets/biomesoplenty/textures/block/reed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/reed.png rename to src/main/resources/assets/biomesoplenty/textures/block/reed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/reed_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/reed_bottom.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/reed_bottom.png rename to src/main/resources/assets/biomesoplenty/textures/block/reed_bottom.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/root.png b/src/main/resources/assets/biomesoplenty/textures/block/root.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/root.png rename to src/main/resources/assets/biomesoplenty/textures/block/root.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/rose.png b/src/main/resources/assets/biomesoplenty/textures/block/rose.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/rose.png rename to src/main/resources/assets/biomesoplenty/textures/block/rose.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_dead.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_dead.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_dead.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_dead.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_ethereal.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_ethereal.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_fir.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_fir.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_fir.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_fir.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_flowering.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_flowering.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_flowering.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_flowering.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_hellbark.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_hellbark.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_hellbark.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_jacaranda.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_jacaranda.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_jacaranda.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_magic.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_magic.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_magic.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_magic.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_mahogany.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_mahogany.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_maple.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_maple.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_maple.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_maple.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_orange_autumn.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_orange_autumn.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_orange_autumn.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_orange_autumn.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_origin.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_origin.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_origin.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_origin.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_palm.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_palm.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_palm.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_palm.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_pink_cherry.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_pink_cherry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_pink_cherry.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_pink_cherry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_redwood.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_redwood.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_redwood.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_redwood.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_umbran.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_umbran.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_white_cherry.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_white_cherry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_white_cherry.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_white_cherry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_willow.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_willow.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_willow.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_willow.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_yellow_autumn.png b/src/main/resources/assets/biomesoplenty/textures/block/sapling_yellow_autumn.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/sapling_yellow_autumn.png rename to src/main/resources/assets/biomesoplenty/textures/block/sapling_yellow_autumn.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/shortgrass.png b/src/main/resources/assets/biomesoplenty/textures/block/shortgrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/shortgrass.png rename to src/main/resources/assets/biomesoplenty/textures/block/shortgrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_side.png b/src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_side.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_side.png rename to src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_side.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_top.png b/src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/spectral_moss_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/spectral_moss_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/spectralfern.png b/src/main/resources/assets/biomesoplenty/textures/block/spectralfern.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/spectralfern.png rename to src/main/resources/assets/biomesoplenty/textures/block/spectralfern.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png new file mode 100644 index 000000000..4ac430a45 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png new file mode 100644 index 000000000..9082df5ba Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_cherry_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png new file mode 100644 index 000000000..bd65ec4fe Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png new file mode 100644 index 000000000..39f830fa2 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_ethereal_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png new file mode 100644 index 000000000..eb4414ed6 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png new file mode 100644 index 000000000..59551f66e Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_fir_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png new file mode 100644 index 000000000..d56c404f0 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png new file mode 100644 index 000000000..ba3cd1b82 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_jacaranda_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png new file mode 100644 index 000000000..897daeaf0 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png new file mode 100644 index 000000000..86fe04f5d Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_magic_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png new file mode 100644 index 000000000..fc9674265 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png new file mode 100644 index 000000000..e04aff63a Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_mahogany_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png new file mode 100644 index 000000000..255642866 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png new file mode 100644 index 000000000..9cfa64894 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_palm_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png new file mode 100644 index 000000000..fb92f24f2 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png new file mode 100644 index 000000000..0aba6ba7e Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_redwood_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png new file mode 100644 index 000000000..2cd446e5d Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png new file mode 100644 index 000000000..16a66235d Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_umbran_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png new file mode 100644 index 000000000..78c2c5cdd Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png new file mode 100644 index 000000000..46dc8f956 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/stripped_willow_log_top.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_lower.png b/src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_lower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_lower.png rename to src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_lower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_upper.png b/src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_upper.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_upper.png rename to src/main/resources/assets/biomesoplenty/textures/block/tall_cattail_upper.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png b/src/main/resources/assets/biomesoplenty/textures/block/thorn.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/thorn.png rename to src/main/resources/assets/biomesoplenty/textures/block/thorn.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tinycactus.png b/src/main/resources/assets/biomesoplenty/textures/block/tinycactus.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/tinycactus.png rename to src/main/resources/assets/biomesoplenty/textures/block/tinycactus.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/toadstool.png b/src/main/resources/assets/biomesoplenty/textures/block/toadstool.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/toadstool.png rename to src/main/resources/assets/biomesoplenty/textures/block/toadstool.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/umbran_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/umbran_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png new file mode 100644 index 000000000..0ebe182c6 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/umbran_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/violet.png b/src/main/resources/assets/biomesoplenty/textures/block/violet.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/violet.png rename to src/main/resources/assets/biomesoplenty/textures/block/violet.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/watergrass.png b/src/main/resources/assets/biomesoplenty/textures/block/watergrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/watergrass.png rename to src/main/resources/assets/biomesoplenty/textures/block/watergrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/watergrass_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/watergrass_bottom.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/watergrass_bottom.png rename to src/main/resources/assets/biomesoplenty/textures/block/watergrass_bottom.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png b/src/main/resources/assets/biomesoplenty/textures/block/wheatgrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/wheatgrass.png rename to src/main/resources/assets/biomesoplenty/textures/block/wheatgrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sand.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sand.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sand.png rename to src/main/resources/assets/biomesoplenty/textures/block/white_sand.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_bottom.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_bottom.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_bottom.png rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_bottom.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_carved.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_carved.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_carved.png rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_carved.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_normal.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_normal.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_normal.png rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_normal.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_smooth.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_smooth.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_smooth.png rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_smooth.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_top.png b/src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/white_sandstone_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/white_sandstone_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wildflower.png b/src/main/resources/assets/biomesoplenty/textures/block/wildflower.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/wildflower.png rename to src/main/resources/assets/biomesoplenty/textures/block/wildflower.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_log.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_log.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_log.png rename to src/main/resources/assets/biomesoplenty/textures/block/willow_log.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_log_top.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_log_top.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_log_top.png rename to src/main/resources/assets/biomesoplenty/textures/block/willow_log_top.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_planks.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_planks.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_planks.png rename to src/main/resources/assets/biomesoplenty/textures/block/willow_planks.png diff --git a/src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png new file mode 100644 index 000000000..7e42e1822 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/block/willow_trapdoor.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/willow_vine.png b/src/main/resources/assets/biomesoplenty/textures/block/willow_vine.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/willow_vine.png rename to src/main/resources/assets/biomesoplenty/textures/block/willow_vine.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png b/src/main/resources/assets/biomesoplenty/textures/block/wilted_lily.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/blocks/wilted_lily.png rename to src/main/resources/assets/biomesoplenty/textures/block/wilted_lily.png diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/algae.png b/src/main/resources/assets/biomesoplenty/textures/blocks/algae.png deleted file mode 100644 index 8bc4959e9..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/algae.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_coral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/blue_coral.png deleted file mode 100644 index 7f2a5795a..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/blue_coral.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/glowing_coral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/glowing_coral.png deleted file mode 100644 index 6d253b9d1..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/glowing_coral.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_bottom.png deleted file mode 100644 index 6032a3e1e..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_bottom.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_middle.png b/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_middle.png deleted file mode 100644 index 2953a0664..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_middle.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_single.png b/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_single.png deleted file mode 100644 index e8aea98bb..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_single.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_top.png deleted file mode 100644 index c8a637af4..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/kelp_top.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/orange_coral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/orange_coral.png deleted file mode 100644 index 7db5d6dbd..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/orange_coral.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_coral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/pink_coral.png deleted file mode 100644 index fe4b03846..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/pink_coral.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_0.png b/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_0.png deleted file mode 100644 index 9f9ed4dab..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_0.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_1.png b/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_1.png deleted file mode 100644 index b484a8468..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_1.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_2.png b/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_2.png deleted file mode 100644 index 689782842..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_2.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_3.png b/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_3.png deleted file mode 100644 index 804049830..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_3.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_4.png b/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_4.png deleted file mode 100644 index 075e4d7fc..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_4.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_5.png b/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_5.png deleted file mode 100644 index bd6342849..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/gui/title/background/panorama_5.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ash.png b/src/main/resources/assets/biomesoplenty/textures/item/ash.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/ash.png rename to src/main/resources/assets/biomesoplenty/textures/item/ash.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berries.png b/src/main/resources/assets/biomesoplenty/textures/item/berries.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/berries.png rename to src/main/resources/assets/biomesoplenty/textures/item/berries.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/item/berrybush.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/berrybush.png rename to src/main/resources/assets/biomesoplenty/textures/item/berrybush.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/blood_bucket.png b/src/main/resources/assets/biomesoplenty/textures/item/blood_bucket.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/blood_bucket.png rename to src/main/resources/assets/biomesoplenty/textures/item/blood_bucket.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_cherry.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_cherry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_cherry.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_cherry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_ethereal.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_ethereal.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_ethereal.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_fir.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_fir.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_fir.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_fir.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_hellbark.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_hellbark.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_hellbark.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_jacaranda.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_jacaranda.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_jacaranda.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_magic.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_magic.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_magic.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_magic.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_mahogany.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_mahogany.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_mahogany.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_palm.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_palm.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_palm.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_palm.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_redwood.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_redwood.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_redwood.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_redwood.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_umbran.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_umbran.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/boat_willow.png b/src/main/resources/assets/biomesoplenty/textures/item/boat_willow.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/boat_willow.png rename to src/main/resources/assets/biomesoplenty/textures/item/boat_willow.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/bop_icon.png b/src/main/resources/assets/biomesoplenty/textures/item/bop_icon.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/bop_icon.png rename to src/main/resources/assets/biomesoplenty/textures/item/bop_icon.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/bush.png b/src/main/resources/assets/biomesoplenty/textures/item/bush.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/bush.png rename to src/main/resources/assets/biomesoplenty/textures/item/bush.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/cattail.png b/src/main/resources/assets/biomesoplenty/textures/item/cattail.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/cattail.png rename to src/main/resources/assets/biomesoplenty/textures/item/cattail.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_cherry.png b/src/main/resources/assets/biomesoplenty/textures/item/door_cherry.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_cherry.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_cherry.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/item/door_ethereal.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_ethereal.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_ethereal.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_fir.png b/src/main/resources/assets/biomesoplenty/textures/item/door_fir.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_fir.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_fir.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_hellbark.png b/src/main/resources/assets/biomesoplenty/textures/item/door_hellbark.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_hellbark.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_hellbark.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_jacaranda.png b/src/main/resources/assets/biomesoplenty/textures/item/door_jacaranda.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_jacaranda.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_jacaranda.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_magic.png b/src/main/resources/assets/biomesoplenty/textures/item/door_magic.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_magic.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_magic.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/item/door_mahogany.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_mahogany.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_mahogany.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_palm.png b/src/main/resources/assets/biomesoplenty/textures/item/door_palm.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_palm.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_palm.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_redwood.png b/src/main/resources/assets/biomesoplenty/textures/item/door_redwood.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_redwood.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_redwood.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_umbran.png b/src/main/resources/assets/biomesoplenty/textures/item/door_umbran.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_umbran.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_umbran.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/door_willow.png b/src/main/resources/assets/biomesoplenty/textures/item/door_willow.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/door_willow.png rename to src/main/resources/assets/biomesoplenty/textures/item/door_willow.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/flax.png b/src/main/resources/assets/biomesoplenty/textures/item/flax.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/flax.png rename to src/main/resources/assets/biomesoplenty/textures/item/flax.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png b/src/main/resources/assets/biomesoplenty/textures/item/fleshchunk.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/fleshchunk.png rename to src/main/resources/assets/biomesoplenty/textures/item/fleshchunk.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/hot_spring_water_bucket.png b/src/main/resources/assets/biomesoplenty/textures/item/hot_spring_water_bucket.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/hot_spring_water_bucket.png rename to src/main/resources/assets/biomesoplenty/textures/item/hot_spring_water_bucket.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/leaves_flowering.png b/src/main/resources/assets/biomesoplenty/textures/item/leaves_flowering.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/leaves_flowering.png rename to src/main/resources/assets/biomesoplenty/textures/item/leaves_flowering.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png b/src/main/resources/assets/biomesoplenty/textures/item/mud_brick.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/mud_brick.png rename to src/main/resources/assets/biomesoplenty/textures/item/mud_brick.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mudball.png b/src/main/resources/assets/biomesoplenty/textures/item/mudball.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/mudball.png rename to src/main/resources/assets/biomesoplenty/textures/item/mudball.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/peach.png b/src/main/resources/assets/biomesoplenty/textures/item/peach.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/peach.png rename to src/main/resources/assets/biomesoplenty/textures/item/peach.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/pear.png b/src/main/resources/assets/biomesoplenty/textures/item/pear.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/pear.png rename to src/main/resources/assets/biomesoplenty/textures/item/pear.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/persimmon.png b/src/main/resources/assets/biomesoplenty/textures/item/persimmon.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/persimmon.png rename to src/main/resources/assets/biomesoplenty/textures/item/persimmon.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/record_wanderer.png b/src/main/resources/assets/biomesoplenty/textures/item/record_wanderer.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/record_wanderer.png rename to src/main/resources/assets/biomesoplenty/textures/item/record_wanderer.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/reed.png b/src/main/resources/assets/biomesoplenty/textures/item/reed.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/reed.png rename to src/main/resources/assets/biomesoplenty/textures/item/reed.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/root.png b/src/main/resources/assets/biomesoplenty/textures/item/root.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/root.png rename to src/main/resources/assets/biomesoplenty/textures/item/root.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/watergrass.png b/src/main/resources/assets/biomesoplenty/textures/item/watergrass.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/items/watergrass.png rename to src/main/resources/assets/biomesoplenty/textures/item/watergrass.png diff --git a/src/main/resources/assets/biomesoplenty/textures/items/kelp.png b/src/main/resources/assets/biomesoplenty/textures/items/kelp.png deleted file mode 100644 index 7061fb51d..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/kelp.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/particles/dev_trail.png b/src/main/resources/assets/biomesoplenty/textures/particle/dev_trail.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particles/dev_trail.png rename to src/main/resources/assets/biomesoplenty/textures/particle/dev_trail.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particles/donator_trail.png b/src/main/resources/assets/biomesoplenty/textures/particle/donator_trail.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particles/donator_trail.png rename to src/main/resources/assets/biomesoplenty/textures/particle/donator_trail.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particles/helper_trail.png b/src/main/resources/assets/biomesoplenty/textures/particle/helper_trail.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particles/helper_trail.png rename to src/main/resources/assets/biomesoplenty/textures/particle/helper_trail.png diff --git a/src/main/resources/assets/biomesoplenty/textures/particles/particles.png b/src/main/resources/assets/biomesoplenty/textures/particle/particles.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/particles/particles.png rename to src/main/resources/assets/biomesoplenty/textures/particle/particles.png diff --git a/src/main/resources/assets/biomesoplenty/textures/potions/bop_potion_fx.png b/src/main/resources/assets/biomesoplenty/textures/potion/bop_potion_fx.png similarity index 100% rename from src/main/resources/assets/biomesoplenty/textures/potions/bop_potion_fx.png rename to src/main/resources/assets/biomesoplenty/textures/potion/bop_potion_fx.png