Recipe Support #7150

TheAbsolutionism · 2024-10-16T01:30:27Z

Description

This PR aims to add support for recipes including:

Target Minecraft Versions: any
Requirements: none
Related Issues: #5261

Gotta love 1.19

# Conflicts: # src/main/java/ch/njol/skript/classes/data/BukkitClasses.java # src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java # src/main/java/ch/njol/skript/classes/data/DefaultComparators.java # src/main/resources/lang/default.lang

Fusezion

So uuh thinking about moving this to a module?

TheAbsolutionism · 2024-10-16T04:15:32Z

So uuh thinking about moving this to a module?

nada

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

src/main/java/ch/njol/skript/conditions/CondDiscoveredRecipes.java

src/main/java/ch/njol/skript/conditions/CondRecipeExists.java

src/main/java/ch/njol/skript/expressions/ExprGetRecipe.java

src/main/java/ch/njol/skript/expressions/ExprLastRecipe.java

src/main/java/ch/njol/skript/util/RecipeUtils.java

src/main/java/ch/njol/skript/sections/SecRegisterRecipe.java

src/main/java/ch/njol/skript/expressions/ExprRecipeCookingTime.java

src/main/java/ch/njol/skript/expressions/ExprRecipeExperience.java

src/main/java/ch/njol/skript/expressions/ExprRecipeGroup.java

src/main/java/ch/njol/skript/util/RecipeUtils.java

Fusezion

I decided more changes were needed, we're aiming for 100

src/main/resources/lang/default.lang

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/SecRegisterRecipe.java

src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeModule.java

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

Fusezion · 2024-10-17T04:55:20Z

I mentioned it to smurf once, but mentioning it in the pr itself will be good, what's the thought about a proper RecipeChoice implementation to have more support of ingredients.

If this goes through a custom ItemTypeChoice should be created to enable skript's item types correctly and not converting to an itemstack always.

This should be pretty safe due to the fact recipes and these can't be serialized by default

sovdeeth

partial review

src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeUtils.java

src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeWrapper.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/EffDiscoverRecipe.java

TheAbsolutionism · 2024-11-16T18:53:29Z

well i should be able to treat a mutable crafting recipe the same as a crafting recipe
hence they should have the same interface, and it would allow it to pass instanceof CraftingRecipe

So, I tried to have the subclasses extends their respective Bukkit recipe class, but unfortunately it wont let me.

sovdeeth · 2024-11-16T18:54:24Z

well i should be able to treat a mutable crafting recipe the same as a crafting recipe
hence they should have the same interface, and it would allow it to pass instanceof CraftingRecipe

So, I tried to have the subclasses extends their respective Bukkit recipe class, but unfortunately it wont let me.

ah are they final?

TheAbsolutionism · 2024-11-16T18:56:18Z

ah are they final?

It just says "Class can not extend multiple classes"

sovdeeth · 2024-11-16T20:45:27Z

ah are they final?

It just says "Class can not extend multiple classes"

oh right the sub recipes aren't interfaces

src/main/java/org/skriptlang/skript/bukkit/recipes/RegisterRecipeEvent.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/EffDiscoverRecipe.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/EvtDiscoverRecipe.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprAllRecipes.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeCategory.java

src/main/resources/lang/default.lang

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/SecRegisterRecipe.java

Efnilite

on the way to most commented pr 💪

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeResult.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeGroup.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeExperience.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeCookingTime.java

src/main/java/org/skriptlang/skript/bukkit/recipes/MutableRecipe.java

src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeModule.java

src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeCategory.java

src/main/java/org/skriptlang/skript/bukkit/recipes/MutableRecipe.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/SecRegisterRecipe.java

# Conflicts: # src/main/java/ch/njol/skript/Skript.java # src/main/resources/lang/default.lang

src/main/java/org/skriptlang/skript/bukkit/recipes/MutableRecipe.java

src/main/java/org/skriptlang/skript/bukkit/recipes/RegisterRecipeEvent.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/CondDiscoveredRecipes.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeIngredients.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeKey.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeResult.java

Fusezion

Can we possibly implement the transmute recipe type? https://jd.papermc.io/paper/1.21.4/org/bukkit/inventory/TransmuteRecipe.html

src/main/java/org/skriptlang/skript/bukkit/recipes/MutableRecipe.java

…iptTest into dev/Recipes

sovdeeth

looking pretty good

src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeUtils.java

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/CondSmithingData.java

sovdeeth · 2024-12-15T17:20:46Z

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/CondSmithingNBT.java

+})
+@RequiredPlugins("Paper")
+@Since("INSERT VERSION")
+


Suggested change

sovdeeth · 2024-12-15T17:22:30Z

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/CondSmithingNBT.java

