From 447a19937969e50219102a074c204d459ebcf20a Mon Sep 17 00:00:00 2001
From: Frank Bauer <developer@ambertation.de>
Date: Tue, 29 Jun 2021 08:09:22 +0200
Subject: [PATCH] Revert "re-enable custom tick functions for furnaces"

This reverts commit b54b14782e9bd0fdfe12cacbdc6529072551732c.
---
 .../blockentities/CustomTickBlockEntity.java  |  9 ------
 .../ru/bclib/blocks/BaseFurnaceBlock.java     | 30 ++++++-------------
 2 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 src/main/java/ru/bclib/blockentities/CustomTickBlockEntity.java

diff --git a/src/main/java/ru/bclib/blockentities/CustomTickBlockEntity.java b/src/main/java/ru/bclib/blockentities/CustomTickBlockEntity.java
deleted file mode 100644
index 906fbe71..00000000
--- a/src/main/java/ru/bclib/blockentities/CustomTickBlockEntity.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package ru.bclib.blockentities;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.state.BlockState;
-
-public interface CustomTickBlockEntity {
-    void customTick(Level level, BlockPos pos, BlockState state);
-}
diff --git a/src/main/java/ru/bclib/blocks/BaseFurnaceBlock.java b/src/main/java/ru/bclib/blocks/BaseFurnaceBlock.java
index 02f51af9..925a3e45 100644
--- a/src/main/java/ru/bclib/blocks/BaseFurnaceBlock.java
+++ b/src/main/java/ru/bclib/blocks/BaseFurnaceBlock.java
@@ -1,17 +1,7 @@
 package ru.bclib.blocks;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityTicker;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import org.jetbrains.annotations.Nullable;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -23,16 +13,18 @@ import net.minecraft.stats.Stats;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FurnaceBlock;
+import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityTicker;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import org.jetbrains.annotations.Nullable;
 import ru.bclib.blockentities.BaseFurnaceBlockEntity;
-import ru.bclib.blockentities.CustomTickBlockEntity;
 import ru.bclib.client.models.BasePatterns;
 import ru.bclib.client.models.BlockModelProvider;
 import ru.bclib.client.models.ModelsHelper;
@@ -41,6 +33,10 @@ import ru.bclib.client.render.BCLRenderLayer;
 import ru.bclib.interfaces.IRenderTyped;
 import ru.bclib.registry.BaseBlockEntities;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider, IRenderTyped {
 	public BaseFurnaceBlock(Block source) {
 		super(FabricBlockSettings.copyOf(source).luminance(state -> state.getValue(LIT) ? 13 : 0));
@@ -115,14 +111,6 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider
 		return drop;
 	}
 
-	public static <T extends BlockEntity> void serverTick(Level level, BlockPos pos, BlockState state,  T blockEntity) {
-		if (blockEntity instanceof CustomTickBlockEntity){
-			((CustomTickBlockEntity)blockEntity).customTick(level, pos, state);
-		} else {
-			AbstractFurnaceBlockEntity.serverTick(level, pos, state, (AbstractFurnaceBlockEntity) blockEntity);
-		}
-	}
-
 	@Override
 	@Nullable
 	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState blockState, BlockEntityType<T> blockEntityType) {
@@ -131,6 +119,6 @@ public class BaseFurnaceBlock extends FurnaceBlock implements BlockModelProvider
 
 	@Nullable
 	protected static <T extends BlockEntity> BlockEntityTicker<T> createFurnaceTicker(Level level, BlockEntityType<T> blockEntityType, BlockEntityType<? extends AbstractFurnaceBlockEntity> blockEntityType2) {
-		return level.isClientSide ? null : createTickerHelper(blockEntityType, blockEntityType2, BaseFurnaceBlock::serverTick);
+		return level.isClientSide ? null : createTickerHelper(blockEntityType, blockEntityType2, AbstractFurnaceBlockEntity::serverTick);
 	}
 }