mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 07:59:26 +00:00
52 lines
2.7 KiB
Diff
52 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: nostalgic853 <yuu8583@proton.me>
|
|
Date: Tue, 25 Oct 2022 00:57:45 +0800
|
|
Subject: [PATCH] Carpet-Fixes: Use optimized RecipeManager
|
|
|
|
This patch is based on the following mixin:
|
|
"carpetfixes/mixins/optimizations/RecipeManager_fasterMixin.java"
|
|
By: fxmorin <28154542+fxmorin@users.noreply.github.com>
|
|
|
|
Original license: MIT
|
|
Original project: https://github.com/fxmorin/carpet-fixes
|
|
|
|
Optimized the RecipeManager getFirstMatch call to be up to 3x faster
|
|
This is a fully vanilla optimization. Improves: [Blast]Furnace/Campfire/Smoker/Stonecutter/Crafting/Sheep Color Choosing
|
|
This was mostly made for the auto crafting table, since the performance boost is much more visible while using that mod
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
|
|
index de7c77c1b25680ecc65f0f43f2391aff269a974f..febf87b14125925f548393360e89077329a6c522 100644
|
|
--- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
|
|
+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
|
|
@@ -128,16 +128,24 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
|
|
}
|
|
|
|
public <I extends RecipeInput, T extends Recipe<I>> List<RecipeHolder<T>> getAllRecipesFor(RecipeType<T> type) {
|
|
- return List.copyOf(this.byType(type));
|
|
+ return new java.util.ArrayList<>(this.byType(type)); // Leaf - Carpet-Fixes
|
|
}
|
|
|
|
+ // Leaf start - Remove streams to be faster
|
|
public <I extends RecipeInput, T extends Recipe<I>> List<RecipeHolder<T>> getRecipesFor(RecipeType<T> type, I input, Level world) {
|
|
- return (List) this.byType(type).stream().filter((recipeholder) -> {
|
|
- return recipeholder.value().matches(input, world);
|
|
- }).sorted(Comparator.comparing((recipeholder) -> {
|
|
- return recipeholder.value().getResultItem(world.registryAccess()).getDescriptionId();
|
|
- })).collect(Collectors.toList());
|
|
+ List<RecipeHolder<T>> list = new java.util.ArrayList<>();
|
|
+
|
|
+ for (RecipeHolder<T> recipeholder : this.byType(type)) {
|
|
+ if (recipeholder.value().matches(input, world)) {
|
|
+ list.add(recipeholder);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ list.sort(Comparator.comparing((recipeholder) -> recipeholder.value().getResultItem(world.registryAccess()).getDescriptionId()));
|
|
+
|
|
+ return list;
|
|
}
|
|
+ // Leaf end - Remove streams to be faster
|
|
|
|
private <I extends RecipeInput, T extends Recipe<I>> Collection<RecipeHolder<T>> byType(RecipeType<T> type) {
|
|
return (Collection) this.byType.get(type); // CraftBukkit - decompile error
|