diff --git a/src/main/java/io/github/pylonmc/pylon/recipes/BloomeryDisplayRecipe.java b/src/main/java/io/github/pylonmc/pylon/recipes/BloomeryDisplayRecipe.java index 7a8e6205..84bd8838 100644 --- a/src/main/java/io/github/pylonmc/pylon/recipes/BloomeryDisplayRecipe.java +++ b/src/main/java/io/github/pylonmc/pylon/recipes/BloomeryDisplayRecipe.java @@ -40,7 +40,7 @@ public record BloomeryDisplayRecipe( @Override public @NotNull List<@NotNull RecipeInput> getInputs() { - return List.of(); + return List.of(RecipeInput.of(input)); } @Override diff --git a/src/main/java/io/github/pylonmc/pylon/recipes/ForgingDisplayRecipe.java b/src/main/java/io/github/pylonmc/pylon/recipes/ForgingDisplayRecipe.java index 0e355163..7dcec17f 100644 --- a/src/main/java/io/github/pylonmc/pylon/recipes/ForgingDisplayRecipe.java +++ b/src/main/java/io/github/pylonmc/pylon/recipes/ForgingDisplayRecipe.java @@ -40,7 +40,7 @@ public record ForgingDisplayRecipe( @Override public @NotNull List<@NotNull RecipeInput> getInputs() { - return List.of(); + return List.of(RecipeInput.of(input)); } @Override @@ -60,9 +60,9 @@ public record ForgingDisplayRecipe( ) .addIngredient('#', GuiItems.backgroundBlack()) .addIngredient('h', new ItemButton(PylonItems.STONE_HAMMER, PylonItems.IRON_HAMMER, PylonItems.DIAMOND_HAMMER, PylonItems.TONGS)) - .addIngredient('i', input) + .addIngredient('i', new ItemButton(input)) .addIngredient('b', new ItemButton(PylonItems.BRONZE_ANVIL)) - .addIngredient('r', result) + .addIngredient('r', new ItemButton(result)) .build(); } } diff --git a/src/main/resources/recipes/minecraft/crafting_shaped.yml b/src/main/resources/recipes/minecraft/crafting_shaped.yml index 64667843..d4c1c526 100644 --- a/src/main/resources/recipes/minecraft/crafting_shaped.yml +++ b/src/main/resources/recipes/minecraft/crafting_shaped.yml @@ -7,6 +7,7 @@ pylon:tin_ingot_from_tin_nuggets: N: pylon:tin_nugget result: pylon:tin_ingot category: misc + priority: -2 pylon:tin_block_from_tin_ingots: pattern: @@ -27,6 +28,7 @@ pylon:bronze_ingot_from_bronze_nuggets: N: pylon:bronze_nugget result: pylon:bronze_ingot category: misc + priority: -2 pylon:bronze_block_from_bronze_ingots: pattern: @@ -47,6 +49,7 @@ pylon:steel_ingot_from_steel_nuggets: N: pylon:steel_nugget result: pylon:steel_ingot category: misc + priority: -2 pylon:steel_block_from_steel_ingots: pattern: @@ -77,6 +80,7 @@ pylon:nickel_ingot_from_nickel_nuggets: N: pylon:nickel_nugget result: pylon:nickel_ingot category: misc + priority: -2 pylon:nickel_block_from_nickel_ingots: pattern: @@ -97,6 +101,7 @@ pylon:cobalt_ingot_from_cobalt_nuggets: N: pylon:cobalt_nugget result: pylon:cobalt_ingot category: misc + priority: -2 pylon:cobalt_block_from_cobalt_ingots: pattern: diff --git a/src/main/resources/recipes/minecraft/crafting_shapeless.yml b/src/main/resources/recipes/minecraft/crafting_shapeless.yml index 54ef9844..5db711e1 100644 --- a/src/main/resources/recipes/minecraft/crafting_shapeless.yml +++ b/src/main/resources/recipes/minecraft/crafting_shapeless.yml @@ -11,6 +11,7 @@ pylon:tin_ingots_from_tin_block: result: pylon:tin_ingot: 9 category: misc + priority: -2 pylon:bronze_nuggets_from_bronze_ingot: ingredients: @@ -25,6 +26,7 @@ pylon:bronze_ingots_from_bronze_block: result: pylon:bronze_ingot: 9 category: misc + priority: -2 pylon:steel_nuggets_from_steel_ingot: ingredients: @@ -39,6 +41,7 @@ pylon:charcoal_from_charcoal_block: result: minecraft:charcoal: 9 category: building + priority: -2 pylon:steel_ingots_from_steel_block: ingredients: @@ -46,6 +49,7 @@ pylon:steel_ingots_from_steel_block: result: pylon:steel_ingot: 9 category: misc + priority: -2 pylon:nickel_nuggets_from_nickel_ingot: ingredients: @@ -60,6 +64,7 @@ pylon:nickel_ingots_from_nickel_block: result: pylon:nickel_ingot: 9 category: misc + priority: -2 pylon:cobalt_nuggets_from_cobalt_ingot: ingredients: @@ -74,6 +79,7 @@ pylon:cobalt_ingots_from_cobalt_block: result: pylon:cobalt_ingot: 9 category: misc + priority: -2 pylon:shimmer_dust_1: ingredients: diff --git a/src/main/resources/recipes/pylon/casting.yml b/src/main/resources/recipes/pylon/casting.yml index ffa1a99a..30c3b4fc 100644 --- a/src/main/resources/recipes/pylon/casting.yml +++ b/src/main/resources/recipes/pylon/casting.yml @@ -3,51 +3,60 @@ pylon:sulfur: pylon:sulfur: 144 result: pylon:sulfur temperature: 112.8 + priority: -1 pylon:copper_ingot: input: pylon:copper: 144 result: minecraft:copper_ingot temperature: 1083 + priority: -1 pylon:gold_ingot: input: pylon:gold: 144 result: minecraft:gold_ingot temperature: 1064 + priority: -1 pylon:iron_ingot: input: pylon:iron: 144 result: minecraft:iron_ingot temperature: 1538 + priority: -1 pylon:tin_ingot: input: pylon:tin: 144 result: pylon:tin_ingot temperature: 231.9 + priority: -1 pylon:cobalt_ingot: input: pylon:cobalt: 144 result: pylon:cobalt_ingot temperature: 1495 + priority: -1 pylon:nickel_ingot: input: pylon:nickel: 144 result: pylon:nickel_ingot temperature: 1455 + priority: -1 pylon:bronze_ingot: input: pylon:bronze: 144 result: pylon:bronze_ingot temperature: 950 + priority: -1 pylon:steel_ingot: input: pylon:steel: 144 result: pylon:steel_ingot - temperature: 1410 \ No newline at end of file + temperature: 1410 + priority: -1 \ No newline at end of file diff --git a/src/main/resources/recipes/pylon/melting.yml b/src/main/resources/recipes/pylon/melting.yml index 74afa051..8372af62 100644 --- a/src/main/resources/recipes/pylon/melting.yml +++ b/src/main/resources/recipes/pylon/melting.yml @@ -21,12 +21,14 @@ pylon:copper_from_nugget: result: pylon:copper amount: 16 temperature: 1083 + priority: -1 pylon:copper_from_block: input: "#minecraft:copper" result: pylon:copper amount: 1296 temperature: 1083 + priority: -1 pylon:gold_from_ingot: input: minecraft:gold_ingot @@ -45,12 +47,14 @@ pylon:gold_from_nugget: result: pylon:gold amount: 16 temperature: 1064 + priority: -1 pylon:gold_from_block: input: minecraft:gold_block result: pylon:gold amount: 1296 temperature: 1064 + priority: -1 pylon:iron_from_ingot: input: minecraft:iron_ingot @@ -69,12 +73,14 @@ pylon:iron_from_nugget: result: pylon:iron amount: 16 temperature: 1064 + priority: -1 pylon:iron_from_block: input: minecraft:iron_block result: pylon:iron amount: 1296 temperature: 1064 + priority: -1 pylon:tin_from_ingot: input: pylon:tin_ingot @@ -93,12 +99,14 @@ pylon:tin_from_nugget: result: pylon:tin amount: 16 temperature: 231.9 + priority: -1 pylon:tin_from_block: input: pylon:tin_block result: pylon:tin amount: 1296 temperature: 231.9 + priority: -1 pylon:cobalt_from_ingot: input: pylon:cobalt_ingot @@ -117,12 +125,14 @@ pylon:cobalt_from_nugget: result: pylon:cobalt amount: 16 temperature: 1495 + priority: -1 pylon:cobalt_from_block: input: pylon:cobalt_block result: pylon:cobalt amount: 1296 temperature: 1495 + priority: -1 pylon:nickel_from_ingot: input: pylon:nickel_ingot @@ -141,12 +151,14 @@ pylon:nickel_from_nugget: result: pylon:nickel amount: 16 temperature: 1455 + priority: -1 pylon:nickel_from_block: input: pylon:nickel_block result: pylon:nickel amount: 1296 temperature: 1455 + priority: -1 pylon:bronze_from_ingot: input: pylon:bronze_ingot @@ -165,12 +177,14 @@ pylon:bronze_from_nugget: result: pylon:bronze amount: 16 temperature: 950 + priority: -1 pylon:bronze_from_block: input: pylon:bronze_block result: pylon:bronze amount: 1296 temperature: 950 + priority: -1 pylon:steel_from_ingot: input: pylon:steel_ingot @@ -189,9 +203,11 @@ pylon:steel_from_nugget: result: pylon:steel amount: 16 temperature: 1410 + priority: -1 pylon:steel_from_block: input: pylon:steel_block result: pylon:steel amount: 1296 - temperature: 1410 \ No newline at end of file + temperature: 1410 + priority: -1 \ No newline at end of file