Merge pull request '1.20.1/bug/45-missing_block_tag' (#47) from 1.20.1/bug/45-missing_block_tag into 1.20.1/dev

Reviewed-on: #47

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.

src/generated/resources/data/minecraft/tags/blocks/replaceable_by_trees.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "firefly_bush_backport:firefly_bush"
+  ]
+}

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;
-    }
 }

src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java

@@ -4,6 +4,7 @@ import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.data.client.ModBlockStateProvider;
 import dev.micle.firefly_bush_backport.data.client.ModItemModelProvider;
 import dev.micle.firefly_bush_backport.data.client.ModSoundDefinitionsProvider;
+import dev.micle.firefly_bush_backport.data.server.ModBlockTagsProvider;
 import dev.micle.firefly_bush_backport.data.server.ModLootTableProvider;
 import dev.micle.firefly_bush_backport.data.server.ModWorldGenProvider;
 import net.minecraft.core.HolderLookup;
@@ -27,6 +28,7 @@ public class DataGenerators {
         generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper));
         generator.addProvider(event.includeClient(), new ModSoundDefinitionsProvider(generator, existingFileHelper));
 
+        generator.addProvider(event.includeServer(), new ModBlockTagsProvider(generator, lookupProvider, existingFileHelper));
         generator.addProvider(event.includeServer(), new ModLootTableProvider(generator));
         generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider));
     }

src/main/java/dev/micle/firefly_bush_backport/data/server/ModBlockTagsProvider.java

@@ -0,0 +1,25 @@
+package dev.micle.firefly_bush_backport.data.server;
+
+import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import dev.micle.firefly_bush_backport.block.ModBlocks;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.tags.BlockTags;
+import net.minecraftforge.common.data.BlockTagsProvider;
+import net.minecraftforge.common.data.ExistingFileHelper;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.concurrent.CompletableFuture;
+
+public class ModBlockTagsProvider extends BlockTagsProvider {
+    public ModBlockTagsProvider(DataGenerator generator, CompletableFuture<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
+        super(generator.getPackOutput(), lookupProvider, FireflyBushBackport.MOD_ID, existingFileHelper);
+    }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    protected void addTags(HolderLookup.Provider pProvider) {
+        this.tag(BlockTags.REPLACEABLE_BY_TREES)
+                .add(ModBlocks.FIREFLY_BUSH.get());
+    }
+}

src/main/java/dev/micle/firefly_bush_backport/event/OnWandererTradesEventHandler.java

@@ -0,0 +1,14 @@
+package dev.micle.firefly_bush_backport.event;
+
+import dev.micle.firefly_bush_backport.item.ModItems;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.common.BasicItemListing;
+import net.minecraftforge.event.village.WandererTradesEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+
+public class OnWandererTradesEventHandler {
+    @SubscribeEvent
+    public void onWandererTradesEvent(WandererTradesEvent event) {
+        event.getGenericTrades().add(new BasicItemListing(3, new ItemStack(ModItems.FIREFLY_BUSH.get(), 1), 12, 1));
+    }
+}

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()));
+    }
 }

src/main/java/dev/micle/firefly_bush_backport/proxy/Proxy.java

@@ -3,6 +3,7 @@ package dev.micle.firefly_bush_backport.proxy;
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
 import dev.micle.firefly_bush_backport.config.Config;
+import dev.micle.firefly_bush_backport.event.OnWandererTradesEventHandler;
 import dev.micle.firefly_bush_backport.tab.ModCreativeModeTabs;
 import dev.micle.firefly_bush_backport.item.ModItems;
 import dev.micle.firefly_bush_backport.particle.FireflyParticle;
@@ -12,6 +13,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;
@@ -45,9 +47,14 @@ public class Proxy implements IProxy {
         MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners);
         MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted);
         MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping);
+
+        // Register event handlers
+        MinecraftForge.EVENT_BUS.register(new OnWandererTradesEventHandler());
     }
 
-    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) {}