From 8ebcf2352ac7d4a940ee1ec799972a22ef28906f Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 13 Jan 2022 15:50:11 +0300 Subject: [PATCH] Added recipes into named map --- .../java/ru/bclib/mixin/common/MinecraftServerMixin.java | 5 ++++- src/main/java/ru/bclib/recipes/BCLRecipeManager.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/bclib/mixin/common/MinecraftServerMixin.java b/src/main/java/ru/bclib/mixin/common/MinecraftServerMixin.java index e8a7de95..d025e53f 100644 --- a/src/main/java/ru/bclib/mixin/common/MinecraftServerMixin.java +++ b/src/main/java/ru/bclib/mixin/common/MinecraftServerMixin.java @@ -21,6 +21,7 @@ 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 ru.bclib.BCLib; import ru.bclib.api.dataexchange.DataExchangeAPI; import ru.bclib.recipes.BCLRecipeManager; @@ -59,7 +60,9 @@ public class MinecraftServerMixin { private void bclib_injectRecipes() { RecipeManagerAccessor accessor = (RecipeManagerAccessor) resources.getRecipeManager(); + if (!BCLib.isClient()) { + accessor.bclib_setRecipesByName(BCLRecipeManager.getMapByName(accessor.bclib_getRecipesByName())); + } accessor.bclib_setRecipes(BCLRecipeManager.getMap(accessor.bclib_getRecipes())); - accessor.bclib_setRecipesByName(BCLRecipeManager.getMapByName(accessor.bclib_getRecipesByName())); } } diff --git a/src/main/java/ru/bclib/recipes/BCLRecipeManager.java b/src/main/java/ru/bclib/recipes/BCLRecipeManager.java index 3aca10d2..f1577458 100644 --- a/src/main/java/ru/bclib/recipes/BCLRecipeManager.java +++ b/src/main/java/ru/bclib/recipes/BCLRecipeManager.java @@ -63,7 +63,7 @@ public class BCLRecipeManager { public static Map> getMapByName(Map> recipes) { Map> result = CollectionsUtil.getMutable(recipes); RECIPES.values().forEach(map -> map.forEach((location, recipe) -> { - if (!recipes.containsKey(location)) { + if (!result.containsKey(location)) { result.put(location, recipe); } }));