Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7770: Fix certain shaped recipes not registering

Browse Source
This commit is contained in:
2008Choco 2024-06-18 19:06:07 +10:00 committed by md_5
parent 3f8e4161fd
commit b2b08f68cf
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/bukkit/craftbukkit/inventory/CraftShapedRecipe.java
View File

@ -1,8 +1,8 @@
package org.bukkit.craftbukkit.inventory; package org.bukkit.craftbukkit.inventory;
import com.google.common.collect.Maps;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Objects;
import net.minecraft.core.NonNullList;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeItemStack; import net.minecraft.world.item.crafting.RecipeItemStack;
@ -48,17 +48,27 @@ public class CraftShapedRecipe extends ShapedRecipe implements CraftRecipe {
@Override @Override
public void addToCraftingManager() { public void addToCraftingManager() {
String[] shape = this.getShape();
Map<Character, org.bukkit.inventory.RecipeChoice> ingred = this.getChoiceMap(); Map<Character, org.bukkit.inventory.RecipeChoice> ingred = this.getChoiceMap();
int width = shape[0].length(); String[] shape = replaceUndefinedIngredientsWithEmpty(this.getShape(), ingred);
NonNullList<RecipeItemStack> data = NonNullList.withSize(shape.length * width, RecipeItemStack.EMPTY); ingred.values().removeIf(Objects::isNull);
Map<Character, RecipeItemStack> data = Maps.transformValues(ingred, (bukkit) -> toNMS(bukkit, false));
ShapedRecipePattern pattern = ShapedRecipePattern.of(data, shape);
MinecraftServer.getServer().getRecipeManager().addRecipe(new RecipeHolder<>(CraftNamespacedKey.toMinecraft(this.getKey()), new ShapedRecipes(this.getGroup(), CraftRecipe.getCategory(this.getCategory()), pattern, CraftItemStack.asNMSCopy(this.getResult()))));
}
private static String[] replaceUndefinedIngredientsWithEmpty(String[] shape, Map<Character, org.bukkit.inventory.RecipeChoice> ingredients) {
for (int i = 0; i < shape.length; i++) { for (int i = 0; i < shape.length; i++) {
String row = shape[i]; String row = shape[i];
for (int j = 0; j < row.length(); j++) { StringBuilder filteredRow = new StringBuilder(row.length());
data.set(i * width + j, toNMS(ingred.get(row.charAt(j)), false));
} for (char character : row.toCharArray()) {
} filteredRow.append(ingredients.get(character) == null ? ' ' : character);
MinecraftServer.getServer().getRecipeManager().addRecipe(new RecipeHolder<>(CraftNamespacedKey.toMinecraft(this.getKey()), new ShapedRecipes(this.getGroup(), CraftRecipe.getCategory(this.getCategory()), new ShapedRecipePattern(width, shape.length, data, Optional.empty()), CraftItemStack.asNMSCopy(this.getResult())))); }
shape[i] = filteredRow.toString();
}
return shape;
} }
} }