From 47a744cf2384948babab9563f5e57fd1d4901f1f Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Fri, 29 Jul 2022 13:21:01 +0200
Subject: [PATCH] Add Composters as Farmer Workstations

---
 .../betterx/bclib/api/v2/poi/PoiManager.java    |  1 +
 .../complexmaterials/WoodenComplexMaterial.java | 17 ++++++++++-------
 .../complexmaterials/entry/BlockEntry.java      |  6 ++++--
 .../worlds/together/tag/v3/CommonPoiTags.java   |  3 +++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/api/v2/poi/PoiManager.java b/src/main/java/org/betterx/bclib/api/v2/poi/PoiManager.java
index d358eeec..456146de 100644
--- a/src/main/java/org/betterx/bclib/api/v2/poi/PoiManager.java
+++ b/src/main/java/org/betterx/bclib/api/v2/poi/PoiManager.java
@@ -45,6 +45,7 @@ public class PoiManager {
     @ApiStatus.Internal
     public static void registerAll() {
         PoiManager.setTag(PoiTypes.FISHERMAN, CommonPoiTags.FISHERMAN_WORKSTATION);
+        PoiManager.setTag(PoiTypes.FARMER, CommonPoiTags.FARMER_WORKSTATION);
     }
 
 
diff --git a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java
index 5a2a873c..954c73b5 100644
--- a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java
+++ b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java
@@ -7,6 +7,7 @@ import org.betterx.bclib.complexmaterials.entry.RecipeEntry;
 import org.betterx.bclib.recipes.GridRecipe;
 import org.betterx.worlds.together.tag.v3.CommonBlockTags;
 import org.betterx.worlds.together.tag.v3.CommonItemTags;
+import org.betterx.worlds.together.tag.v3.CommonPoiTags;
 import org.betterx.worlds.together.tag.v3.TagManager;
 
 import net.minecraft.resources.ResourceLocation;
@@ -216,22 +217,24 @@ public class WoodenComplexMaterial extends ComplexMaterial {
 
     final protected void initDecorations(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) {
         addBlockEntry(new BlockEntry(
-                BLOCK_CRAFTING_TABLE,
-                (complexMaterial, settings) -> new BaseCraftingTableBlock(getBlock(BLOCK_PLANKS))
-        )
-                .setBlockTags(CommonBlockTags.WORKBENCHES)
-                .setItemTags(CommonItemTags.WORKBENCHES));
+                        BLOCK_CRAFTING_TABLE,
+                        (cmx, settings) -> new BaseCraftingTableBlock(getBlock(BLOCK_PLANKS))
+                )
+                        .setBlockTags(CommonBlockTags.WORKBENCHES)
+                        .setItemTags(CommonItemTags.WORKBENCHES)
+        );
 
         addBlockEntry(new BlockEntry(
                 BLOCK_BOOKSHELF,
-                (complexMaterial, settings) -> new BaseBookshelfBlock(getBlock(BLOCK_PLANKS))
+                (cmx, settings) -> new BaseBookshelfBlock(getBlock(BLOCK_PLANKS))
         )
                 .setBlockTags(CommonBlockTags.BOOKSHELVES));
 
         addBlockEntry(new BlockEntry(
                 BLOCK_COMPOSTER,
                 (complexMaterial, settings) -> new BaseComposterBlock(getBlock(BLOCK_PLANKS))
-        ));
+        )
+                .setBlockTags(CommonPoiTags.FARMER_WORKSTATION));
     }
 
     @Override
diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java
index 6738e4ca..043143a6 100644
--- a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java
+++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java
@@ -34,12 +34,14 @@ public class BlockEntry extends ComplexMaterialEntry {
         this.hasItem = hasItem;
     }
 
-    public BlockEntry setBlockTags(TagKey<Block>... blockTags) {
+    @SafeVarargs
+    public final BlockEntry setBlockTags(TagKey<Block>... blockTags) {
         this.blockTags = blockTags;
         return this;
     }
 
-    public BlockEntry setItemTags(TagKey<Item>... itemTags) {
+    @SafeVarargs
+    public final BlockEntry setItemTags(TagKey<Item>... itemTags) {
         this.itemTags = itemTags;
         return this;
     }
diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/CommonPoiTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/CommonPoiTags.java
index 1381f45d..757b698f 100644
--- a/src/main/java/org/betterx/worlds/together/tag/v3/CommonPoiTags.java
+++ b/src/main/java/org/betterx/worlds/together/tag/v3/CommonPoiTags.java
@@ -2,11 +2,14 @@ package org.betterx.worlds.together.tag.v3;
 
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 
 public class CommonPoiTags {
     public static final TagKey<Block> FISHERMAN_WORKSTATION = TagManager.BLOCKS.makeCommonTag("workstation/fisherman");
+    public static final TagKey<Block> FARMER_WORKSTATION = TagManager.BLOCKS.makeCommonTag("workstation/farmer");
 
     static {
         TagManager.BLOCKS.addOtherTags(FISHERMAN_WORKSTATION, CommonBlockTags.BARREL, CommonBlockTags.WOODEN_BARREL);
+        TagManager.BLOCKS.add(FARMER_WORKSTATION, Blocks.COMPOSTER);
     }
 }