craftbukkit/nms-patches/net/minecraft/world/item/crafting/CraftingManager.patch

85 lines
3.4 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/item/crafting/CraftingManager.java
+++ b/net/minecraft/world/item/crafting/CraftingManager.java
2025-03-26 03:05:00 +11:00
@@ -38,6 +38,11 @@
2022-03-01 02:00:00 +11:00
import net.minecraft.world.level.World;
import org.slf4j.Logger;
2019-06-21 20:00:00 +10:00
2023-12-06 03:40:00 +11:00
+// CraftBukkit start
2024-10-23 02:15:00 +11:00
+import java.util.Collections;
+import net.minecraft.server.MinecraftServer;
2023-12-06 03:40:00 +11:00
+// CraftBukkit end
2019-06-21 20:00:00 +10:00
+
2024-10-23 02:15:00 +11:00
public class CraftingManager extends ResourceDataAbstract<RecipeMap> implements RecipeAccess {
2019-06-21 20:00:00 +10:00
2024-10-23 02:15:00 +11:00
private static final Logger LOGGER = LogUtils.getLogger();
2025-03-26 03:05:00 +11:00
@@ -110,7 +115,25 @@
2024-10-23 02:15:00 +11:00
CraftingManager.LOGGER.info("Loaded {} recipes", recipemap.values().size());
}
2019-06-21 20:00:00 +10:00
+ // CraftBukkit start
2023-09-22 02:40:00 +10:00
+ public void addRecipe(RecipeHolder<?> irecipe) {
2024-10-23 02:15:00 +11:00
+ this.recipes.addRecipe(irecipe);
+ finalizeRecipeLoading();
+ }
2019-06-21 20:00:00 +10:00
+
2024-10-23 02:15:00 +11:00
+ private FeatureFlagSet featureflagset;
+
+ public void finalizeRecipeLoading() {
+ if (featureflagset != null) {
+ finalizeRecipeLoading(featureflagset);
+
+ MinecraftServer.getServer().getPlayerList().reloadRecipes();
2019-06-21 20:00:00 +10:00
+ }
+ }
+
2024-10-23 02:15:00 +11:00
public void finalizeRecipeLoading(FeatureFlagSet featureflagset) {
+ this.featureflagset = featureflagset;
2024-04-24 01:15:00 +10:00
+ // CraftBukkit end
2024-10-23 02:15:00 +11:00
List<SelectableRecipe.a<RecipeStonecutting>> list = new ArrayList();
List<CraftingManager.b> list1 = CraftingManager.RECIPE_PROPERTY_SETS.entrySet().stream().map((entry) -> {
return new CraftingManager.b((ResourceKey) entry.getKey(), (CraftingManager.c) entry.getValue());
2025-03-26 03:05:00 +11:00
@@ -171,7 +194,10 @@
2019-04-23 12:00:00 +10:00
}
2024-10-23 02:15:00 +11:00
public <I extends RecipeInput, T extends IRecipe<I>> Optional<RecipeHolder<T>> getRecipeFor(Recipes<T> recipes, I i0, World world) {
- return this.recipes.getRecipesFor(recipes, i0, world).findFirst();
+ // CraftBukkit start
+ List<RecipeHolder<T>> list = this.recipes.getRecipesFor(recipes, i0, world).toList();
+ return (list.isEmpty()) ? Optional.empty() : Optional.of(list.getLast()); // CraftBukkit - SPIGOT-4638: last recipe gets priority
+ // CraftBukkit end
2019-04-23 12:00:00 +10:00
}
2015-02-26 22:41:06 +00:00
2024-10-23 02:15:00 +11:00
public Optional<RecipeHolder<?>> byKey(ResourceKey<IRecipe<?>> resourcekey) {
2025-03-26 03:05:00 +11:00
@@ -182,7 +208,7 @@
2024-10-23 02:15:00 +11:00
private <T extends IRecipe<?>> RecipeHolder<T> byKeyTyped(Recipes<T> recipes, ResourceKey<IRecipe<?>> resourcekey) {
RecipeHolder<?> recipeholder = this.recipes.byKey(resourcekey);
2021-06-11 15:00:00 +10:00
2024-04-24 01:15:00 +10:00
- return recipeholder != null && recipeholder.value().getType().equals(recipes) ? recipeholder : null;
+ return recipeholder != null && recipeholder.value().getType().equals(recipes) ? (RecipeHolder) recipeholder : null; // CraftBukkit - decompile error
}
2021-06-11 15:00:00 +10:00
2024-10-23 02:15:00 +11:00
public Map<ResourceKey<RecipePropertySet>, RecipePropertySet> getSynchronizedItemProperties() {
2025-03-26 03:05:00 +11:00
@@ -230,6 +256,22 @@
return new RecipeHolder(resourcekey, irecipe);
2024-10-23 02:15:00 +11:00
}
2024-04-24 01:15:00 +10:00
2019-06-21 20:00:00 +10:00
+ // CraftBukkit start
2024-10-23 02:15:00 +11:00
+ public boolean removeRecipe(ResourceKey<IRecipe<?>> mcKey) {
+ boolean removed = this.recipes.removeRecipe(mcKey);
+ if (removed) {
+ finalizeRecipeLoading();
+ }
+
2024-10-23 02:15:00 +11:00
+ return removed;
+ }
+
+ public void clearRecipes() {
2024-10-23 02:15:00 +11:00
+ this.recipes = RecipeMap.create(Collections.emptyList());
+ finalizeRecipeLoading();
2023-09-22 02:57:13 +10:00
+ }
2019-06-21 20:00:00 +10:00
+ // CraftBukkit end
2023-09-22 02:57:13 +10:00
+
2024-06-14 01:05:00 +10:00
public static <I extends RecipeInput, T extends IRecipe<I>> CraftingManager.a<I, T> createCheck(final Recipes<T> recipes) {
return new CraftingManager.a<I, T>() {
2023-09-22 02:57:13 +10:00
@Nullable