correctly resolve types of forge:conditional recipes

Author: PssbleTrngle

src/emit/rule/recipe.ts

@@ -1,9 +1,9 @@
+import { exists } from '@pssbletrngle/pack-resolver'
+import { Id, createId } from '../../common/id.js'
 import { IngredientInput, Predicate } from '../../common/ingredient.js'
-import { Recipe } from '../../parser/recipe/index.js'
-import { createId, Id } from '../../common/id.js'
 import { Logger } from '../../logger.js'
+import { Recipe } from '../../parser/recipe/index.js'
 import Rule, { Modifier } from './index.js'
-import { exists } from '@pssbletrngle/pack-resolver'
 
 export default class RecipeRule extends Rule<Recipe> {
    constructor(
@@ -18,10 +18,10 @@ export default class RecipeRule extends Rule<Recipe> {
    }
 
    matches(id: Id, recipe: Recipe, logger: Logger): boolean {
-      const type = createId(recipe.toJSON().type)
+      const types = recipe.getTypes().map(createId)
       return (
          this.idsTests.every(test => test(id, logger)) &&
-         this.typeTests.every(test => test(type, logger)) &&
+         this.typeTests.every(test => types.some(it => test(it))) &&
          this.ingredientTests.every(test => recipe.getIngredients().some(it => test(it, logger))) &&
          this.resultTests.every(test => recipe.getResults().some(it => test(it, logger)))
       )

src/parser/recipe/forge/conditional.ts

@@ -1,7 +1,7 @@
-import RecipeParser, { InlineRecipeParser, Recipe, Replacer } from '../index.js'
 import { Ingredient, IngredientInput } from '../../../common/ingredient.js'
-import { RecipeDefinition } from '../../../schema/data/recipe.js'
 import { Result, ResultInput } from '../../../common/result.js'
+import { RecipeDefinition } from '../../../schema/data/recipe.js'
+import RecipeParser, { InlineRecipeParser, Recipe, Replacer } from '../index.js'
 
 type WithConditions<T> = {
    conditions: unknown[]
@@ -48,6 +48,10 @@ export class ForgeConditionalRecipe extends Recipe<ForgeConditionalRecipeDefinit
          this.recipes.map(it => ({ ...it, recipe: it.recipe.replaceResult(replace) }))
       )
    }
+
+   getTypes() {
+      return this.definition.recipes.map(it => it.recipe.type)
+   }
 }
 
 export default class ForgeConditionalRecipeParser extends RecipeParser<

src/parser/recipe/index.ts

@@ -1,6 +1,6 @@
 import { Ingredient, IngredientInput, Predicate } from '../../common/ingredient.js'
-import { RecipeDefinition } from '../../schema/data/recipe.js'
 import { Result, ResultInput } from '../../common/result.js'
+import { RecipeDefinition } from '../../schema/data/recipe.js'
 
 export type Replacer<T> = (value: T) => T
 
@@ -25,6 +25,10 @@ export abstract class Recipe<TDefinition extends RecipeDefinition = RecipeDefini
    toJSON(): TDefinition {
       return this.definition
    }
+
+   getTypes() {
+      return [this.toJSON().type]
+   }
 }
 
 export type InlineRecipeParser = <TDefinition extends RecipeDefinition>(definition: TDefinition) => Recipe<TDefinition>

test/recipe.test.ts

@@ -1,8 +1,8 @@
 import { EMPTY_RECIPE, RecipeTest } from '../src/emit/data/recipe.js'
+import { NormalizedId } from '../src/index.js'
 import { ShapedRecipeDefinition } from '../src/parser/recipe/vanilla/shaped.js'
 import createTestAcceptor from './mock/TestAcceptor.js'
 import setupLoader from './shared/loaderSetup.js'
-import { NormalizedId } from '../src/index.js'
 
 const { logger, loader } = setupLoader({ include: ['data/**/*.json'] })
 
@@ -77,6 +77,16 @@ describe('recipe ingredient replacement', () => {
          'modified create:zinc_ingot_from_raw_ore recipe'
       )
    })
+
+   it('matches recipes wrapped in forge:conditional', async () => {
+      const acceptor = createTestAcceptor()
+
+      loader.recipes.remove({ input: { item: 'biomesoplenty:violet' }, type: 'farmersdelight:cutting' })
+
+      await loader.emit(acceptor)
+
+      expect(acceptor.jsonAt('data/custom/recipes/conditional.json')).toMatchObject(EMPTY_RECIPE)
+   })
 })
 
 describe('recipe removal', () => {

test/resources/default/custom/data/custom/recipes/conditional.json

@@ -0,0 +1,31 @@
+{
+   "type": "forge:conditional",
+   "recipes": [
+      {
+         "conditions": [
+            {
+               "type": "forge:mod_loaded",
+               "modid": "farmersdelight"
+            }
+         ],
+         "recipe": {
+            "type": "farmersdelight:cutting",
+            "ingredients": [
+               {
+                  "item": "biomesoplenty:violet"
+               }
+            ],
+            "result": [
+               {
+                  "count": 2,
+                  "item": "minecraft:purple_dye"
+               }
+            ],
+            "sound": "farmersdelight:block.cutting_board.knife",
+            "tool": {
+               "tag": "forge:tools/knives"
+            }
+         }
+      }
+   ]
+}