MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] if multiple results are possible for a crafting recipe, select the ones from a mod first.

Browse source
This commit is contained in:
Frank 2023-07-06 02:12:14 +02:00
parent 2b57b53791
commit 6c6ed4c55b
1 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java
View file

@ -5,18 +5,28 @@ import org.betterx.bclib.recipes.BCLRecipeManager;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.profiling.ProfilerFiller; 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.RecipeManager;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.level.Level;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import org.spongepowered.asm.mixin.Mixin; 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.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Map; import java.util.Map;
import java.util.Optional;
@Mixin(RecipeManager.class) @Mixin(RecipeManager.class)
public abstract class RecipeManagerMixin { public abstract class RecipeManagerMixin {
@Shadow
protected abstract <C extends Container, T extends Recipe<C>> Map<ResourceLocation, T> byType(RecipeType<T> recipeType);
@Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At("HEAD")) @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( public void bcl_interceptApply(
Map<ResourceLocation, JsonElement> map, Map<ResourceLocation, JsonElement> map,
@ -27,4 +37,31 @@ public abstract class RecipeManagerMixin {
BCLRecipeManager.removeDisabledRecipes(resourceManager, map); 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)
<C extends Container, T extends Recipe<C>> void bcl_sort(
RecipeType<T> recipeType,
C container,
Level level,
CallbackInfoReturnable<Optional<T>> 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)));
}
}
} }