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

Update to Minecraft 1.19.4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-03-15 03:30:00 +11:00
parent 90a887a912
commit 40076782ed
227 changed files with 2788 additions and 1621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/IRecipe.java
+++ b/net/minecraft/world/item/crafting/IRecipe.java
@@ -61,4 +61,6 @@
@@ -66,4 +66,6 @@
return recipeitemstack.getItems().length == 0;
});
}

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/IRecipeComplex.java
+++ b/net/minecraft/world/item/crafting/IRecipeComplex.java
@@ -32,4 +32,11 @@
@@ -33,4 +33,11 @@
public CraftingBookCategory category() {
return this.category;
}

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

@@ -1,8 +1,8 @@
--- a/net/minecraft/world/item/crafting/RecipeSmithing.java
+++ b/net/minecraft/world/item/crafting/RecipeSmithing.java
--- a/net/minecraft/world/item/crafting/LegacyUpgradeRecipe.java
+++ b/net/minecraft/world/item/crafting/LegacyUpgradeRecipe.java
@@ -11,6 +11,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
import net.minecraft.world.level.block.Blocks;
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
@@ -12,10 +12,10 @@
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class RecipeSmithing implements IRecipe<IInventory> {
final RecipeItemStack base;
@@ -83,6 +91,17 @@
/** @deprecated */
@Deprecated(forRemoval = true)
public class LegacyUpgradeRecipe implements SmithingRecipe {
@@ -86,6 +94,17 @@
});
}
@@ -30,6 +30,6 @@
+ }
+ // CraftBukkit end
+
public static class a implements RecipeSerializer<RecipeSmithing> {
public static class a implements RecipeSerializer<LegacyUpgradeRecipe> {
public a() {}

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/ShapedRecipes.java
+++ b/net/minecraft/world/item/crafting/ShapedRecipes.java
@@ -23,6 +23,13 @@
@@ -24,6 +24,13 @@
import net.minecraft.world.item.Items;
import net.minecraft.world.level.World;
@@ -14,8 +14,8 @@
public class ShapedRecipes implements RecipeCrafting {
final int width;
@@ -43,6 +50,67 @@
this.result = itemstack;
@@ -50,6 +57,67 @@
this(minecraftkey, s, craftingbookcategory, i, j, nonnulllist, itemstack, true);
}
+ // CraftBukkit start

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/ShapelessRecipes.java
+++ b/net/minecraft/world/item/crafting/ShapelessRecipes.java
@@ -14,6 +14,12 @@
@@ -15,6 +15,12 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
@@ -13,7 +13,7 @@
public class ShapelessRecipes implements RecipeCrafting {
private final MinecraftKey id;
@@ -30,6 +36,21 @@
@@ -31,6 +37,21 @@
this.ingredients = nonnulllist;
}

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

@@ -0,0 +1,35 @@
--- a/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
+++ b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
@@ -11,6 +11,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
+// CraftBukkit start
+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 @@
return Stream.of(this.template, this.base, this.addition).anyMatch(RecipeItemStack::isEmpty);
}
+ // CraftBukkit start
+ @Override
+ public Recipe toBukkitRecipe() {
+ 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));
+
+ return recipe;
+ }
+ // CraftBukkit end
+
public static class a implements RecipeSerializer<SmithingTransformRecipe> {
public a() {}

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

@@ -0,0 +1,30 @@
--- a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
+++ b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
@@ -19,6 +19,13 @@
import net.minecraft.world.item.armortrim.TrimPatterns;
import net.minecraft.world.level.World;
+// CraftBukkit start
+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 @@
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));
+ }
+ // CraftBukkit end
+
public static class a implements RecipeSerializer<SmithingTrimRecipe> {
public a() {}