+	"NOTES:",
+	"This condition can only be used with Smithing Recipes on PaperMC version 1.19",
+	"This condition can be used with Smithing Transform and Smithing Trim Recipes on PaperMC version 1.20.0 -> 1.20.4",
+	"This condition is redundant for PaperMC versions 1.20.5+ due to the removal in favor of copying data components and will always return true"


is there a reason for picking always true instead of always false or just not registering?
I'm also not sure why this isn't merged with data component condition, because I imagine most users consider components to be nbt.

sovdeeth · 2024-12-15T17:41:10Z

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeIngredients.java

+		"\tset the recipe ingredients to diamond, air, diamond, air, emerald, air, diamond, air and diamond",
+		"\t#OR",
+		"\tset the recipe ingredients of the 1st row to diamond, air and diamond",
+		"\tset the recipe ingredients of second row to air, emerald and air",
+		"\tset the recipe ingredients of the third row to diamond, air and diamond",
+		"\tset the recipe result to beacon",
+	"",
+	"set {_recipe} to a shapeless recipe with id \"my_recipe\":",
+		"\tset recipe ingredients to iron ingot, gold ingot, iron ingot, nether star, 5 obsidian, nether star, iron ingot, gold ingot and iron ingot",
+		"\tset recipe resulting item to beacon named \"OP Beacon\"",
+	"",
+	"set {_recipe} to new blasting recipe with the id \"my_recipe\":",
+		"\tset the recipe input item to netherite ingot named \"Impure Netherite\"",
+		"\tset the recipe result item to netherite ingot named \"Pure Netherite\"",
+	"",
+	"set {_recipe} to a new smithing transform recipe with key \"my_recipe\":",
+		"\tset the recipe base item to diamond helmet",
+		"\tset the recipe template item to paper named \"Blueprint\"",
+		"\tset the recipe addition item to netherite ingot named \"Pure Netherite\"",
+		"\tset the recipe result to netherite helmet named \"Pure Helmet\"",
+	"",
+	"set {_recipe} to a new transmute recipe with key \"my_recipe\":",
+		"\tset the recipe input item to leather helmet",
+		"\tset the recipe transmute item to nether star named \"Free Upgrade\"",
+		"\tset the recipe result to netherite helmet"


i know it's probably already been discussed but do you think there's any safe way to get rid of all the recipe keywords here? It feels awkward to have to repeat them

sovdeeth · 2024-12-15T17:41:54Z

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeIngredients.java

+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		selectedPattern = recipePatterns[(int) Math.floor((double) matchedPattern / 2)];


Suggested change

selectedPattern = recipePatterns[(int) Math.floor((double) matchedPattern / 2)];

selectedPattern = recipePatterns[matchedPattern / 2];

integer division should truncate for you

sovdeeth · 2024-12-15T17:44:06Z

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeIngredients.java

