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

Fusezion · 2024-10-16T20:36:35Z

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

+		if (delayed.get()) {
+			Skript.error("Delays cannot be used within a 'register recipe' section.");
+			return false;


Why not? Maybe I wanna add user input for these, there's nothing here that breaks

on jump: set {_player} to player register a new furnace recipe with id "why&*($^#&$(*^#&$*#": set recipe result to bedrock set recipe cooking time to 1 hour set recipe experience to 100 set recipe group to "hand_holders" set {-RecipeBuilder::%{_player}%::waiting} to true send "What should be the recipe input (item), you have 5 seconds to respond": set {_now} to 5 second later while {-RecipeBuilder::%{_player}%::waiting} is true: if now >= {_now}: send "You didn't define the input in time, speed up your typing" to {_player} delete {-RecipeBuilder::%{_player}%::*} stop wait a tick set recipe input to {-RecipeBuilder::%{_player}%::waiting} delete {-RecipeBuilder::%{_player}%::*} on chat: {-RecipeBuilder::%player%::waiting} is true set {_input} to uncolored message parsed as item if {_input} is set: set {-RecipeBuilder::%player%::waiting} to {_input} stop send "'%uncolored message%' is an invalid item"

More accurately I just don't see why a wait can't be done, this isn't a consumer like spawn event or anything else, this is a trigger, supporting waits should be fine and will not cause any issues

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

Efnilite

lookin' better

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

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

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

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

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

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

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

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

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

sovdeeth · 2024-10-17T16:40:44Z

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

+
+	static {
+		Skript.registerEffect(EffResetRecipes.class,
+			"reset [the] server['s] recipes");


remove, reset, etc makes me thing maybe the server's recipes should be an expression with changers

sovdeeth · 2024-10-17T16:52:11Z

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

+			this.pattern = "[the] " + pattern + " [of %-recipes%]";
+			this.toString = toString;
+			this.eventClass = eventClass;
+			this.error = error;
+		}
+
+		RecipePattern(String pattern, String toString, Class<? extends Event>[] eventClasses, String error) {
+			this.pattern = "[the] " + pattern + " [of %-recipes%]";


again, shouldn't be nullable

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

sovdeeth · 2024-10-17T16:53:31Z

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

+
+	static {
+		Skript.registerExpression(ExprRecipeResult.class, ItemStack.class, ExpressionType.PROPERTY,
+			"[the] recipe result[ing] [item] [of %-recipes%]");


shouldn't be nullable

I think the idea here is that the expression can be used in a recipe section, and therefor no need to specify the recipe?!?!?

Yeah, but that should be done via a default value: [of %recipe%] that's filled in by the section's event-recipe

oh right, duh... my bad.

Sovde, so I did attempt to make a event value for the section, however, not all recipes are able to be modified after creation, i.e. Smithing Recipe + sub recipes. I was unsure how to go about it as it would be inconsistent.
Let me know what you think I should do

You should wrap them in a mutable wrapper, then

How would I go about doing this? Is there a reference by chance?

Not off the top of my head
you just make your own recipe class that wraps the actual recipe

sovdeeth · 2024-10-17T16:55:55Z

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

+	private static final boolean RUNNING_1_20 = Skript.isRunningMinecraft(1, 20, 0);
+
+	static {
+		Skript.registerSection(SecRegisterRecipe.class, "(register|create) [a] [new] %*recipetype% with [the] (key|id) %string%");


What if I want to create a recipe without registering it? I think that this should wait for secspressions and utilise that feature instead. An expression section to create the recipe, and an effect to register a recipe (could just be the server recipe's expression changer i mentioned before (could support set, add, remove, reset, clear, etc))

Is your idea behind it just this?? Since if so I'd agree it's nice, but I think it could be added as a future thing unless it's confirmed Secpressions are 2.10

set {_recipeCopy} to a new %recipetype% with [the] (id|key) %string%: set recipe cook time to 10 seconds return recipe#???

set {_recipeCopy} to a new %recipetype% with [the] (id|key) %string%: set recipe cook time to 10 seconds

just this

And they are feature-ready, but just waiting on a double check by walrus

sovdeeth · 2024-10-17T16:57:24Z

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

+	private void customError(String message) {
+		Skript.info("Line " + thisNode.getLine() + ": (" + thisScript + ")\n\t" + message + "\n\t" + thisNode.getKey());
+	}


please either do this properly or don't do it at all
properly would entail an api that all syntaxes could use that uses proper lang nodes and colours like all the rest of the error formats.

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

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

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

ShaneBeee

Just a few lil nitpicky things.

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

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

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

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

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

src/main/java/org/skriptlang/skript/bukkit/recipes/elements/SecRegisterRecipe.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 suggested changes Oct 16, 2024

View reviewed changes

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

Efnilite suggested 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

Efnilite suggested changes Oct 17, 2024

View reviewed changes

sovdeeth requested changes Oct 17, 2024

View reviewed changes

ShaneBeee reviewed Oct 17, 2024

View reviewed changes

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

ShaneBeee reviewed Oct 17, 2024

View reviewed changes

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

ShaneBeee reviewed Oct 17, 2024

View reviewed changes

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

ShaneBeee reviewed Oct 17, 2024

View reviewed changes

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

ShaneBeee suggested changes Oct 17, 2024

View reviewed changes

TheAbsolutionism added 2 commits October 17, 2024 14:33

Partial Changes

db3e501

More Partial Changes

2d611e0

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 Oct 16, 2024 •

edited

Loading

Fusezion commented Oct 17, 2024

Efnilite left a comment

sovdeeth Oct 17, 2024

sovdeeth Oct 17, 2024

sovdeeth Oct 17, 2024

ShaneBeee Oct 17, 2024

sovdeeth Oct 17, 2024

ShaneBeee Oct 17, 2024

TheAbsolutionism Oct 17, 2024

sovdeeth Oct 17, 2024

TheAbsolutionism Oct 18, 2024

sovdeeth Oct 18, 2024

sovdeeth Oct 17, 2024

Fusezion Oct 17, 2024

sovdeeth Oct 17, 2024 •

edited

Loading

sovdeeth Oct 17, 2024

sovdeeth Oct 17, 2024

ShaneBeee 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 Oct 16, 2024 • edited Loading

Choose a reason for hiding this comment

Fusezion commented Oct 17, 2024

Efnilite left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sovdeeth Oct 17, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ShaneBeee left a comment

Choose a reason for hiding this comment

TheAbsolutionism commented Oct 16, 2024 •

edited

Loading

Fusezion Oct 16, 2024 •

edited

Loading

sovdeeth Oct 17, 2024 •

edited

Loading