Skip to content

[ref:chore/recipe-priorities] Add recipe prioritization #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Seggan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ref:chore/recipe-priorities] Add recipe prioritization #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/io/github/pylonmc/pylon/recipes/BloomeryDisplayRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public record BloomeryDisplayRecipe(

@Override
public @NotNull List<@NotNull RecipeInput> getInputs() {
return List.of();
return List.of(RecipeInput.of(input));
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/github/pylonmc/pylon/recipes/ForgingDisplayRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public record ForgingDisplayRecipe(

@Override
public @NotNull List<@NotNull RecipeInput> getInputs() {
return List.of();
return List.of(RecipeInput.of(input));
}

@Override
Expand All @@ -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();
}
}
5 changes: 5 additions & 0 deletions src/main/resources/recipes/minecraft/crafting_shaped.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/recipes/minecraft/crafting_shapeless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -39,13 +41,15 @@ pylon:charcoal_from_charcoal_block:
result:
minecraft:charcoal: 9
category: building
priority: -2

pylon:steel_ingots_from_steel_block:
ingredients:
- pylon:steel_block
result:
pylon:steel_ingot: 9
category: misc
priority: -2

pylon:nickel_nuggets_from_nickel_ingot:
ingredients:
Expand All @@ -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:
Expand All @@ -74,6 +79,7 @@ pylon:cobalt_ingots_from_cobalt_block:
result:
pylon:cobalt_ingot: 9
category: misc
priority: -2

pylon:shimmer_dust_1:
ingredients:
Expand Down
11 changes: 10 additions & 1 deletion src/main/resources/recipes/pylon/casting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
temperature: 1410
priority: -1
18 changes: 17 additions & 1 deletion src/main/resources/recipes/pylon/melting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
temperature: 1410
priority: -1