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

Update to Minecraft 1.21

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
public class CraftingManager extends ResourceDataJson {
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().disableHtmlEscaping().create();
@@ -70,19 +75,39 @@
@@ -70,11 +75,26 @@
}
}
@@ -41,48 +41,32 @@
public boolean hadErrorsLoading() {
return this.hasErrors;
}
public <C extends IInventory, T extends IRecipe<C>> Optional<RecipeHolder<T>> getRecipeFor(Recipes<T> recipes, C c0, World world) {
- return this.byType(recipes).stream().filter((recipeholder) -> {
+ // CraftBukkit start
+ List<RecipeHolder<T>> list = this.byType(recipes).stream().filter((recipeholder) -> {
return recipeholder.value().matches(c0, world);
- }).findFirst();
+ }).toList();
+ Optional<RecipeHolder<T>> recipe = (list.isEmpty()) ? Optional.empty() : Optional.of(list.getLast()); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+ c0.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found
+ return recipe;
+ // CraftBukkit end
@@ -90,9 +110,13 @@
}
public <C extends IInventory, T extends IRecipe<C>> Optional<RecipeHolder<T>> getRecipeFor(Recipes<T> recipes, C c0, World world, @Nullable MinecraftKey minecraftkey) {
@@ -94,9 +119,14 @@
}
}
- return this.byType(recipes).stream().filter((recipeholder1) -> {
public <I extends RecipeInput, T extends IRecipe<I>> Optional<RecipeHolder<T>> getRecipeFor(Recipes<T> recipes, I i0, World world, @Nullable RecipeHolder<T> recipeholder) {
- return i0.isEmpty() ? Optional.empty() : (recipeholder != null && recipeholder.value().matches(i0, world) ? Optional.of(recipeholder) : this.byType(recipes).stream().filter((recipeholder1) -> {
+ // CraftBukkit start
+ List<RecipeHolder<T>> list = this.byType(recipes).stream().filter((recipeholder1) -> {
return recipeholder1.value().matches(c0, world);
- }).findFirst();
return recipeholder1.value().matches(i0, world);
- }).findFirst());
+ }).toList();
+ Optional<RecipeHolder<T>> recipe = (list.isEmpty()) ? Optional.empty() : Optional.of(list.getLast()); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+ c0.setCurrentRecipe(recipe.orElse(null)); // CraftBukkit - Clear recipe when no recipe is found
+ Optional<RecipeHolder<T>> recipe = (list.isEmpty() || i0.isEmpty()) ? Optional.empty() : (recipeholder != null && recipeholder.value().matches(i0, world) ? Optional.of(recipeholder) : Optional.of(list.getLast())); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+ return recipe;
+ // CraftBukkit end
}
public <C extends IInventory, T extends IRecipe<C>> List<RecipeHolder<T>> getAllRecipesFor(Recipes<T> recipes) {
@@ -112,7 +142,7 @@
public <I extends RecipeInput, T extends IRecipe<I>> List<RecipeHolder<T>> getAllRecipesFor(Recipes<T> recipes) {
@@ -108,7 +132,7 @@
}
private <C extends IInventory, T extends IRecipe<C>> Collection<RecipeHolder<T>> byType(Recipes<T> recipes) {
private <I extends RecipeInput, T extends IRecipe<I>> Collection<RecipeHolder<T>> byType(Recipes<T> recipes) {
- return this.byType.get(recipes);
+ return (Collection) this.byType.get(recipes); // CraftBukkit - decompile error
}
public <C extends IInventory, T extends IRecipe<C>> NonNullList<ItemStack> getRemainingItemsFor(Recipes<T> recipes, C c0, World world) {
@@ -139,7 +169,7 @@
public <I extends RecipeInput, T extends IRecipe<I>> NonNullList<ItemStack> getRemainingItemsFor(Recipes<T> recipes, I i0, World world) {
@@ -135,7 +159,7 @@
private <T extends IRecipe<?>> RecipeHolder<T> byKeyTyped(Recipes<T> recipes, MinecraftKey minecraftkey) {
RecipeHolder<?> recipeholder = (RecipeHolder) this.byName.get(minecraftkey);
@@ -91,7 +75,7 @@
}
public Collection<RecipeHolder<?>> getOrderedRecipes() {
@@ -175,10 +205,31 @@
@@ -171,10 +195,31 @@
com_google_common_collect_immutablemap_builder.put(recipeholder.id(), recipeholder);
}
@@ -101,8 +85,8 @@
+ this.byType = LinkedHashMultimap.create(builder.build());
+ this.byName = Maps.newHashMap(com_google_common_collect_immutablemap_builder.build());
+ // CraftBukkit end
}
+ }
+
+ // CraftBukkit start
+ public boolean removeRecipe(MinecraftKey mcKey) {
+ Iterator<RecipeHolder<?>> iter = byType.values().iterator();
@@ -114,14 +98,14 @@
+ }
+
+ return byName.remove(mcKey) != null;
+ }
+
}
+ public void clearRecipes() {
+ this.byType = LinkedHashMultimap.create();
+ this.byName = Maps.newHashMap();
+ }
+ // CraftBukkit end
+
public static <C extends IInventory, T extends IRecipe<C>> CraftingManager.a<C, T> createCheck(final Recipes<T> recipes) {
return new CraftingManager.a<C, T>() {
public static <I extends RecipeInput, T extends IRecipe<I>> CraftingManager.a<I, T> createCheck(final Recipes<T> recipes) {
return new CraftingManager.a<I, T>() {
@Nullable

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
@@ -72,4 +72,6 @@
@@ -71,4 +71,6 @@
return recipeitemstack.getItems().length == 0;
});
}

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/RecipeStonecutting.java
+++ b/net/minecraft/world/item/crafting/RecipeStonecutting.java
@@ -5,6 +5,14 @@
@@ -4,6 +4,14 @@
import net.minecraft.world.level.World;
import net.minecraft.world.level.block.Blocks;
@@ -15,7 +15,7 @@
public class RecipeStonecutting extends RecipeSingleItem {
public RecipeStonecutting(String s, RecipeItemStack recipeitemstack, ItemStack itemstack) {
@@ -20,4 +28,16 @@
@@ -18,4 +26,16 @@
public ItemStack getToastSymbol() {
return new ItemStack(Blocks.STONECUTTER);
}

4
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
@@ -11,6 +11,14 @@
@@ -10,6 +10,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
@@ -15,7 +15,7 @@
public class ShapedRecipes implements RecipeCrafting {
final ShapedRecipePattern pattern;
@@ -31,6 +39,68 @@
@@ -30,6 +38,68 @@
this(s, craftingbookcategory, shapedrecipepattern, itemstack, true);
}

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
@@ -15,6 +15,13 @@
@@ -13,6 +13,13 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
@@ -14,7 +14,7 @@
public class ShapelessRecipes implements RecipeCrafting {
final String group;
@@ -29,6 +36,22 @@
@@ -27,6 +34,22 @@
this.ingredients = nonnulllist;
}

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
+++ b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
@@ -10,6 +10,14 @@
@@ -9,6 +9,14 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.World;
@@ -15,7 +15,7 @@
public class SmithingTransformRecipe implements SmithingRecipe {
final RecipeItemStack template;
@@ -67,6 +75,17 @@
@@ -64,6 +72,17 @@
return Stream.of(this.template, this.base, this.addition).anyMatch(RecipeItemStack::isEmpty);
}

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

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
+++ b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
@@ -20,6 +20,13 @@
@@ -19,6 +19,13 @@
import net.minecraft.world.item.armortrim.TrimPatterns;
import net.minecraft.world.level.World;
@@ -14,7 +14,7 @@
public class SmithingTrimRecipe implements SmithingRecipe {
final RecipeItemStack template;
@@ -100,6 +107,13 @@
@@ -97,6 +104,13 @@
return Stream.of(this.template, this.base, this.addition).anyMatch(RecipeItemStack::isEmpty);
}