From 71ffddec33cb597baecbfe820319b63ead161093 Mon Sep 17 00:00:00 2001
From: Micle <micle@micle.dev>
Date: Sat, 2 May 2026 15:34:13 +0100
Subject: [PATCH] Moved BlockItem registration into ModItems in order to keep
 references for registered items.

---
 .../firefly_bush_backport/block/ModBlocks.java  | 17 +----------------
 .../firefly_bush_backport/item/ModItems.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java b/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java
index 2ab4c4b..32609e6 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java
@@ -1,9 +1,6 @@
 package dev.micle.firefly_bush_backport.block;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
-import dev.micle.firefly_bush_backport.item.ModItems;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -14,12 +11,10 @@ import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 
-import java.util.function.Supplier;
-
 public class ModBlocks {
     public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, FireflyBushBackport.MOD_ID);
     
-    public static RegistryObject<Block> FIREFLY_BUSH = registerBlock("firefly_bush",
+    public static RegistryObject<Block> FIREFLY_BUSH = BLOCKS.register("firefly_bush",
             () -> new FireflyBushBlock(BlockBehaviour.Properties.of()
                     .mapColor(MapColor.PLANT)
                     .ignitedByLava()
@@ -33,14 +28,4 @@ public class ModBlocks {
     public static void register(IEventBus modEventBus) {
         BLOCKS.register(modEventBus);
     }
-
-    private static <T extends Block> RegistryObject<Item> registerBlockItem(String name, RegistryObject<T> block) {
-        return ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()));
-    }
-
-    private static <T extends Block> RegistryObject<T> registerBlock(String name, Supplier<T> block) {
-        RegistryObject<T> ret = BLOCKS.register(name, block);
-        registerBlockItem(name, ret);
-        return ret;
-    }
 }
diff --git a/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java b/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java
index 2904912..97c832d 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java
@@ -1,15 +1,27 @@
 package dev.micle.firefly_bush_backport.item;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import dev.micle.firefly_bush_backport.block.ModBlocks;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+
+import java.util.Objects;
 
 public class ModItems {
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, FireflyBushBackport.MOD_ID);
 
+    public static final RegistryObject<BlockItem> FIREFLY_BUSH = registerBlock(ModBlocks.FIREFLY_BUSH);
+
     public static void register(IEventBus modEventBus) {
         ITEMS.register(modEventBus);
     }
+
+    private static RegistryObject<BlockItem> registerBlock(RegistryObject<Block> block) {
+        return ITEMS.register(Objects.requireNonNull(block.getId()).getPath(), () -> new BlockItem(block.get(), new Item.Properties()));
+    }
 }