From 71ffddec33cb597baecbfe820319b63ead161093 Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 2 May 2026 15:34:13 +0100 Subject: [PATCH 1/3] 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 BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, FireflyBushBackport.MOD_ID); - public static RegistryObject FIREFLY_BUSH = registerBlock("firefly_bush", + public static RegistryObject 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 RegistryObject registerBlockItem(String name, RegistryObject block) { - return ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties())); - } - - private static RegistryObject registerBlock(String name, Supplier block) { - RegistryObject 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 ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, FireflyBushBackport.MOD_ID); + public static final RegistryObject FIREFLY_BUSH = registerBlock(ModBlocks.FIREFLY_BUSH); + public static void register(IEventBus modEventBus) { ITEMS.register(modEventBus); } + + private static RegistryObject registerBlock(RegistryObject block) { + return ITEMS.register(Objects.requireNonNull(block.getId()).getPath(), () -> new BlockItem(block.get(), new Item.Properties())); + } } From 6d46ec7671168d95c5e68684d7a19acf587e31c4 Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 2 May 2026 15:35:21 +0100 Subject: [PATCH 2/3] Adding firefly bush to compostable items. --- .../java/dev/micle/firefly_bush_backport/proxy/Proxy.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java index b2a190d..49277e4 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java @@ -12,6 +12,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.ComposterBlock; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RegisterParticleProvidersEvent; @@ -47,7 +48,9 @@ public class Proxy implements IProxy { MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping); } - private static void setup(FMLCommonSetupEvent event) {} + private static void setup(FMLCommonSetupEvent event) { + ComposterBlock.COMPOSTABLES.put(ModItems.FIREFLY_BUSH.get().asItem(), 0.3F); + } private static void imcEnqueue(InterModEnqueueEvent event) {} From 38b91f2f2917536a89639bcb90642570437d46cc Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 2 May 2026 15:36:31 +0100 Subject: [PATCH 3/3] Bumped mod version number. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e2110b7..616e000 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.daemon=false mod_id=firefly_bush_backport mod_name=Firefly Bush Backport mod_license=All Rights Reserved -mod_version=1.0.0 +mod_version=1.1.0 mod_group_id=dev.micle mod_authors=Micle mod_description=Firefly bush backport from 1.21.5.