spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-04-13 09:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SPIGOT-7770: Reserve spaces in shaped recipes for blank ingredients

Browse source
This commit is contained in:
2008Choco 2024-06-18 19:06:03 +10:00 • committed by md_5
parent 17f7097c13
commit ccbf091556
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/org/bukkit/inventory/ShapedRecipe.java
View file

@ -54,11 +54,11 @@ public class ShapedRecipe extends CraftingRecipe {
/** /**
* Set the shape of this recipe to the specified rows. Each character * Set the shape of this recipe to the specified rows. Each character
* represents a different ingredient; exactly what each character * represents a different ingredient; excluding space characters, which
* represents is set separately. The first row supplied corresponds with * must be empty, exactly what each character represents is set separately.
* the upper most part of the recipe on the workbench e.g. if all three * The first row supplied corresponds with the upper most part of the recipe
* rows are supplies the first string represents the top row on the * on the workbench e.g. if all three rows are supplies the first string
* workbench. * represents the top row on the workbench.
* *
* @param shape The rows of the recipe (up to 3 rows). * @param shape The rows of the recipe (up to 3 rows).
* @return The changed recipe, so you can chain calls. * @return The changed recipe, so you can chain calls.
@ -84,7 +84,12 @@ public class ShapedRecipe extends CraftingRecipe {
// Remove character mappings for characters that no longer exist in the shape // Remove character mappings for characters that no longer exist in the shape
HashMap<Character, RecipeChoice> newIngredients = new HashMap<>(); HashMap<Character, RecipeChoice> newIngredients = new HashMap<>();
for (String row : shape) { for (String row : shape) {
for (Character c : row.toCharArray()) { for (char c : row.toCharArray()) {
// SPIGOT-7770: Space in recipe shape must represent no ingredient
if (c == ' ') {
continue;
}
newIngredients.put(c, ingredients.get(c)); newIngredients.put(c, ingredients.get(c));
} }
} }
@ -102,6 +107,7 @@ public class ShapedRecipe extends CraftingRecipe {
* @param key The character that represents the ingredient in the shape. * @param key The character that represents the ingredient in the shape.
* @param ingredient The ingredient. * @param ingredient The ingredient.
* @return The changed recipe, so you can chain calls. * @return The changed recipe, so you can chain calls.
* @throws IllegalArgumentException if the {@code key} is a space character
* @throws IllegalArgumentException if the {@code key} does not appear in the shape. * @throws IllegalArgumentException if the {@code key} does not appear in the shape.
*/ */
@NotNull @NotNull
@ -118,6 +124,7 @@ public class ShapedRecipe extends CraftingRecipe {
* @param key The character that represents the ingredient in the shape. * @param key The character that represents the ingredient in the shape.
* @param ingredient The ingredient. * @param ingredient The ingredient.
* @return The changed recipe, so you can chain calls. * @return The changed recipe, so you can chain calls.
* @throws IllegalArgumentException if the {@code key} is a space character
* @throws IllegalArgumentException if the {@code key} does not appear in the shape. * @throws IllegalArgumentException if the {@code key} does not appear in the shape.
*/ */
@NotNull @NotNull
@ -135,12 +142,14 @@ public class ShapedRecipe extends CraftingRecipe {
* @param ingredient The ingredient. * @param ingredient The ingredient.
* @param raw The raw material data as an integer. * @param raw The raw material data as an integer.
* @return The changed recipe, so you can chain calls. * @return The changed recipe, so you can chain calls.
* @throws IllegalArgumentException if the {@code key} is a space character
* @throws IllegalArgumentException if the {@code key} does not appear in the shape. * @throws IllegalArgumentException if the {@code key} does not appear in the shape.
* @deprecated Magic value * @deprecated Magic value
*/ */
@Deprecated @Deprecated
@NotNull @NotNull
public ShapedRecipe setIngredient(char key, @NotNull Material ingredient, int raw) { public ShapedRecipe setIngredient(char key, @NotNull Material ingredient, int raw) {
Preconditions.checkArgument(key != ' ', "Space in recipe shape must represent no ingredient");
Preconditions.checkArgument(ingredients.containsKey(key), "Symbol does not appear in the shape:", key); Preconditions.checkArgument(ingredients.containsKey(key), "Symbol does not appear in the shape:", key);
// -1 is the old wildcard, map to Short.MAX_VALUE as the new one // -1 is the old wildcard, map to Short.MAX_VALUE as the new one
@ -161,10 +170,12 @@ public class ShapedRecipe extends CraftingRecipe {
* @param key The character that represents the ingredient in the shape. * @param key The character that represents the ingredient in the shape.
* @param ingredient The ingredient. * @param ingredient The ingredient.
* @return The changed recipe, so you can chain calls. * @return The changed recipe, so you can chain calls.
* @throws IllegalArgumentException if the {@code key} is a space character
* @throws IllegalArgumentException if the {@code key} does not appear in the shape. * @throws IllegalArgumentException if the {@code key} does not appear in the shape.
*/ */
@NotNull @NotNull
public ShapedRecipe setIngredient(char key, @NotNull RecipeChoice ingredient) { public ShapedRecipe setIngredient(char key, @NotNull RecipeChoice ingredient) {
Preconditions.checkArgument(key != ' ', "Space in recipe shape must represent no ingredient");
Preconditions.checkArgument(ingredients.containsKey(key), "Symbol does not appear in the shape:", key); Preconditions.checkArgument(ingredients.containsKey(key), "Symbol does not appear in the shape:", key);
ingredients.put(key, ingredient); ingredients.put(key, ingredient);