+			if (getParser().isCurrentEvent(CreateRecipeEvent.class)) {
+				boolean classFound = false;
+				for (Class<? extends Event> eventClass : selectedPattern.eventClasses) {
+					if (getParser().isCurrentEvent(eventClass)) {


You should be able to use the varargs version of isCurrentEvent to check multiple at once

sovdeeth · 2024-12-15T17:45:20Z

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/ExprRecipeIngredients.java

+	@Override
+	protected ItemStack @Nullable [] get(Event event, Recipe[] source) {
+		if (isEvent)
+			return null;


Can we not get the ingredient of an in-process recipe? I can see it being somewhat useful:

set ingredients to func() if ingredients contains xyz:

sovdeeth · 2024-12-15T17:52:44Z

src/test/skript/tests/syntaxes/sections/ExprSecCreateRecipe.sk

+	assert {_get} is set with "Transmute recipe was not added to the server"
+
+	assert the recipe type of {_recipe} is transmute recipe with "Created recipe is not a transmute recipe"
+	assert the recipe type of {_recipe} is transmute recipe with "Retrieved recipe is not a transmute recipe"


Suggested change

assert the recipe type of {_recipe} is transmute recipe with "Retrieved recipe is not a transmute recipe"

assert the recipe type of {_recipe} is transmute recipe with "Retrieved recipe is not a transmute recipe"

TheAbsolutionism added 18 commits October 8, 2024 17:19

Starter Commit

2b18331

Shapeless Addition

5301401

Testing Stuff

5aaf2a6

Testing Fix

bd2c23f

More additions

50bb139

Additional Updates + Changes

29bc2e8

Further Additions

d73bad2

Fuse Changes

23d4dc0

Tests (Stopping Point)

fbefde4

Some Fixes

a687e0f

Additional Changes + Fixes

1f79ed6

Fuzes Wishlist

5c3a8c0

Almost Done

78c5411

Fix Imports

ebc9428

One more fix

793c3ee

Fix Test

9a628ea

Gotta love 1.19

Change RecipeType class register

ed8f1db

This comment was marked as resolved.

Sign in to view

Fusezion suggested changes Oct 16, 2024

View reviewed changes

Efnilite requested changes Oct 16, 2024

View reviewed changes

Efnilite added the feature Pull request adding a new feature. label Oct 16, 2024

Efnilite requested changes Oct 16, 2024

View reviewed changes

Module + Changes

1cc3c24

TheAbsolutionism requested review from Efnilite and Fusezion October 16, 2024 19:11

Fusezion suggested changes Oct 16, 2024

View reviewed changes

Fuse's Changes

48a6c1f

sovdeeth requested changes Nov 15, 2024

View reviewed changes

Requested Changes

e2193ea

TheAbsolutionism requested review from Pikachu920 and sovdeeth November 16, 2024 19:02

TheAbsolutionism added 2 commits November 16, 2024 14:03

More Changes

2eea7a6

Whoops

6268513

sovdeeth requested changes Nov 16, 2024

View reviewed changes

Efnilite requested changes Nov 16, 2024

View reviewed changes

TheAbsolutionism added 2 commits November 16, 2024 22:49

Partial Changes

149b842

Merge remote-tracking branch 'upstream/dev/feature' into dev/Recipes

14972f3

# Conflicts: # src/main/java/ch/njol/skript/Skript.java # src/main/resources/lang/default.lang

TheAbsolutionism requested review from sovdeeth and Efnilite November 23, 2024 23:33

TheAbsolutionism added 2 commits November 23, 2024 18:34

Secspressions!

0e5e1e4

Remove Duplicated Module

cb52649

sovdeeth requested changes Dec 8, 2024

View reviewed changes

Fusezion suggested changes Dec 8, 2024

View reviewed changes

src/main/java/org/skriptlang/skript/bukkit/recipes/MutableRecipe.java Outdated Show resolved Hide resolved

TheAbsolutionism added 2 commits December 8, 2024 22:45

Merge branch 'dev/feature' into dev/Recipes

f6bdb2f

Changes + Additions

04ba9fc

TheAbsolutionism requested review from sovdeeth and Fusezion December 9, 2024 16:30

TheAbsolutionism added 4 commits December 9, 2024 11:31

Fix Cond

9f97e4f

Merge branch 'dev/Recipes' of https://github.com/TheAbsolutionism/Skr…

64834b0

…iptTest into dev/Recipes

Check Lambda

b4e809c

Merge branch 'dev/feature' into dev/Recipes

449148b

sovdeeth requested changes Dec 15, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Recipe Support #7150

Recipe Support #7150

TheAbsolutionism commented Oct 16, 2024 •

edited

Loading

This comment was marked as resolved.

Fusezion left a comment

TheAbsolutionism commented Oct 16, 2024

Fusezion left a comment

Fusezion commented Oct 17, 2024

sovdeeth left a comment

TheAbsolutionism commented Nov 16, 2024

sovdeeth commented Nov 16, 2024

TheAbsolutionism commented Nov 16, 2024

sovdeeth commented Nov 16, 2024

Efnilite left a comment

Fusezion left a comment

sovdeeth left a comment

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

	selectedPattern = recipePatterns[(int) Math.floor((double) matchedPattern / 2)];
	selectedPattern = recipePatterns[matchedPattern / 2];

	assert the recipe type of {_recipe} is transmute recipe with "Retrieved recipe is not a transmute recipe"
	assert the recipe type of {_recipe} is transmute recipe with "Retrieved recipe is not a transmute recipe"

Recipe Support #7150

Are you sure you want to change the base?

Recipe Support #7150

Conversation

TheAbsolutionism commented Oct 16, 2024 • edited Loading

Description

This comment was marked as resolved.

Fusezion left a comment

Choose a reason for hiding this comment

TheAbsolutionism commented Oct 16, 2024

Fusezion left a comment

Choose a reason for hiding this comment

Fusezion commented Oct 17, 2024

sovdeeth left a comment

Choose a reason for hiding this comment

TheAbsolutionism commented Nov 16, 2024

sovdeeth commented Nov 16, 2024

TheAbsolutionism commented Nov 16, 2024

sovdeeth commented Nov 16, 2024

Efnilite left a comment

Choose a reason for hiding this comment

Fusezion left a comment

Choose a reason for hiding this comment

sovdeeth left a comment

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

sovdeeth Dec 15, 2024

Choose a reason for hiding this comment

TheAbsolutionism commented Oct 16, 2024 •

edited

Loading