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

looking pretty good

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

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

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

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

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

TheAbsolutionism · 2024-12-19T21:13:17Z

~~Waiting on #7267 and #7286 to be merged.~~ All good

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

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

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

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

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

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

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

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

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

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

Efnilite

i think you can turn a few expressions into SPEs. didnt comment on all of them

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

TheAbsolutionism · 2024-12-25T21:06:49Z

i think you can turn a few expressions into SPEs. didnt comment on all of them

Yeah, so I remember awhile ago I tried updating them to SPE but it failed. I know now it was because I was doing register and not registerDefault which I didn't know existed at the time from the previous attempt.

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

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

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 added 2 commits December 9, 2024 11:38

Check Lambda

b4e809c

Merge branch 'dev/feature' into dev/Recipes

449148b

sovdeeth requested changes Dec 15, 2024

View reviewed changes

TheAbsolutionism added 2 commits December 16, 2024 04:19

Partial Changes

3788025

Fix Tests

56ea7a4

sovdeeth added the 2.10 Targeting a 2.10.X version release label Dec 17, 2024

TheAbsolutionism added 3 commits December 17, 2024 17:12

Additional Changes

f4d0e77

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

b36656c

Update EventValues

b143f26

TheAbsolutionism requested a review from sovdeeth December 19, 2024 21:12

TheAbsolutionism added 3 commits December 20, 2024 09:32

Merge branch 'dev/feature' into dev/Recipes

ea18385

Fix Comparator Issue

1679f2d

Remove NamespacedUtils

bbc007a

Efnilite requested changes Dec 20, 2024

View reviewed changes

TheAbsolutionism requested a review from Efnilite December 20, 2024 18:46

Requested Changes

e1c2fac

Efnilite requested changes Dec 21, 2024

View reviewed changes

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

TheAbsolutionism requested a review from Efnilite December 21, 2024 00:44

TheAbsolutionism added 3 commits December 20, 2024 19:45

Lowercase

a30c03b

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

b179275

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

Merge branch 'dev/feature' into dev/Recipes

a7175fe

Efnilite requested changes Dec 25, 2024

View reviewed changes

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

TheAbsolutionism requested a review from Efnilite December 25, 2024 21:06

SPE Update

22b0ea0

sovdeeth requested changes Dec 26, 2024

View reviewed changes

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

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

TheAbsolutionism requested a review from sovdeeth December 26, 2024 20:28

Changes

40a04f9

sovdeeth approved these changes Dec 26, 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 Dec 19, 2024 •

edited

Loading

Efnilite left a comment •

edited

Loading

TheAbsolutionism commented Dec 25, 2024

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 Dec 19, 2024 • edited Loading

Efnilite left a comment • edited Loading

Choose a reason for hiding this comment

TheAbsolutionism commented Dec 25, 2024

TheAbsolutionism commented Oct 16, 2024 •

edited

Loading

TheAbsolutionism commented Dec 19, 2024 •

edited

Loading

Efnilite left a comment •

edited

Loading