From 395acea899f2619e787ff559ac3add7fdf83cbb9 Mon Sep 17 00:00:00 2001
From: pheo <pheonixindahouse@gmail.com>
Date: Thu, 1 May 2025 10:41:21 +0100
Subject: [PATCH] now you're thinking with OOP

---
 src/main/java/com/hbm/blocks/ModBlocks.java   |  4 ++--
 .../com/hbm/items/block/ItemBlockBase.java    |  9 ++++++++
 .../hbm/items/block/ItemBlockBaseColored.java | 23 -------------------
 3 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/java/com/hbm/items/block/ItemBlockBaseColored.java

diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java
index 65a87d2e2..b4f77d6ab 100644
--- a/src/main/java/com/hbm/blocks/ModBlocks.java
+++ b/src/main/java/com/hbm/blocks/ModBlocks.java
@@ -2811,8 +2811,8 @@ public class ModBlocks {
 		GameRegistry.registerBlock(deco_pipe_quad_green_rusted, ItemBlockBase.class, deco_pipe_quad_green_rusted.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_pipe_quad_red, ItemBlockBase.class, deco_pipe_quad_red.getUnlocalizedName());
 		GameRegistry.registerBlock(deco_pipe_quad_marked, ItemBlockBase.class, deco_pipe_quad_marked.getUnlocalizedName());
-		GameRegistry.registerBlock(plant_flower, ItemBlockBaseColored.class, plant_flower.getUnlocalizedName());
-		GameRegistry.registerBlock(plant_tall, ItemBlockBaseColored.class, plant_tall.getUnlocalizedName());
+		register(plant_flower);
+		register(plant_tall);
 		register(plant_dead);
 		register(reeds);
 		register(vine_phosphor);
diff --git a/src/main/java/com/hbm/items/block/ItemBlockBase.java b/src/main/java/com/hbm/items/block/ItemBlockBase.java
index 97286b3a2..c2a224390 100644
--- a/src/main/java/com/hbm/items/block/ItemBlockBase.java
+++ b/src/main/java/com/hbm/items/block/ItemBlockBase.java
@@ -20,9 +20,12 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 
 public class ItemBlockBase extends ItemBlock {
+	
+	private Block block;
 
 	public ItemBlockBase(Block block) {
 		super(block);
+		this.block = block;
 		
 		if(block instanceof IBlockMulti) {
 			this.setMaxDamage(0);
@@ -88,4 +91,10 @@ public class ItemBlockBase extends ItemBlock {
 		
 		return EnumRarity.common;
 	}
+	
+	@SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack stack, int pass)
+    {
+        return this.block.getRenderColor(stack.getItemDamage());
+    }
 }
diff --git a/src/main/java/com/hbm/items/block/ItemBlockBaseColored.java b/src/main/java/com/hbm/items/block/ItemBlockBaseColored.java
deleted file mode 100644
index c17bf16ce..000000000
--- a/src/main/java/com/hbm/items/block/ItemBlockBaseColored.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hbm.items.block;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-
-public class ItemBlockBaseColored extends ItemBlockBase {
-	
-	private Block block;
-	
-	public ItemBlockBaseColored(Block block) { 
-		super(block);
-		this.block = block;
-		}
-	
-	@SideOnly(Side.CLIENT)
-    public int getColorFromItemStack(ItemStack stack, int p_82790_2_)
-    {
-        return this.block.getRenderColor(stack.getItemDamage());
-    }
-
-}