From 6c6ed4c55b4b3d4844372f125cf863a45d16d557 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 6 Jul 2023 02:12:14 +0200 Subject: [PATCH] [Change] if multiple results are possible for a crafting recipe, select the ones from a mod first. --- .../mixin/common/RecipeManagerMixin.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java index d78dcbef..9474601e 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java @@ -5,18 +5,28 @@ import org.betterx.bclib.recipes.BCLRecipeManager; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.util.profiling.ProfilerFiller; +import net.minecraft.world.Container; +import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeManager; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.Level; import com.google.gson.JsonElement; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.Map; +import java.util.Optional; @Mixin(RecipeManager.class) public abstract class RecipeManagerMixin { + @Shadow + protected abstract > Map byType(RecipeType recipeType); + @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At("HEAD")) public void bcl_interceptApply( Map map, @@ -27,4 +37,31 @@ public abstract class RecipeManagerMixin { BCLRecipeManager.removeDisabledRecipes(resourceManager, map); } + @Inject(method = "getRecipeFor(Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/Container;Lnet/minecraft/world/level/Level;)Ljava/util/Optional;", at = @At("HEAD"), cancellable = true) + > void bcl_sort( + RecipeType recipeType, + C container, + Level level, + CallbackInfoReturnable> cir + ) { + var inter = this.byType(recipeType); + var all = inter.values().stream().filter((recipe) -> recipe.matches(container, level)).sorted((a, b) -> { + if (a.getId().getNamespace().equals(b.getId().getNamespace())) { + return a.getId().getPath().compareTo(b.getId().getPath()); + } + if (a.getId().getNamespace().equals("minecraft") && !b.getId().getNamespace().equals("minecraft")) { + return 1; + } else if (!a.getId().getNamespace().equals("minecraft") && b.getId().getNamespace().equals("minecraft")) { + return -1; + } else { + return a.getId().getNamespace().compareTo(b.getId().getNamespace()); + } + }).toList(); + + if (all.size() > 1) { + cir.setReturnValue(Optional.of(all.get(0))); + } + + } + } \ No newline at end of file