From 637001538cf05c37bc25196c413ac64c64316934 Mon Sep 17 00:00:00 2001
From: slprime <31038811+slprime@users.noreply.github.com>
Date: Mon, 21 Oct 2024 22:18:36 +0300
Subject: [PATCH] Fix Waila for Torch & Pumpkin (#53)

Co-authored-by: slprime <history-21@yandex.ru>
---
 .../chisel/block/BlockCarvablePumpkin.java    | 20 +------------------
 .../team/chisel/block/BlockCarvableTorch.java | 18 +----------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/src/main/java/team/chisel/block/BlockCarvablePumpkin.java b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java
index 1cfd461f..27345a12 100644
--- a/src/main/java/team/chisel/block/BlockCarvablePumpkin.java
+++ b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java
@@ -7,21 +7,14 @@ import net.minecraft.entity.monster.EntityIronGolem;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import com.cricketcraft.chisel.api.ICarvable;
-import com.cricketcraft.chisel.api.carving.CarvableHelper;
-import com.cricketcraft.chisel.api.carving.IVariationInfo;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import team.chisel.Chisel;
 import team.chisel.entity.EntityChiselSnowman;
 
-public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable {
-
-    public CarvableHelper carverHelper;
+public class BlockCarvablePumpkin extends BlockPumpkin {
 
     @SideOnly(Side.CLIENT)
     private IIcon top, face;
@@ -32,7 +25,6 @@ public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable {
         super(isOn);
         this.setStepSound(Block.soundTypeWood);
         if (isOn) setLightLevel(10.0F);
-        carverHelper = new CarvableHelper(this);
     }
 
     @Override
@@ -122,16 +114,6 @@ public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable {
         this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":pumpkin/pumpkin_side");
     }
 
-    @Override
-    public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) {
-        return carverHelper.getVariation(metadata);
-    }
-
-    @Override
-    public IVariationInfo getManager(int meta) {
-        return carverHelper.getVariation(meta);
-    }
-
     public void setInformation(String textureLocation) {
         this.faceLocation = textureLocation;
     }
diff --git a/src/main/java/team/chisel/block/BlockCarvableTorch.java b/src/main/java/team/chisel/block/BlockCarvableTorch.java
index 009d6e13..60c01a81 100644
--- a/src/main/java/team/chisel/block/BlockCarvableTorch.java
+++ b/src/main/java/team/chisel/block/BlockCarvableTorch.java
@@ -4,28 +4,22 @@ import java.util.Random;
 
 import net.minecraft.block.BlockTorch;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import com.cricketcraft.chisel.api.ChiselTabs;
-import com.cricketcraft.chisel.api.ICarvable;
-import com.cricketcraft.chisel.api.carving.CarvableHelper;
-import com.cricketcraft.chisel.api.carving.IVariationInfo;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import team.chisel.Chisel;
 
-public class BlockCarvableTorch extends BlockTorch implements ICarvable {
+public class BlockCarvableTorch extends BlockTorch {
 
-    public CarvableHelper carverHelper;
     private String texLocation;
     protected boolean emitsParticles = true;
     public int idx;
 
     public BlockCarvableTorch(int idx, String tex) {
         super();
-        carverHelper = new CarvableHelper(this);
         setCreativeTab(ChiselTabs.tabOtherChiselBlocks);
         setLightLevel(0.9375F);
         setBlockName("torch");
@@ -33,16 +27,6 @@ public class BlockCarvableTorch extends BlockTorch implements ICarvable {
         this.texLocation = tex;
     }
 
-    @Override
-    public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) {
-        return carverHelper.getVariation(metadata);
-    }
-
-    @Override
-    public IVariationInfo getManager(int meta) {
-        return carverHelper.getVariation(meta);
-    }
-
     @Override
     public void registerBlockIcons(IIconRegister icon) {
         this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/" + texLocation);