From a4388faea990d115ab466723c8bafa69fa96d468 Mon Sep 17 00:00:00 2001 From: ZZZank <3410764033@qq.com> Date: Sun, 4 Aug 2024 16:43:12 +0800 Subject: [PATCH] recipe doc cleanup --- .../probejs/docs/recipes/ArsNouveau.java | 13 ++-- .../docs/recipes/ArtisanWorktables.java | 1 - .../zzzank/probejs/docs/recipes/Botania.java | 5 +- .../probejs/docs/recipes/BotanyPots.java | 5 +- .../docs/recipes/BuiltinRecipeDocs.java | 13 ++-- .../zzzank/probejs/docs/recipes/Create.java | 40 +++++------ .../probejs/docs/recipes/Minecraft.java | 16 ++--- .../docs/recipes/RecipeLambdaBuilder.java | 5 ++ .../zzzank/probejs/docs/recipes/Thermal.java | 72 +++++++++---------- 9 files changed, 80 insertions(+), 90 deletions(-) diff --git a/src/main/java/zzzank/probejs/docs/recipes/ArsNouveau.java b/src/main/java/zzzank/probejs/docs/recipes/ArsNouveau.java index ad488abd..3cd9821c 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/ArsNouveau.java +++ b/src/main/java/zzzank/probejs/docs/recipes/ArsNouveau.java @@ -21,30 +21,27 @@ public void addDocs(ScriptDump scriptDump) { add( "enchanting_apparatus", recipeFn() - .param("output", STACK) + .output(STACK) .param("reagent", INGR) - .param("inputs", INGR_N) + .inputs(INGR_N) .returnType(Types.type(ArsNouveauEnchantingApparatusRecipeJS.class)) - .build() ); add( "enchantment", recipeFn() .param("enchantment", Types.primitive("Special.Enchantment")) .param("level", Primitives.INTEGER) - .param("inputs", INGR_N) + .inputs(INGR_N) .param("mana", Primitives.INTEGER) .returnType(Types.type(ArsNouveauEnchantmentRecipeJS.class)) - .build() ); add( "glyph_recipe", recipeFn() - .param("output", STACK) - .param("input", STACK) + .output(STACK) + .input(STACK) .param("tier", Types.STRING) .returnType(Types.type(ArsNouveauGlyphPressRecipeJS.class)) - .build() ); } diff --git a/src/main/java/zzzank/probejs/docs/recipes/ArtisanWorktables.java b/src/main/java/zzzank/probejs/docs/recipes/ArtisanWorktables.java index fa5da12b..75f022da 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/ArtisanWorktables.java +++ b/src/main/java/zzzank/probejs/docs/recipes/ArtisanWorktables.java @@ -3,7 +3,6 @@ import dev.latvian.kubejs.recipe.mod.ShapedArtisanRecipeJS; import dev.latvian.kubejs.recipe.mod.ShapelessArtisanRecipeJS; import lombok.val; -import me.shedaniel.architectury.platform.Platform; import zzzank.probejs.lang.typescript.ScriptDump; import zzzank.probejs.lang.typescript.code.type.Types; diff --git a/src/main/java/zzzank/probejs/docs/recipes/Botania.java b/src/main/java/zzzank/probejs/docs/recipes/Botania.java index a2329a9c..78344dd2 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/Botania.java +++ b/src/main/java/zzzank/probejs/docs/recipes/Botania.java @@ -18,11 +18,10 @@ public void addDocs(ScriptDump scriptDump) { add( "runic_altar", recipeFn() - .param("output", STACK) - .param("inputs", INGR_N) + .output(STACK) + .inputs(INGR_N) .param("mana", Primitives.INTEGER, true) .returnType(Types.type(BotaniaRunicAltarRecipeJS.class)) - .build() ); } diff --git a/src/main/java/zzzank/probejs/docs/recipes/BotanyPots.java b/src/main/java/zzzank/probejs/docs/recipes/BotanyPots.java index 2e5e60f3..4ed8bf0f 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/BotanyPots.java +++ b/src/main/java/zzzank/probejs/docs/recipes/BotanyPots.java @@ -11,7 +11,7 @@ /** * @author ZZZank */ -public class BotanyPots extends RecipeDocProvider { +class BotanyPots extends RecipeDocProvider { @Override public void addDocs(ScriptDump scriptDump) { add("crop", recipeFn() @@ -23,9 +23,8 @@ public void addDocs(ScriptDump scriptDump) { .member("maxRolls", Primitives.INTEGER) .build()) ) - .param("input", INGR) + .input(INGR) .returnType(Types.type(BotanyPotsCropRecipeJS.class)) - .build() ); } diff --git a/src/main/java/zzzank/probejs/docs/recipes/BuiltinRecipeDocs.java b/src/main/java/zzzank/probejs/docs/recipes/BuiltinRecipeDocs.java index ebdd3aec..958db44a 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/BuiltinRecipeDocs.java +++ b/src/main/java/zzzank/probejs/docs/recipes/BuiltinRecipeDocs.java @@ -60,7 +60,7 @@ public static JSLambdaType basicShapedRecipe() { public static JSLambdaType basicShapedRecipe(BaseType returnType) { return RecipeDocProvider.recipeFn() - .param("output", STACK) + .output(STACK) .param("pattern", STR_N) .param("items", STR2INGR) .returnType(returnType) @@ -73,15 +73,16 @@ public static JSLambdaType.Builder basicShapelessRecipe() { public static JSLambdaType.Builder basicShapelessRecipe(BaseType returnType) { return RecipeDocProvider.recipeFn() - .param("output", STACK) - .param("inputs", INGR_N) + .output(STACK) + .inputs(INGR_N) .returnType(returnType); } public static JSLambdaType.Builder basicCookingRecipe(BaseType returnType) { - return RecipeDocProvider.recipeFn() - .param("output", STACK) - .param("input", INGR) + return RecipeDocProvider + .recipeFn() + .output(STACK) + .input(INGR) .returnType(returnType); } diff --git a/src/main/java/zzzank/probejs/docs/recipes/Create.java b/src/main/java/zzzank/probejs/docs/recipes/Create.java index 5486b1a5..8b07c658 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/Create.java +++ b/src/main/java/zzzank/probejs/docs/recipes/Create.java @@ -12,7 +12,7 @@ /** * @author ZZZank */ -public class Create extends RecipeDocProvider { +class Create extends RecipeDocProvider { private static final JSJoinedType.Union INGR_FLUID = INGR.or(FLUID); private static final JSJoinedType.Union STACK_FLUID = STACK.or(FLUID); @@ -21,63 +21,63 @@ public class Create extends RecipeDocProvider { @Override public void addDocs(ScriptDump scriptDump) { val procReturn = classType("dev.latvian.kubejs.create.ProcessingRecipeJS"); - add("crushing", recipeFn().param("outputs", STACK_N).param("input", INGR).returnType(procReturn)); - add("milling", recipeFn().param("outputs", STACK_N).param("input", INGR).returnType(procReturn)); + add("crushing", recipeFn().outputs(STACK_N).input(INGR).returnType(procReturn)); + add("milling", recipeFn().outputs(STACK_N).input(INGR).returnType(procReturn)); add( "compacting", recipeFn() - .param("output", STACK_FLUID) - .param("inputs", INGR_FLUID_N) + .output(STACK_FLUID) + .inputs(INGR_FLUID_N) .returnType(procReturn) ); add( "mixing", recipeFn() - .param("output", STACK_FLUID) - .param("inputs", INGR_FLUID_N) + .output(STACK_FLUID) + .inputs(INGR_FLUID_N) .returnType(procReturn) ); add("pressing", recipeFn() - .param("output", STACK) - .param("input", INGR) + .output(STACK) + .input(INGR) .returnType(procReturn) ); add("deploying", recipeFn() - .param("output", STACK) - .param("input", INGR) + .output(STACK) + .input(INGR) .returnType(procReturn) ); add( "cutting", - recipeFn().param("output", STACK).param("input", INGR).returnType(procReturn) + recipeFn().output(STACK).input(INGR).returnType(procReturn) ); add( "filling", recipeFn() - .param("output", STACK) + .output(STACK) .param("input", Types.tuple().member("fluid", FLUID).member("base", INGR).build()) .returnType(procReturn) ); add( "sequenced_assembly", recipeFn() - .param("output", STACK_N) - .param("input", INGR) + .output(STACK_N) + .input(INGR) .param("sequence", procReturn.asArray()) .returnType(classType("dev.latvian.kubejs.create.SequencedAssemblyRecipeJS")) ); add("splashing", recipeFn() - .param("output", STACK_N) - .param("input", INGR) + .output(STACK_N) + .input(INGR) .returnType(procReturn) ); add( "sandpaper_polishing", recipeFn() - .param("output", STACK) - .param("input", INGR) + .output(STACK) + .input(INGR) .returnType(procReturn) ); add("mechanical_crafting", basicShapedRecipe(procReturn)); @@ -85,7 +85,7 @@ public void addDocs(ScriptDump scriptDump) { "emptying", recipeFn() .param("outputs", Types.tuple().member("item", STACK).member("fluid", FLUID).build()) - .param("input", INGR) + .input(INGR) .returnType(procReturn) ); } diff --git a/src/main/java/zzzank/probejs/docs/recipes/Minecraft.java b/src/main/java/zzzank/probejs/docs/recipes/Minecraft.java index 26a98a39..9d8d58e7 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/Minecraft.java +++ b/src/main/java/zzzank/probejs/docs/recipes/Minecraft.java @@ -4,9 +4,7 @@ import lombok.val; import zzzank.probejs.lang.typescript.ScriptDump; -import static zzzank.probejs.docs.recipes.BuiltinRecipeDocs.basicCookingRecipe; -import static zzzank.probejs.docs.recipes.BuiltinRecipeDocs.INGR; -import static zzzank.probejs.docs.recipes.BuiltinRecipeDocs.STACK; +import static zzzank.probejs.docs.recipes.BuiltinRecipeDocs.*; /** * @author ZZZank @@ -20,22 +18,20 @@ public void addDocs(ScriptDump scriptDump) { add("smoking", basicCookingRecipe()); add("blasting", basicCookingRecipe()); add("campfire_cooking", basicCookingRecipe()); - add("crafting_shaped", BuiltinRecipeDocs.basicShapedRecipe()); - add("crafting_shapeless", BuiltinRecipeDocs.basicShapelessRecipe()); + add("crafting_shaped", basicShapedRecipe()); + add("crafting_shapeless", basicShapelessRecipe()); add( "stonecutting", - recipeFn().param("output", STACK) - .param("inputs", BuiltinRecipeDocs.INGR_N) + recipeFn().output(STACK) + .inputs(INGR_N) .returnType(converter.convertType(StonecuttingRecipeJS.class)) - .build() ); add( "smithing", - recipeFn().param("output", STACK) + recipeFn().output(STACK) .param("base", INGR) .param("addition", INGR) .returnType(converter.convertType(SmithingRecipeJS.class)) - .build() ); } diff --git a/src/main/java/zzzank/probejs/docs/recipes/RecipeLambdaBuilder.java b/src/main/java/zzzank/probejs/docs/recipes/RecipeLambdaBuilder.java index bcc813a8..6d816954 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/RecipeLambdaBuilder.java +++ b/src/main/java/zzzank/probejs/docs/recipes/RecipeLambdaBuilder.java @@ -38,4 +38,9 @@ public RecipeLambdaBuilder output(BaseType type) { public RecipeLambdaBuilder outputs(BaseType type) { return param("outputs", type); } + + @Override + public RecipeLambdaBuilder returnType(BaseType type) { + return (RecipeLambdaBuilder) super.returnType(type); + } } diff --git a/src/main/java/zzzank/probejs/docs/recipes/Thermal.java b/src/main/java/zzzank/probejs/docs/recipes/Thermal.java index 671a3ce2..ac2739c4 100644 --- a/src/main/java/zzzank/probejs/docs/recipes/Thermal.java +++ b/src/main/java/zzzank/probejs/docs/recipes/Thermal.java @@ -5,7 +5,6 @@ import zzzank.probejs.lang.typescript.ScriptDump; import zzzank.probejs.lang.typescript.code.type.BaseType; import zzzank.probejs.lang.typescript.code.type.Types; -import zzzank.probejs.lang.typescript.code.type.js.JSLambdaType; import static zzzank.probejs.docs.recipes.BuiltinRecipeDocs.*; @@ -17,18 +16,16 @@ class Thermal extends RecipeDocProvider { public static final BaseType MIXED_IN = Types.or(INGR, FLUID); public static final BaseType MIXED_OUT = Types.or(STACK, FLUID); - public static JSLambdaType catalystStyleRecipe() { + public static RecipeLambdaBuilder catalystStyleRecipe() { return recipeFn() .input(INGR) - .returnType(classType("dev.latvian.kubejs.thermal.CatalystRecipeJS")) - .build(); + .returnType(classType("dev.latvian.kubejs.thermal.CatalystRecipeJS")); } - public static JSLambdaType fuelStyleRecipe() { + public static RecipeLambdaBuilder fuelStyleRecipe() { return recipeFn() .input(INGR) - .returnType(classType("dev.latvian.kubejs.thermal.FuelRecipeJS")) - .build(); + .returnType(classType("dev.latvian.kubejs.thermal.FuelRecipeJS")); } @Override @@ -46,70 +43,67 @@ public void addDocs(ScriptDump scriptDump) { //general val basicReturn = classType("dev.latvian.kubejs.thermal.BasicThermalRecipeJS"); add("bottler", - recipeFn().param("output", STACK) - .param("input", selfOrArray(MIXED_IN)) + recipeFn().output(STACK) + .input(selfOrArray(MIXED_IN)) .returnType(basicReturn) - .build() ); add("brewer", - recipeFn().param("output", FLUID) - .param("input", selfOrArray(MIXED_IN)) + recipeFn().output(FLUID) + .input(selfOrArray(MIXED_IN)) .returnType(basicReturn) - .build() ); add("centrifuge", - recipeFn().param("output", selfOrArray(MIXED_OUT)) - .param("input", INGR) + recipeFn().output(selfOrArray(MIXED_OUT)) + .input(INGR) .returnType(basicReturn) - .build() ); add("crucible", - recipeFn().param("output", FLUID).param("input", INGR).returnType(basicReturn).build() + recipeFn().output(FLUID).input(INGR).returnType(basicReturn) ); add("furnance", - recipeFn().param("output", STACK).param("input", INGR).returnType(basicReturn).build() + recipeFn().output(STACK).input(INGR).returnType(basicReturn) ); add("insolator", - recipeFn().param("output", selfOrArray(STACK)) - .param("input", INGR) + recipeFn() + .output(selfOrArray(STACK)) + .input(INGR) .returnType(basicReturn) - .build() ); add("press", - recipeFn().param("outputs", selfOrArray(MIXED_OUT)) - .param("input", selfOrArray(INGR)) + recipeFn() + .outputs(selfOrArray(MIXED_OUT)) + .input(selfOrArray(INGR)) .returnType(basicReturn) - .build() ); add("pulverizer", - recipeFn().param("output", selfOrArray(STACK)) - .param("input", INGR) + recipeFn() + .output(selfOrArray(STACK)) + .input(INGR) .returnType(basicReturn) - .build() ); add("pyrolyzer", - recipeFn().param("outputs", selfOrArray(MIXED_OUT)) - .param("input", INGR) + recipeFn() + .outputs(selfOrArray(MIXED_OUT)) + .input(INGR) .returnType(basicReturn) - .build() ); add("refinery", - recipeFn().param("outputs", selfOrArray(MIXED_OUT)) - .param("input", FLUID) + recipeFn() + .outputs(selfOrArray(MIXED_OUT)) + .input(FLUID) .returnType(basicReturn) - .build() ); add("sawmill", - recipeFn().param("outputs", selfOrArray(MIXED_OUT)) - .param("input", INGR) + recipeFn() + .outputs(selfOrArray(MIXED_OUT)) + .input(INGR) .returnType(basicReturn) - .build() ); add("smelter", - recipeFn().param("outputs", selfOrArray(STACK)) - .param("inputs", selfOrArray(INGR)) + recipeFn() + .outputs(selfOrArray(STACK)) + .inputs(selfOrArray(INGR)) .returnType(basicReturn) - .build() ); }