1.21: Move domum crafting to its own tab (#10109)

Move domum crafting to its own tab

src/main/java/com/minecolonies/api/util/constant/BuildingConstants.java

@@ -102,6 +102,11 @@ public final class BuildingConstants
      */
     public static final String MODULE_BREWING = "brewing";
 
+    /**
+     * Domum Ornamentum module type.
+     */
+    public static final String MODULE_DOMUM = "domum";
+
     /**
      * Custom crafting module type.
      */

src/main/java/com/minecolonies/core/colony/buildings/modules/AbstractCraftingBuildingModule.java

@@ -34,6 +34,7 @@
 import com.minecolonies.core.colony.requestsystem.resolvers.PublicWorkerCraftingProductionResolver;
 import com.minecolonies.core.colony.requestsystem.resolvers.PublicWorkerCraftingRequestResolver;
 import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
@@ -1086,6 +1087,57 @@ public String getId()
         }
     }
 
+    /** this module is for Domum Ornamentum cutter recipes */
+    public abstract static class Domum extends AbstractCraftingBuildingModule
+    {
+        /**
+         * Create a new module.
+         *
+         * @param jobEntry the entry of the job.
+         */
+        public Domum(@NotNull final JobEntry jobEntry)
+        {
+            super(jobEntry);
+        }
+
+        @Override
+        public Set<CraftingType> getSupportedCraftingTypes()
+        {
+            return Set.of(ModCraftingTypes.ARCHITECTS_CUTTER.get());
+        }
+
+        @Override
+        public boolean isRecipeCompatible(final @NotNull IGenericRecipe recipe)
+        {
+            final OptionalPredicate<ItemStack> validator = getIngredientValidator();
+            final ItemStack stack = recipe.getPrimaryOutput();
+            if (BuiltInRegistries.ITEM.getKey(stack.getItem()).getNamespace().equals("domum_ornamentum"))
+            {
+                for (final List<ItemStack> slot : recipe.getInputs())
+                {
+                    // when teaching there should only be one stack in each slot; for JEI there may be more.
+                    // any one compatible ingredient in any slot makes the whole recipe acceptable.
+                    for (final ItemStack ingredientStack : slot)
+                    {
+                        if (!ItemStackUtils.isEmpty(stack) && validator.test(ingredientStack).orElse(false))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        // override getIngredientValidator() to limit compatible ingredients
+
+        @NotNull
+        public String getId()
+        {
+            return MODULE_DOMUM;
+        }
+    }
+
     /** this module is for those who can't be taught recipes but can still use custom recipes */
     public abstract static class Custom extends AbstractCraftingBuildingModule
     {

src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingFletcher.java

@@ -8,11 +8,9 @@
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
-import com.minecolonies.core.colony.buildings.modules.AbstractDOCraftingBuildingModule;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.world.item.*;
-import net.neoforged.neoforge.registries.DeferredRegister;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -87,7 +85,7 @@ public boolean isRecipeCompatible(@NotNull final IGenericRecipe recipe)
         }
     }
 
-    public static class DOCraftingModule extends AbstractDOCraftingBuildingModule
+    public static class DOCraftingModule extends AbstractCraftingBuildingModule.Domum
     {
         /**
          * Create a new module.

src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingGlassblower.java

@@ -8,7 +8,6 @@
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
-import com.minecolonies.core.colony.buildings.modules.AbstractDOCraftingBuildingModule;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -113,7 +112,7 @@ public boolean isRecipeCompatible(@NotNull final IGenericRecipe recipe)
         }
     }
 
-    public static class DOCraftingModule extends AbstractDOCraftingBuildingModule
+    public static class DOCraftingModule extends AbstractCraftingBuildingModule.Domum
     {
         /**
          * Create a new module.

src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingMechanic.java

@@ -8,7 +8,6 @@
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
-import com.minecolonies.core.colony.buildings.modules.AbstractDOCraftingBuildingModule;
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.BlockItem;
@@ -101,7 +100,7 @@ protected int getMaxRecipes()
         }
     }
 
-    public static class DOCraftingModule extends AbstractDOCraftingBuildingModule
+    public static class DOCraftingModule extends AbstractCraftingBuildingModule.Domum
     {
         /**
          * Create a new module.

src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingSawmill.java

@@ -9,7 +9,6 @@
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
-import com.minecolonies.core.colony.buildings.modules.AbstractDOCraftingBuildingModule;
 import net.minecraft.core.BlockPos;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
@@ -120,7 +119,7 @@ public boolean isRecipeCompatible(@NotNull final IGenericRecipe recipe)
         }
     }
 
-    public static class DOCraftingModule extends AbstractDOCraftingBuildingModule
+    public static class DOCraftingModule extends AbstractCraftingBuildingModule.Domum
     {
         /**
          * Create a new module.

src/main/java/com/minecolonies/core/colony/buildings/workerbuildings/BuildingStonemason.java

@@ -8,7 +8,6 @@
 import com.minecolonies.api.util.OptionalPredicate;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.AbstractCraftingBuildingModule;
-import com.minecolonies.core.colony.buildings.modules.AbstractDOCraftingBuildingModule;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.NotNull;
@@ -78,7 +77,7 @@ public boolean isRecipeCompatible(@NotNull final IGenericRecipe recipe)
         }
     }
 
-    public static class DOCraftingModule extends AbstractDOCraftingBuildingModule
+    public static class DOCraftingModule extends AbstractCraftingBuildingModule.Domum
     {
         /**
          * Create a new module.

src/main/resources/assets/minecolonies/lang/manual_en_us.json

@@ -986,6 +986,7 @@
   "com.minecolonies.coremod.gui.workerhuts.recipe.crafting": "Crafting Recipes",
   "com.minecolonies.coremod.gui.workerhuts.recipe.smelting": "Smelting Recipes",
   "com.minecolonies.coremod.gui.workerhuts.recipe.custom": "Custom Recipes",
+  "com.minecolonies.coremod.gui.workerhuts.recipe.domum": "Cutter Recipes",
   "com.minecolonies.coremod.gui.workerhuts.recipe.brewing": "Brewing Recipes",
 
   "item.minecolonies.scan_analyzer": "Schematic Analyzer",