Skip to content

Commit fa83726

Browse files
authored
chore: fix formatting of couple of blocks (#1770)
Signed-off-by: Greened <108997309+GreenedDev@users.noreply.github.com>
1 parent 95d874c commit fa83726

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

pumpkin/src/block/blocks/plant/fungus.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ use pumpkin_data::{Block, tag};
55
use pumpkin_util::math::position::BlockPos;
66
use pumpkin_world::BlockStateId;
77
use pumpkin_world::world::BlockAccessor;
8-
pub struct Fungus;
8+
pub struct FungusBlock;
99

10-
impl BlockMetadata for Fungus {
10+
impl BlockMetadata for FungusBlock {
1111
fn ids() -> Box<[u16]> {
1212
[Block::CRIMSON_FUNGUS.id, Block::WARPED_FUNGUS.id].into()
1313
}
1414
}
1515

16-
impl BlockBehaviour for Fungus {
16+
impl BlockBehaviour for FungusBlock {
1717
fn can_place_at<'a>(&'a self, args: CanPlaceAtArgs<'a>) -> BlockFuture<'a, bool> {
1818
Box::pin(async move {
1919
<Self as PlantBlockBase>::can_place_at(self, args.block_accessor, args.position).await
@@ -34,7 +34,7 @@ impl BlockBehaviour for Fungus {
3434
})
3535
}
3636
}
37-
impl PlantBlockBase for Fungus {
37+
impl PlantBlockBase for FungusBlock {
3838
async fn can_plant_on_top(
3939
&self,
4040
block_accessor: &dyn pumpkin_world::world::BlockAccessor,

pumpkin/src/block/blocks/plant/wither_rose.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use pumpkin_world::BlockStateId;
66

77
use crate::block::{BlockBehaviour, BlockFuture, CanPlaceAtArgs, OnEntityCollisionArgs};
88
#[pumpkin_block("minecraft:wither_rose")]
9-
pub struct WitherRose;
9+
pub struct WitherRoseBlock;
1010

11-
impl BlockBehaviour for WitherRose {
11+
impl BlockBehaviour for WitherRoseBlock {
1212
fn on_entity_collision<'a>(&'a self, args: OnEntityCollisionArgs<'a>) -> BlockFuture<'a, ()> {
1313
Box::pin(async move {
1414
if let Some(living_entity) = args.entity.get_living_entity() {
@@ -59,4 +59,4 @@ impl BlockBehaviour for WitherRose {
5959
}
6060
}
6161

62-
impl PlantBlockBase for WitherRose {}
62+
impl PlantBlockBase for WitherRoseBlock {}

pumpkin/src/block/registry.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ use crate::block::blocks::plant::crop::wheat::WheatBlock;
5454
use crate::block::blocks::plant::dry_vegetation::DryVegetationBlock;
5555
use crate::block::blocks::plant::flower::FlowerBlock;
5656
use crate::block::blocks::plant::flowerbed::FlowerbedBlock;
57-
use crate::block::blocks::plant::fungus::Fungus;
57+
use crate::block::blocks::plant::fungus::FungusBlock;
5858
use crate::block::blocks::plant::kelp::KelpBlock;
5959
use crate::block::blocks::plant::leaf_litter::LeafLitterBlock;
6060
use crate::block::blocks::plant::lily_pad::LilyPadBlock;
@@ -68,7 +68,7 @@ use crate::block::blocks::plant::short_plant::ShortPlantBlock;
6868
use crate::block::blocks::plant::spore_blossom::SporeBlossomBlock;
6969
use crate::block::blocks::plant::sugar_cane::SugarCaneBlock;
7070
use crate::block::blocks::plant::tall_plant::TallPlantBlock;
71-
use crate::block::blocks::plant::wither_rose::WitherRose;
71+
use crate::block::blocks::plant::wither_rose::WitherRoseBlock;
7272
use crate::block::blocks::powder_snow::PowderSnowBlock;
7373
use crate::block::blocks::pumpkin::PumpkinBlock;
7474
use crate::block::blocks::redstone::buttons::ButtonBlock;
@@ -257,8 +257,8 @@ pub fn default_registry() -> Arc<BlockRegistry> {
257257
manager.register(MangroveRootsBlock);
258258
manager.register(LayeredSnowBlock);
259259
manager.register(CobwebBlock);
260-
manager.register(WitherRose);
261-
manager.register(Fungus);
260+
manager.register(WitherRoseBlock);
261+
manager.register(FungusBlock);
262262
manager.register(NetherSproutsBlock);
263263
manager.register(SporeBlossomBlock);
264264

0 commit comments

Comments
 (0)