diff --git a/common/src/main/java/it/crystalnest/soul_fire_d/api/block/CustomCampfireBlock.java b/common/src/main/java/it/crystalnest/soul_fire_d/api/block/CustomCampfireBlock.java
index 17d5316c..7e05bb30 100644
--- a/common/src/main/java/it/crystalnest/soul_fire_d/api/block/CustomCampfireBlock.java
+++ b/common/src/main/java/it/crystalnest/soul_fire_d/api/block/CustomCampfireBlock.java
@@ -49,6 +49,10 @@ public CustomCampfireBlock(ResourceLocation fireType, boolean spawnParticles, Pr
     this.fireType = fireType;
   }
 
+  protected BlockEntityType<? extends CustomCampfireBlockEntity> getBlockEntityType() {
+    return FireManager.CUSTOM_CAMPFIRE_ENTITY_TYPE.get();
+  }
+
   protected BlockEntityTicker<? super CampfireBlockEntity> particleTick() {
     return CustomCampfireBlockEntity::particleTick;
   }
@@ -69,13 +73,13 @@ public MapCodec<CampfireBlock> codec() {
 
   @Override
   public BlockEntity newBlockEntity(@NotNull BlockPos pos, @NotNull BlockState state) {
-    return new CustomCampfireBlockEntity(getFireType(), pos, state);
+    return new CustomCampfireBlockEntity(pos, state);
   }
 
   @Nullable
   @Override
   public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, @NotNull BlockState state, @NotNull BlockEntityType<T> blockEntityType) {
-    BlockEntityType<CampfireBlockEntity> customBlockEntityType = FireManager.CUSTOM_CAMPFIRE_ENTITY_TYPE.get();
+    BlockEntityType<? extends CustomCampfireBlockEntity> customBlockEntityType = getBlockEntityType();
     if (level.isClientSide) {
       return state.getValue(LIT) ? createTickerHelper(blockEntityType, customBlockEntityType, particleTick()) : null;
     } else {
diff --git a/common/src/main/java/it/crystalnest/soul_fire_d/api/block/entity/CustomCampfireBlockEntity.java b/common/src/main/java/it/crystalnest/soul_fire_d/api/block/entity/CustomCampfireBlockEntity.java
index 7b39b945..5efa4eb5 100644
--- a/common/src/main/java/it/crystalnest/soul_fire_d/api/block/entity/CustomCampfireBlockEntity.java
+++ b/common/src/main/java/it/crystalnest/soul_fire_d/api/block/entity/CustomCampfireBlockEntity.java
@@ -1,20 +1,15 @@
 package it.crystalnest.soul_fire_d.api.block.entity;
 
 import it.crystalnest.soul_fire_d.api.FireManager;
-import it.crystalnest.soul_fire_d.api.type.FireTyped;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.entity.CampfireBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 
-public class CustomCampfireBlockEntity extends CampfireBlockEntity implements FireTyped {
-  private final ResourceLocation fireType;
-
-  public CustomCampfireBlockEntity(ResourceLocation fireType, BlockPos pos, BlockState state) {
+public class CustomCampfireBlockEntity extends CampfireBlockEntity {
+  public CustomCampfireBlockEntity(BlockPos pos, BlockState state) {
     super(pos, state);
-    this.fireType = fireType;
   }
 
   @NotNull
@@ -22,9 +17,4 @@ public CustomCampfireBlockEntity(ResourceLocation fireType, BlockPos pos, BlockS
   public BlockEntityType<?> getType() {
     return FireManager.CUSTOM_CAMPFIRE_ENTITY_TYPE.get();
   }
-
-  @Override
-  public ResourceLocation getFireType() {
-    return fireType;
-  }
 }