From fffd1e5c1c52c6c7558f8f70c886941b4dbf75a9 Mon Sep 17 00:00:00 2001 From: Reider745 <70357814+Reider745@users.noreply.github.com> Date: Mon, 25 Mar 2024 18:37:46 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=82=D1=82=D0=B5=D1=80=D0=BD=D0=B0=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D1=82=D0=B0=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/reider745/InnerCoreServer.java | 1 + .../apparatus/mcpe/NativeWorkbench.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index 6587652d..42651e90 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -59,6 +59,7 @@ public class InnerCoreServer { } public static final int PROTOCOL = 422; + public static final int RECIPES_PROTOCOL = 419; public static final int EXIT_CODE_NO_INTERNAL_PACKAGE = 32; public static final int EXIT_CODE_NO_MODPACK = 33; diff --git a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java index 6cc8556b..eb9faa8e 100644 --- a/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java +++ b/src/main/java/com/zhekasmirnov/apparatus/mcpe/NativeWorkbench.java @@ -130,8 +130,17 @@ public class NativeWorkbench { } ingredients.put(ingredient.getKey(), item); } + + for(int i = 0;i < recipe.pattern.length;i++){ + if(recipe.pattern[i].length() > 3) { + Logger.warning("NativeWorkbench", "Skip recipe, error pattern: "+Arrays.toString(recipe.pattern) +", item: "+result); + accepted = false; + break; + } + } + if (accepted) { - craftingManager.registerRecipe(419, + craftingManager.registerRecipe(InnerCoreServer.RECIPES_PROTOCOL, new ShapedRecipe(result, recipe.pattern, ingredients, new ArrayList<>())); } } else { @@ -151,7 +160,7 @@ public class NativeWorkbench { ingredients.add(item); } if (accepted) { - craftingManager.registerRecipe(419, new ShapelessRecipe(result, ingredients)); + craftingManager.registerRecipe(InnerCoreServer.RECIPES_PROTOCOL, new ShapelessRecipe(result, ingredients)); } } }