SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.20.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
paper-server/nms-patches/net/minecraft/world/item/crafting/CraftingManager.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/CraftingManager.java
+++ b/net/minecraft/world/item/crafting/CraftingManager.java
@@ -34,11 +34,13 @@
@@ -37,11 +37,13 @@
import net.minecraft.world.level.World;
import org.slf4j.Logger;
@@ -10,39 +10,39 @@
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().disableHtmlEscaping().create();
private static final Logger LOGGER = LogUtils.getLogger();
- public Map<Recipes<?>, Map<MinecraftKey, IRecipe<?>>> recipes = ImmutableMap.of();
+ public Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe<?>>> recipes = ImmutableMap.of(); // CraftBukkit
private Map<MinecraftKey, IRecipe<?>> byName = ImmutableMap.of();
- public Map<Recipes<?>, Map<MinecraftKey, RecipeHolder<?>>> recipes = ImmutableMap.of();
+ public Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, RecipeHolder<?>>> recipes = ImmutableMap.of(); // CraftBukkit
private Map<MinecraftKey, RecipeHolder<?>> byName = ImmutableMap.of();
private boolean hasErrors;
@@ -48,7 +50,12 @@
@@ -51,7 +53,12 @@
protected void apply(Map<MinecraftKey, JsonElement> map, IResourceManager iresourcemanager, GameProfilerFiller gameprofilerfiller) {
this.hasErrors = false;
- Map<Recipes<?>, Builder<MinecraftKey, IRecipe<?>>> map1 = Maps.newHashMap();
- Map<Recipes<?>, Builder<MinecraftKey, RecipeHolder<?>>> map1 = Maps.newHashMap();
+ // CraftBukkit start - SPIGOT-5667 make sure all types are populated and mutable
+ Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe<?>>> map1 = Maps.newHashMap();
+ Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, RecipeHolder<?>>> map1 = Maps.newHashMap();
+ for (Recipes<?> recipeType : BuiltInRegistries.RECIPE_TYPE) {
+ map1.put(recipeType, new Object2ObjectLinkedOpenHashMap<>());
+ }
+ // CraftBukkit end
Builder<MinecraftKey, IRecipe<?>> builder = ImmutableMap.builder();
Builder<MinecraftKey, RecipeHolder<?>> builder = ImmutableMap.builder();
Iterator iterator = map.entrySet().iterator();
@@ -59,8 +66,10 @@
@@ -62,8 +69,10 @@
try {
IRecipe<?> irecipe = fromJson(minecraftkey, ChatDeserializer.convertToJsonObject((JsonElement) entry.getValue(), "top element"));
RecipeHolder<?> recipeholder = fromJson(minecraftkey, ChatDeserializer.convertToJsonObject((JsonElement) entry.getValue(), "top element"));
- ((Builder) map1.computeIfAbsent(irecipe.getType(), (recipes) -> {
- ((Builder) map1.computeIfAbsent(recipeholder.value().getType(), (recipes) -> {
- return ImmutableMap.builder();
+ // CraftBukkit start
+ (map1.computeIfAbsent(irecipe.getType(), (recipes) -> {
+ (map1.computeIfAbsent(recipeholder.value().getType(), (recipes) -> {
+ return new Object2ObjectLinkedOpenHashMap<>();
+ // CraftBukkit end
})).put(minecraftkey, irecipe);
builder.put(minecraftkey, irecipe);
})).put(minecraftkey, recipeholder);
builder.put(minecraftkey, recipeholder);
} catch (IllegalArgumentException | JsonParseException jsonparseexception) {
@@ -69,27 +78,44 @@
@@ -72,20 +81,37 @@
}
this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> {
@@ -55,14 +55,14 @@
}
+ // CraftBukkit start
+ public void addRecipe(IRecipe<?> irecipe) {
+ Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe<?>> map = this.recipes.get(irecipe.getType()); // CraftBukkit
+ public void addRecipe(RecipeHolder<?> irecipe) {
+ Object2ObjectLinkedOpenHashMap<MinecraftKey, RecipeHolder<?>> map = this.recipes.get(irecipe.value().getType()); // CraftBukkit
+
+ if (byName.containsKey(irecipe.getId()) || map.containsKey(irecipe.getId())) {
+ throw new IllegalStateException("Duplicate recipe ignored with ID " + irecipe.getId());
+ if (byName.containsKey(irecipe.id()) || map.containsKey(irecipe.id())) {
+ throw new IllegalStateException("Duplicate recipe ignored with ID " + irecipe.id());
+ } else {
+ map.putAndMoveToFirst(irecipe.getId(), irecipe); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+ byName.put(irecipe.getId(), irecipe);
+ map.putAndMoveToFirst(irecipe.id(), irecipe); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+ byName.put(irecipe.id(), irecipe);
+ }
+ }
+ // CraftBukkit end
@@ -71,69 +71,43 @@
return this.hasErrors;
}
public <C extends IInventory, T extends IRecipe<C>> Optional<T> getRecipeFor(Recipes<T> recipes, C c0, World world) {
- return this.byType(recipes).values().stream().filter((irecipe) -> {
public <C extends IInventory, T extends IRecipe<C>> Optional<RecipeHolder<T>> getRecipeFor(Recipes<T> recipes, C c0, World world) {
- return this.byType(recipes).values().stream().filter((recipeholder) -> {
+ // CraftBukkit start
+ Optional<T> recipe = this.byType(recipes).values().stream().filter((irecipe) -> {
return irecipe.matches(c0, world);
+ Optional<RecipeHolder<T>> recipe = this.byType(recipes).values().stream().filter((recipeholder) -> {
return recipeholder.value().matches(c0, world);
}).findFirst();
+ c0.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found
+ // CraftBukkit end
+ return recipe;
+ // CraftBukkit end
}
public <C extends IInventory, T extends IRecipe<C>> Optional<Pair<MinecraftKey, T>> getRecipeFor(Recipes<T> recipes, C c0, World world, @Nullable MinecraftKey minecraftkey) {
Map<MinecraftKey, T> map = this.byType(recipes);
if (minecraftkey != null) {
- T t0 = (IRecipe) map.get(minecraftkey);
+ T t0 = map.get(minecraftkey); // CraftBukkit - decompile error
if (t0 != null && t0.matches(c0, world)) {
return Optional.of(Pair.of(minecraftkey, t0));
@@ -99,7 +125,7 @@
return map.entrySet().stream().filter((entry) -> {
return ((IRecipe) entry.getValue()).matches(c0, world);
}).findFirst().map((entry) -> {
- return Pair.of((MinecraftKey) entry.getKey(), (IRecipe) entry.getValue());
+ return Pair.of((MinecraftKey) entry.getKey(), entry.getValue()); // CraftBukkit - decompile error
});
public <C extends IInventory, T extends IRecipe<C>> Optional<Pair<MinecraftKey, RecipeHolder<T>>> getRecipeFor(Recipes<T> recipes, C c0, World world, @Nullable MinecraftKey minecraftkey) {
@@ -119,7 +145,7 @@
}
@@ -116,7 +142,7 @@
}
private <C extends IInventory, T extends IRecipe<C>> Map<MinecraftKey, T> byType(Recipes<T> recipes) {
private <C extends IInventory, T extends IRecipe<C>> Map<MinecraftKey, RecipeHolder<T>> byType(Recipes<T> recipes) {
- return (Map) this.recipes.getOrDefault(recipes, Collections.emptyMap());
+ return (Map) this.recipes.getOrDefault(recipes, new Object2ObjectLinkedOpenHashMap<>()); // CraftBukkit
}
public <C extends IInventory, T extends IRecipe<C>> NonNullList<ItemStack> getRemainingItemsFor(Recipes<T> recipes, C c0, World world) {
@@ -136,7 +162,7 @@
}
@@ -166,12 +192,12 @@
public Optional<? extends IRecipe<?>> byKey(MinecraftKey minecraftkey) {
- return Optional.ofNullable((IRecipe) this.byName.get(minecraftkey));
+ return Optional.ofNullable(this.byName.get(minecraftkey)); // CraftBukkit - decompile error
}
public Collection<IRecipe<?>> getRecipes() {
@@ -161,12 +187,12 @@
public void replaceRecipes(Iterable<IRecipe<?>> iterable) {
public void replaceRecipes(Iterable<RecipeHolder<?>> iterable) {
this.hasErrors = false;
- Map<Recipes<?>, Map<MinecraftKey, IRecipe<?>>> map = Maps.newHashMap();
+ Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe<?>>> map = Maps.newHashMap(); // CraftBukkit
Builder<MinecraftKey, IRecipe<?>> builder = ImmutableMap.builder();
- Map<Recipes<?>, Map<MinecraftKey, RecipeHolder<?>>> map = Maps.newHashMap();
+ Map<Recipes<?>, Object2ObjectLinkedOpenHashMap<MinecraftKey, RecipeHolder<?>>> map = Maps.newHashMap(); // CraftBukkit
Builder<MinecraftKey, RecipeHolder<?>> builder = ImmutableMap.builder();
iterable.forEach((irecipe) -> {
Map<MinecraftKey, IRecipe<?>> map1 = (Map) map.computeIfAbsent(irecipe.getType(), (recipes) -> {
iterable.forEach((recipeholder) -> {
Map<MinecraftKey, RecipeHolder<?>> map1 = (Map) map.computeIfAbsent(recipeholder.value().getType(), (recipes) -> {
- return Maps.newHashMap();
+ return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
});
MinecraftKey minecraftkey = irecipe.getId();
IRecipe<?> irecipe1 = (IRecipe) map1.put(minecraftkey, irecipe);
@@ -177,8 +203,28 @@
MinecraftKey minecraftkey = recipeholder.id();
RecipeHolder<?> recipeholder1 = (RecipeHolder) map1.put(minecraftkey, recipeholder);
@@ -182,8 +208,28 @@
}
});
this.recipes = ImmutableMap.copyOf(map);
@@ -143,7 +117,7 @@
+
+ // CraftBukkit start
+ public boolean removeRecipe(MinecraftKey mcKey) {
+ for (Object2ObjectLinkedOpenHashMap<MinecraftKey, IRecipe<?>> recipes : recipes.values()) {
+ for (Object2ObjectLinkedOpenHashMap<MinecraftKey, RecipeHolder<?>> recipes : recipes.values()) {
+ recipes.remove(mcKey);
+ }
+
@@ -163,12 +137,3 @@
public static <C extends IInventory, T extends IRecipe<C>> CraftingManager.a<C, T> createCheck(final Recipes<T> recipes) {
return new CraftingManager.a<C, T>() {
@@ -194,7 +240,7 @@
Pair<MinecraftKey, T> pair = (Pair) optional.get();
this.lastRecipe = (MinecraftKey) pair.getFirst();
- return Optional.of((IRecipe) pair.getSecond());
+ return Optional.of(pair.getSecond()); // CraftBukkit - decompile error
} else {
return Optional.empty();
}

12
paper-server/nms-patches/net/minecraft/world/item/crafting/FurnaceRecipe.patch
View File

@@ -1,31 +1,31 @@
--- a/net/minecraft/world/item/crafting/FurnaceRecipe.java
+++ b/net/minecraft/world/item/crafting/FurnaceRecipe.java
@@ -4,6 +4,14 @@
@@ -3,6 +3,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Blocks;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftFurnaceRecipe;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class FurnaceRecipe extends RecipeCooking {
public FurnaceRecipe(MinecraftKey minecraftkey, String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -19,4 +27,17 @@
public FurnaceRecipe(String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -18,4 +26,17 @@
public RecipeSerializer<?> getSerializer() {
return RecipeSerializer.SMELTING_RECIPE;
}
+
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+
+ CraftFurnaceRecipe recipe = new CraftFurnaceRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ CraftFurnaceRecipe recipe = new CraftFurnaceRecipe(id, result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ recipe.setGroup(this.group);
+ recipe.setCategory(CraftRecipe.getCategory(this.category()));
+

4
paper-server/nms-patches/net/minecraft/world/item/crafting/IRecipe.patch
View File

@@ -1,9 +1,9 @@
--- a/net/minecraft/world/item/crafting/IRecipe.java
+++ b/net/minecraft/world/item/crafting/IRecipe.java
@@ -66,4 +66,6 @@
@@ -63,4 +63,6 @@
return recipeitemstack.getItems().length == 0;
});
}
+
+ org.bukkit.inventory.Recipe toBukkitRecipe(); // CraftBukkit
+ org.bukkit.inventory.Recipe toBukkitRecipe(org.bukkit.NamespacedKey id); // CraftBukkit
}

18
paper-server/nms-patches/net/minecraft/world/item/crafting/IRecipeComplex.patch
View File

@@ -1,14 +1,26 @@
--- a/net/minecraft/world/item/crafting/IRecipeComplex.java
+++ b/net/minecraft/world/item/crafting/IRecipeComplex.java
@@ -33,4 +33,11 @@
@@ -3,6 +3,11 @@
import net.minecraft.core.IRegistryCustom;
import net.minecraft.world.item.ItemStack;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public abstract class IRecipeComplex implements RecipeCrafting {
private final CraftingBookCategory category;
@@ -25,4 +30,11 @@
public CraftingBookCategory category() {
return this.category;
}
+
+ // CraftBukkit start
+ @Override
+ public org.bukkit.inventory.Recipe toBukkitRecipe() {
+ return new org.bukkit.craftbukkit.inventory.CraftComplexRecipe(this);
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ return new org.bukkit.craftbukkit.inventory.CraftComplexRecipe(id, this);
+ }
+ // CraftBukkit end
}

12
paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeBlasting.patch
View File

@@ -1,31 +1,31 @@
--- a/net/minecraft/world/item/crafting/RecipeBlasting.java
+++ b/net/minecraft/world/item/crafting/RecipeBlasting.java
@@ -4,6 +4,14 @@
@@ -3,6 +3,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Blocks;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftBlastingRecipe;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class RecipeBlasting extends RecipeCooking {
public RecipeBlasting(MinecraftKey minecraftkey, String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -19,4 +27,17 @@
public RecipeBlasting(String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -18,4 +26,17 @@
public RecipeSerializer<?> getSerializer() {
return RecipeSerializer.BLASTING_RECIPE;
}
+
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+
+ CraftBlastingRecipe recipe = new CraftBlastingRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ CraftBlastingRecipe recipe = new CraftBlastingRecipe(id, result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ recipe.setGroup(this.group);
+ recipe.setCategory(CraftRecipe.getCategory(this.category()));
+

12
paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeCampfire.patch
View File

@@ -1,31 +1,31 @@
--- a/net/minecraft/world/item/crafting/RecipeCampfire.java
+++ b/net/minecraft/world/item/crafting/RecipeCampfire.java
@@ -4,6 +4,14 @@
@@ -3,6 +3,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Blocks;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftCampfireRecipe;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class RecipeCampfire extends RecipeCooking {
public RecipeCampfire(MinecraftKey minecraftkey, String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -19,4 +27,17 @@
public RecipeCampfire(String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -18,4 +26,17 @@
public RecipeSerializer<?> getSerializer() {
return RecipeSerializer.CAMPFIRE_COOKING_RECIPE;
}
+
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+
+ CraftCampfireRecipe recipe = new CraftCampfireRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ CraftCampfireRecipe recipe = new CraftCampfireRecipe(id, result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ recipe.setGroup(this.group);
+ recipe.setCategory(CraftRecipe.getCategory(this.category()));
+

20
paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeHolder.patch Normal file
View File

@@ -0,0 +1,20 @@
--- a/net/minecraft/world/item/crafting/RecipeHolder.java
+++ b/net/minecraft/world/item/crafting/RecipeHolder.java
@@ -2,7 +2,16 @@
import net.minecraft.resources.MinecraftKey;
-public record RecipeHolder<T extends IRecipe<?>> (MinecraftKey id, T value) {
+// CraftBukkit start
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+
+public record RecipeHolder<T extends IRecipe<?>>(MinecraftKey id, T value) {
+
+ public final Recipe toBukkitRecipe() {
+ return this.value.toBukkitRecipe(CraftNamespacedKey.fromMinecraft(this.id));
+ }
+ // CraftBukkit end
public boolean equals(Object object) {
if (this == object) {

6
paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeItemStack.patch
View File

@@ -5,10 +5,10 @@
@Nullable
private IntList stackingIds;
+ public boolean exact; // CraftBukkit
public static final Codec<RecipeItemStack> CODEC = codec(true);
public static final Codec<RecipeItemStack> CODEC_NONEMPTY = codec(false);
public RecipeItemStack(Stream<? extends RecipeItemStack.Provider> stream) {
this.values = (RecipeItemStack.Provider[]) stream.toArray((i) -> {
@@ -69,6 +70,15 @@
@@ -75,6 +76,15 @@
for (int j = 0; j < i; ++j) {
ItemStack itemstack1 = aitemstack[j];

12
paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeSmoking.patch
View File

@@ -1,31 +1,31 @@
--- a/net/minecraft/world/item/crafting/RecipeSmoking.java
+++ b/net/minecraft/world/item/crafting/RecipeSmoking.java
@@ -4,6 +4,14 @@
@@ -3,6 +3,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Blocks;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.inventory.CraftSmokingRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class RecipeSmoking extends RecipeCooking {
public RecipeSmoking(MinecraftKey minecraftkey, String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -19,4 +27,17 @@
public RecipeSmoking(String s, CookingBookCategory cookingbookcategory, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -18,4 +26,17 @@
public RecipeSerializer<?> getSerializer() {
return RecipeSerializer.SMOKING_RECIPE;
}
+
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+
+ CraftSmokingRecipe recipe = new CraftSmokingRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ CraftSmokingRecipe recipe = new CraftSmokingRecipe(id, result, CraftRecipe.toBukkit(this.ingredient), this.experience, this.cookingTime);
+ recipe.setGroup(this.group);
+ recipe.setCategory(CraftRecipe.getCategory(this.category()));
+

12
paper-server/nms-patches/net/minecraft/world/item/crafting/RecipeStonecutting.patch
View File

@@ -1,31 +1,31 @@
--- a/net/minecraft/world/item/crafting/RecipeStonecutting.java
+++ b/net/minecraft/world/item/crafting/RecipeStonecutting.java
@@ -6,6 +6,14 @@
@@ -5,6 +5,14 @@
import net.minecraft.world.level.World;
import net.minecraft.world.level.block.Blocks;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.inventory.CraftStonecuttingRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class RecipeStonecutting extends RecipeSingleItem {
public RecipeStonecutting(MinecraftKey minecraftkey, String s, RecipeItemStack recipeitemstack, ItemStack itemstack) {
@@ -21,4 +29,16 @@
public RecipeStonecutting(String s, RecipeItemStack recipeitemstack, ItemStack itemstack) {
@@ -20,4 +28,16 @@
public ItemStack getToastSymbol() {
return new ItemStack(Blocks.STONECUTTER);
}
+
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+
+ CraftStonecuttingRecipe recipe = new CraftStonecuttingRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.ingredient));
+ CraftStonecuttingRecipe recipe = new CraftStonecuttingRecipe(id, result, CraftRecipe.toBukkit(this.ingredient));
+ recipe.setGroup(this.group);
+
+ return recipe;

18
paper-server/nms-patches/net/minecraft/world/item/crafting/ShapedRecipes.patch
View File

@@ -1,10 +1,11 @@
--- a/net/minecraft/world/item/crafting/ShapedRecipes.java
+++ b/net/minecraft/world/item/crafting/ShapedRecipes.java
@@ -24,6 +24,13 @@
import net.minecraft.world.item.Items;
@@ -18,6 +18,14 @@
import net.minecraft.world.level.World;
import org.apache.commons.lang3.NotImplementedException;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.inventory.CraftShapedRecipe;
@@ -14,14 +15,15 @@
public class ShapedRecipes implements RecipeCrafting {
final int width;
@@ -50,6 +57,67 @@
this(minecraftkey, s, craftingbookcategory, i, j, nonnulllist, itemstack, true);
@@ -42,6 +50,68 @@
this(s, craftingbookcategory, i, j, nonnulllist, itemstack, true);
}
+ // CraftBukkit start
+ public org.bukkit.inventory.ShapedRecipe toBukkitRecipe() {
+ @Override
+ public org.bukkit.inventory.ShapedRecipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+ CraftShapedRecipe recipe = new CraftShapedRecipe(result, this);
+ CraftShapedRecipe recipe = new CraftShapedRecipe(id, result, this);
+ recipe.setGroup(this.group);
+ recipe.setCategory(CraftRecipe.getCategory(this.category()));
+
@@ -80,5 +82,5 @@
+ // CraftBukkit end
+
@Override
public MinecraftKey getId() {
return this.id;
public RecipeSerializer<?> getSerializer() {
return RecipeSerializer.SHAPED_RECIPE;

16
paper-server/nms-patches/net/minecraft/world/item/crafting/ShapelessRecipes.patch
View File

@@ -1,10 +1,11 @@
--- a/net/minecraft/world/item/crafting/ShapelessRecipes.java
+++ b/net/minecraft/world/item/crafting/ShapelessRecipes.java
@@ -15,6 +15,12 @@
@@ -14,6 +14,13 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe;
@@ -12,16 +13,17 @@
+
public class ShapelessRecipes implements RecipeCrafting {
private final MinecraftKey id;
@@ -31,6 +37,21 @@
final String group;
@@ -28,6 +35,22 @@
this.ingredients = nonnulllist;
}
+ // CraftBukkit start
+ @SuppressWarnings("unchecked")
+ public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe() {
+ @Override
+ public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+ CraftShapelessRecipe recipe = new CraftShapelessRecipe(result, this);
+ CraftShapelessRecipe recipe = new CraftShapelessRecipe(id, result, this);
+ recipe.setGroup(this.group);
+ recipe.setCategory(CraftRecipe.getCategory(this.category()));
+
@@ -33,5 +35,5 @@
+ // CraftBukkit end
+
@Override
public MinecraftKey getId() {
return this.id;
public RecipeSerializer<?> getSerializer() {
return RecipeSerializer.SHAPELESS_RECIPE;

14
paper-server/nms-patches/net/minecraft/world/item/crafting/SmithingTransformRecipe.patch
View File

@@ -1,30 +1,30 @@
--- a/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
+++ b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
@@ -11,6 +11,14 @@
@@ -10,6 +10,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.inventory.CraftSmithingTransformRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class SmithingTransformRecipe implements SmithingRecipe {
private final MinecraftKey id;
@@ -79,6 +87,17 @@
final RecipeItemStack template;
@@ -71,6 +79,17 @@
return Stream.of(this.template, this.base, this.addition).anyMatch(RecipeItemStack::isEmpty);
}
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+
+ CraftSmithingTransformRecipe recipe = new CraftSmithingTransformRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition));
+ CraftSmithingTransformRecipe recipe = new CraftSmithingTransformRecipe(id, result, CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition));
+
+ return recipe;
+ }
@@ -32,4 +32,4 @@
+
public static class a implements RecipeSerializer<SmithingTransformRecipe> {
public a() {}
private static final Codec<SmithingTransformRecipe> CODEC = RecordCodecBuilder.create((instance) -> {

14
paper-server/nms-patches/net/minecraft/world/item/crafting/SmithingTrimRecipe.patch
View File

@@ -1,30 +1,30 @@
--- a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
+++ b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
@@ -19,6 +19,13 @@
@@ -18,6 +18,13 @@
import net.minecraft.world.item.armortrim.TrimPatterns;
import net.minecraft.world.level.World;
+// CraftBukkit start
+import org.bukkit.NamespacedKey;
+import org.bukkit.craftbukkit.inventory.CraftRecipe;
+import org.bukkit.craftbukkit.inventory.CraftSmithingTrimRecipe;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class SmithingTrimRecipe implements SmithingRecipe {
private final MinecraftKey id;
@@ -115,6 +122,13 @@
final RecipeItemStack template;
@@ -107,6 +114,13 @@
return Stream.of(this.template, this.base, this.addition).anyMatch(RecipeItemStack::isEmpty);
}
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ return new CraftSmithingTrimRecipe(CraftNamespacedKey.fromMinecraft(this.id), CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition));
+ public Recipe toBukkitRecipe(NamespacedKey id) {
+ return new CraftSmithingTrimRecipe(id, CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition));
+ }
+ // CraftBukkit end
+
public static class a implements RecipeSerializer<SmithingTrimRecipe> {
public a() {}
private static final Codec<SmithingTrimRecipe> CODEC = RecordCodecBuilder.create((instance) -> {