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

src/main/java/ch/njol/skript/bukkitutil/NamespacedUtils.java

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

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

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

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

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

Efnilite

almost there

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

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

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

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

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

sovdeeth · 2024-11-16T21:06:40Z

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

+		providedName = (Expression<String>) exprs[1];
+		AtomicBoolean delayed = new AtomicBoolean(false);
+		Runnable afterLoading = () -> delayed.set(!getParser().getHasDelayBefore().isFalse());
+		trigger = loadCode(sectionNode, "register recipe", afterLoading, providedType.getEventClass());


ideally you could check the trigger for the required things like result/ingredients and error during parse if they're missing entirely.
Unsure how doable that is.

Well, if it was possible, personally, I feel like it's not worth the effort. Presumably, I would only be able to check what expressions are used within the trigger. But there's no guarantee I could safely identify if the conditions required for those expressions are being met. Also, it would just make a whole mess within the init for the section. In my opinion atleast.

well you wouldn't do it in the init of course
it'd be a helper method
and it wouldn't be a foolproof thing, just a first line of defence

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

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

TheAbsolutionism and others added 3 commits November 8, 2024 16:59

Merge branch 'dev/feature' into dev/Recipes

530ac32

Merge branch 'dev/feature' into dev/Recipes

0b712cc

Merge branch 'dev/feature' into dev/Recipes

76716cb

Efnilite requested changes Nov 12, 2024

View reviewed changes

Requested Changes

1087525

Efnilite requested changes Nov 13, 2024

View reviewed changes

TheAbsolutionism requested a review from Efnilite November 13, 2024 15:37

Additional Changes

e801263

Efnilite approved these changes Nov 13, 2024

View reviewed changes

TheAbsolutionism added 2 commits November 13, 2024 15:28

Fix Errors

ab7edc5

Fix Docs

99250ad

Pikachu920 requested changes Nov 14, 2024

View reviewed changes

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

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

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

Efnilite left a comment

sovdeeth left a comment

TheAbsolutionism commented Nov 16, 2024

sovdeeth commented Nov 16, 2024

TheAbsolutionism commented Nov 16, 2024

sovdeeth commented Nov 16, 2024

sovdeeth Nov 16, 2024

TheAbsolutionism Nov 17, 2024

sovdeeth Nov 17, 2024

Efnilite left a comment

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

Efnilite left a comment

Choose a reason for hiding this comment

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

sovdeeth Nov 16, 2024

Choose a reason for hiding this comment

TheAbsolutionism Nov 17, 2024

Choose a reason for hiding this comment

sovdeeth Nov 17, 2024

Choose a reason for hiding this comment

Efnilite left a comment

Choose a reason for hiding this comment

TheAbsolutionism commented Oct 16, 2024 •

edited

Loading