Recipe Support #7150
Open
Recipe Support #7150
+2,861
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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
This comment was marked as resolved.
This comment was marked as resolved.
Fusezion
suggested changes
Oct 16, 2024
nada |
Efnilite
suggested changes
Oct 16, 2024
src/main/java/ch/njol/skript/conditions/CondDiscoveredRecipes.java
Outdated
Show resolved
Hide resolved
Efnilite
suggested changes
Oct 16, 2024
src/main/java/ch/njol/skript/expressions/ExprRecipeCookingTime.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/expressions/ExprRecipeCookingTime.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/expressions/ExprRecipeCookingTime.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/expressions/ExprRecipeCookingTime.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/expressions/ExprRecipeExperience.java
Outdated
Show resolved
Hide resolved
Fusezion
suggested changes
Oct 16, 2024
Comment on lines
+110
to
+112
| if (delayed.get()) { | ||
| Skript.error("Delays cannot be used within a 'register recipe' section."); | ||
| return false; |
There was a problem hiding this comment.
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
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeModule.java
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeModule.java
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/recipes/RecipeModule.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
Outdated
Show resolved
Hide resolved
|
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
suggested changes
Oct 17, 2024
| @@ -1422,6 +1431,14 @@ public ItemStack get(CraftItemEvent e) { | |||
| return e.getRecipe().getResult(); | |||
| } | |||
| }, 0); | |||
|
|
|||
| EventValues.registerEventValue(CraftItemEvent.class, Recipe.class, new Getter<Recipe, CraftItemEvent>() { | |||
There was a problem hiding this comment.
move this to your event registration or the module's #load, same as the rest of em
There was a problem hiding this comment.
can be moved to the module's package under util or just in the base package
Comment on lines
+24
to
+27
| if (usingMinecraft) | ||
| namespacedKey = NamespacedKey.fromString(key); | ||
| else | ||
| namespacedKey = NamespacedKey.fromString(key, Skript.getInstance()); |
There was a problem hiding this comment.
Suggested change
| if (usingMinecraft) | |
| namespacedKey = NamespacedKey.fromString(key); | |
| else | |
| namespacedKey = NamespacedKey.fromString(key, Skript.getInstance()); | |
| if (usingMinecraft) { | |
| namespacedKey = NamespacedKey.fromString(key); | |
| } else { | |
| namespacedKey = NamespacedKey.fromString(key, Skript.getInstance()); | |
| } |
more readable imo
| * @param usingMinecraft whether to have it as Skript or Minecraft namespace | ||
| * @return the resulting NamespacedKey | ||
| */ | ||
| public static NamespacedKey getNamespacedKey(String key, Boolean usingMinecraft) { |
There was a problem hiding this comment.
Suggested change
| public static NamespacedKey getNamespacedKey(String key, Boolean usingMinecraft) { | |
| public static NamespacedKey getNamespacedKey(String key, boolean usingMinecraft) { |
usingMinecraft has no reason to be nullable
| else | ||
| namespacedKey = NamespacedKey.fromString(key, Skript.getInstance()); | ||
| if (namespacedKey != null) | ||
| return namespacedKey; |
There was a problem hiding this comment.
Suggested change
| return namespacedKey; | |
| return namespacedKey; | |
| @Since("INSERT VERSION") | ||
| public class SecRegisterRecipe extends Section { | ||
|
|
||
| private static final boolean RUNNING_1_20 = Skript.isRunningMinecraft(1, 20, 0); |
There was a problem hiding this comment.
maybe change to SUPPORTS_SMITHING as this better represents what the variable is used for
| private boolean isEvent = false; | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") |
| @Override | ||
| public String toString(@Nullable Event event, boolean debug) { | ||
| return "the recipe result item of " + getExpr().toString(event, debug); | ||
| } |
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") |
| @Override | ||
| public String toString(@Nullable Event event, boolean debug) { | ||
| return "the recipe type of " + getExpr().toString(event, debug); | ||
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR aims to add support for recipes including:
Target Minecraft Versions: any
Requirements: none
Related Issues: #5261