diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 7a8c783c5..2bca9c924 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -138,14 +138,14 @@ public class BOPBlocks public static RegistryObject PINE_HANGING_SIGN; public static RegistryObject PINE_WALL_HANGING_SIGN; public static RegistryObject RED_MAPLE_SAPLING; - public static RegistryObject RED_MAPLE_LEAVES; public static RegistryObject RED_MAPLE_LEAF_PILE; + public static RegistryObject RED_MAPLE_LEAVES; public static RegistryObject ORANGE_MAPLE_SAPLING; - public static RegistryObject ORANGE_MAPLE_LEAVES; public static RegistryObject ORANGE_MAPLE_LEAF_PILE; + public static RegistryObject ORANGE_MAPLE_LEAVES; public static RegistryObject YELLOW_MAPLE_SAPLING; - public static RegistryObject YELLOW_MAPLE_LEAVES; public static RegistryObject YELLOW_MAPLE_LEAF_PILE; + public static RegistryObject YELLOW_MAPLE_LEAVES; public static RegistryObject MAPLE_LOG; public static RegistryObject STRIPPED_MAPLE_LOG; public static RegistryObject MAPLE_WOOD; diff --git a/src/main/java/biomesoplenty/init/ModBlocks.java b/src/main/java/biomesoplenty/init/ModBlocks.java index d935fd765..cd71d5cc5 100644 --- a/src/main/java/biomesoplenty/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/init/ModBlocks.java @@ -198,14 +198,14 @@ public static void registerBlocks() PINE_WALL_HANGING_SIGN = registerBlockNoBlockItem(() -> new WallHangingSignBlockBOP(BlockBehaviour.Properties.of().mapColor(PINE_PLANKS.get().defaultMapColor()).instrument(NoteBlockInstrument.BASS).ignitedByLava().forceSolidOn().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(PINE_HANGING_SIGN), BOPWoodTypes.PINE), "pine_wall_hanging_sign"); RED_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new RedMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "red_maple_sapling"); - RED_MAPLE_LEAVES = registerBlock(() -> new RedMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "red_maple_leaves"); RED_MAPLE_LEAF_PILE = registerBlock(() -> new LeafPileBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).replaceable().noCollission().instabreak().sound(SoundType.GRASS)), "red_maple_leaf_pile"); + RED_MAPLE_LEAVES = registerBlock(() -> new RedMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.COLOR_RED).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "red_maple_leaves"); ORANGE_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new OrangeMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_ORANGE).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "orange_maple_sapling"); - ORANGE_MAPLE_LEAVES = registerBlock(() -> new OrangeMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "orange_maple_leaves"); ORANGE_MAPLE_LEAF_PILE = registerBlock(() -> new LeafPileBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).replaceable().noCollission().instabreak().sound(SoundType.GRASS)), "orange_maple_leaf_pile"); + ORANGE_MAPLE_LEAVES = registerBlock(() -> new OrangeMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_ORANGE).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "orange_maple_leaves"); YELLOW_MAPLE_SAPLING = registerBlock(() -> new SaplingBlockBOP(new YellowMapleTree(), BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_YELLOW).pushReaction(PushReaction.DESTROY).noCollission().randomTicks().instabreak().sound(SoundType.GRASS)), "yellow_maple_sapling"); - YELLOW_MAPLE_LEAVES = registerBlock(() -> new YellowMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "yellow_maple_leaves"); YELLOW_MAPLE_LEAF_PILE = registerBlock(() -> new LeafPileBlock(BlockBehaviour.Properties.of().noOcclusion().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).replaceable().noCollission().instabreak().sound(SoundType.GRASS)), "yellow_maple_leaf_pile"); + YELLOW_MAPLE_LEAVES = registerBlock(() -> new YellowMapleLeavesBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.TERRACOTTA_YELLOW).strength(0.2F).randomTicks().sound(SoundType.GRASS).noOcclusion().isValidSpawn(ModBlocks::ocelotOrParrot).isSuffocating(ModBlocks::never).isViewBlocking(ModBlocks::never).ignitedByLava().isRedstoneConductor(ModBlocks::never)), "yellow_maple_leaves"); MAPLE_LOG = registerBlock(() -> log(MapColor.DIRT, MapColor.TERRACOTTA_BROWN), "maple_log"); MAPLE_WOOD = registerBlock(() -> new RotatedPillarBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.BASS).ignitedByLava().mapColor(MapColor.DIRT).strength(2.0F).sound(SoundType.WOOD)), "maple_wood"); STRIPPED_MAPLE_LOG = registerBlock(() -> log(MapColor.DIRT, MapColor.DIRT), "stripped_maple_log"); diff --git a/src/main/resources/assets/biomesoplenty/models/block/leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/block/leaf_pile.json new file mode 100644 index 000000000..4d0a52469 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/leaf_pile.json @@ -0,0 +1,44 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#leaves" + }, + "elements": [ + { + "from": [0, 0, 4], + "to": [16, 0, 20], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true}, + "faces": { + "up": {"uv": [0, 0, 16, 16], "texture": "#leaves"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#leaves"} + } + }, + { + "from": [-4, 0, 0], + "to": [12, 0, 16], + "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true}, + "faces": { + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"} + } + }, + { + "from": [0, 0, -4], + "to": [16, 0, 12], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true}, + "faces": { + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"} + } + }, + { + "from": [4, 0, 0], + "to": [20, 0, 16], + "rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true}, + "faces": { + "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaf_pile.json index a5febd8f1..749a80a57 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaf_pile.json +++ b/src/main/resources/assets/biomesoplenty/models/block/orange_maple_leaf_pile.json @@ -1,45 +1,6 @@ { - "ambientocclusion": false, + "parent": "biomesoplenty:block/leaf_pile", "textures": { - "leaves": "biomesoplenty:block/orange_maple_leaf_pile", - "particle": "biomesoplenty:block/orange_maple_leaf_pile" - }, - "elements": [ - { - "from": [0, 0, 4], - "to": [16, 0, 20], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#leaves"} - } - }, - { - "from": [-4, 0, 0], - "to": [12, 0, 16], - "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"} - } - }, - { - "from": [0, 0, -4], - "to": [16, 0, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"} - } - }, - { - "from": [4, 0, 0], - "to": [20, 0, 16], - "rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"} - } - } - ] + "leaves": "biomesoplenty:block/orange_maple_leaf_pile" + } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/red_maple_leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/block/red_maple_leaf_pile.json index a9dc9a5e3..42a108a70 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/red_maple_leaf_pile.json +++ b/src/main/resources/assets/biomesoplenty/models/block/red_maple_leaf_pile.json @@ -1,45 +1,6 @@ { - "ambientocclusion": false, + "parent": "biomesoplenty:block/leaf_pile", "textures": { - "leaves": "biomesoplenty:block/red_maple_leaf_pile", - "particle": "biomesoplenty:block/red_maple_leaf_pile" - }, - "elements": [ - { - "from": [0, 0, 4], - "to": [16, 0, 20], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#leaves"} - } - }, - { - "from": [-4, 0, 0], - "to": [12, 0, 16], - "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"} - } - }, - { - "from": [0, 0, -4], - "to": [16, 0, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"} - } - }, - { - "from": [4, 0, 0], - "to": [20, 0, 16], - "rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"} - } - } - ] + "leaves": "biomesoplenty:block/red_maple_leaf_pile" + } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaf_pile.json index 47ec2e95d..7a75854d6 100644 --- a/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaf_pile.json +++ b/src/main/resources/assets/biomesoplenty/models/block/yellow_maple_leaf_pile.json @@ -1,45 +1,6 @@ { - "ambientocclusion": false, + "parent": "biomesoplenty:block/leaf_pile", "textures": { - "leaves": "biomesoplenty:block/yellow_maple_leaf_pile", - "particle": "biomesoplenty:block/yellow_maple_leaf_pile" - }, - "elements": [ - { - "from": [0, 0, 4], - "to": [16, 0, 20], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 16], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#leaves"} - } - }, - { - "from": [-4, 0, 0], - "to": [12, 0, 16], - "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 0, 8], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#leaves"} - } - }, - { - "from": [0, 0, -4], - "to": [16, 0, 12], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 0], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#leaves"} - } - }, - { - "from": [4, 0, 0], - "to": [20, 0, 16], - "rotation": {"angle": -22.5, "axis": "z", "origin": [16, 0, 8], "rescale": true}, - "faces": { - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#leaves"} - } - } - ] + "leaves": "biomesoplenty:block/yellow_maple_leaf_pile" + } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json index 7cd2f50a3..11db806f0 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json +++ b/src/main/resources/assets/biomesoplenty/models/item/orange_maple_leaf_pile.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/orange_maple_leaf_pile" + "layer0": "biomesoplenty:item/orange_maple_leaf_pile" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json index 6517ba79e..6d2ba4c99 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json +++ b/src/main/resources/assets/biomesoplenty/models/item/red_maple_leaf_pile.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/red_maple_leaf_pile" + "layer0": "biomesoplenty:item/red_maple_leaf_pile" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json b/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json index f99868456..83e2aba24 100644 --- a/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json +++ b/src/main/resources/assets/biomesoplenty/models/item/yellow_maple_leaf_pile.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "biomesoplenty:block/yellow_maple_leaf_pile" + "layer0": "biomesoplenty:item/yellow_maple_leaf_pile" } } \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png b/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png index 12451fd17..6225bbd55 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png and b/src/main/resources/assets/biomesoplenty/textures/block/burning_blossom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png index daf5f8fe1..0572aa248 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png and b/src/main/resources/assets/biomesoplenty/textures/block/orange_cosmos.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png index 7aa075b25..7b2bf101c 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png and b/src/main/resources/assets/biomesoplenty/textures/block/orange_maple_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png index ebf9d23d7..3ad86af66 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png and b/src/main/resources/assets/biomesoplenty/textures/block/red_maple_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png b/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png index d335325c4..5278d9505 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png and b/src/main/resources/assets/biomesoplenty/textures/block/yellow_maple_sapling.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/orange_maple_leaf_pile.png b/src/main/resources/assets/biomesoplenty/textures/item/orange_maple_leaf_pile.png new file mode 100644 index 000000000..b260ccdff Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/orange_maple_leaf_pile.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/red_maple_leaf_pile.png b/src/main/resources/assets/biomesoplenty/textures/item/red_maple_leaf_pile.png new file mode 100644 index 000000000..59d44175f Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/red_maple_leaf_pile.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/waterlily.png b/src/main/resources/assets/biomesoplenty/textures/item/waterlily.png index df2c9b900..492fb5b9f 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/item/waterlily.png and b/src/main/resources/assets/biomesoplenty/textures/item/waterlily.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/item/yellow_maple_leaf_pile.png b/src/main/resources/assets/biomesoplenty/textures/item/yellow_maple_leaf_pile.png new file mode 100644 index 000000000..d6680f5d5 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/item/yellow_maple_leaf_pile.png differ