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

SPIGOT-8012: Keep order of recipes, particularly in stonecutter

Browse Source
This commit is contained in:
md_5 2025-03-03 21:17:09 +11:00
parent 8f3da35f71
commit 42a4fa96f0
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nms-patches/net/minecraft/world/item/crafting/RecipeMap.patch
View File

@ -1,24 +1,37 @@
--- a/net/minecraft/world/item/crafting/RecipeMap.java --- a/net/minecraft/world/item/crafting/RecipeMap.java
+++ b/net/minecraft/world/item/crafting/RecipeMap.java +++ b/net/minecraft/world/item/crafting/RecipeMap.java
@@ -12,6 +12,11 @@ @@ -12,13 +12,21 @@
import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.World; import net.minecraft.world.level.World;
+// CraftBukkit start +// CraftBukkit start
+import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Maps; +import com.google.common.collect.Maps;
+import java.util.LinkedHashMap;
+// CraftBukkit end +// CraftBukkit end
+ +
public class RecipeMap { public class RecipeMap {
public static final RecipeMap EMPTY = new RecipeMap(ImmutableMultimap.of(), Map.of()); - public static final RecipeMap EMPTY = new RecipeMap(ImmutableMultimap.of(), Map.of());
@@ -35,11 +40,39 @@ + // CraftBukkit start - ordered
+ public static final RecipeMap EMPTY = new RecipeMap(ImmutableMultimap.of(), Maps.newLinkedHashMap());
public final Multimap<Recipes<?>, RecipeHolder<?>> byType;
- private final Map<ResourceKey<IRecipe<?>>, RecipeHolder<?>> byKey;
+ private final LinkedHashMap<ResourceKey<IRecipe<?>>, RecipeHolder<?>> byKey;
- private RecipeMap(Multimap<Recipes<?>, RecipeHolder<?>> multimap, Map<ResourceKey<IRecipe<?>>, RecipeHolder<?>> map) {
+ private RecipeMap(Multimap<Recipes<?>, RecipeHolder<?>> multimap, LinkedHashMap<ResourceKey<IRecipe<?>>, RecipeHolder<?>> map) {
+ // CraftBukkit end
this.byType = multimap;
this.byKey = map;
}
@@ -35,11 +43,39 @@
com_google_common_collect_immutablemap_builder.put(recipeholder.id(), recipeholder); com_google_common_collect_immutablemap_builder.put(recipeholder.id(), recipeholder);
} }
- return new RecipeMap(builder.build(), com_google_common_collect_immutablemap_builder.build()); - return new RecipeMap(builder.build(), com_google_common_collect_immutablemap_builder.build());
+ // CraftBukkit start - mutable + // CraftBukkit start - mutable, ordered
+ return new RecipeMap(LinkedHashMultimap.create(builder.build()), Maps.newHashMap(com_google_common_collect_immutablemap_builder.build())); + return new RecipeMap(LinkedHashMultimap.create(builder.build()), Maps.newLinkedHashMap(com_google_common_collect_immutablemap_builder.build()));
+ } + }
+ +
+ public void addRecipe(RecipeHolder<?> irecipe) { + public void addRecipe(RecipeHolder<?> irecipe) {
@ -28,7 +41,7 @@
+ throw new IllegalStateException("Duplicate recipe ignored with ID " + irecipe.id()); + throw new IllegalStateException("Duplicate recipe ignored with ID " + irecipe.id());
+ } else { + } else {
+ map.add(irecipe); + map.add(irecipe);
+ byKey.put(irecipe.id(), irecipe); + byKey.putFirst(irecipe.id(), irecipe); // CraftBukkit - ordered
+ } + }
} }