From 5b5b244a3837b17e899da80b3e826a7f09ab51b0 Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Thu, 21 Apr 2022 17:34:59 +0200 Subject: [PATCH 1/2] Fix recipy cleanup on 1.18 --- .../serverutils/bukkit/reflection/RCraftingManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RCraftingManager.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RCraftingManager.java index 6c97bee..eb77ae3 100644 --- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RCraftingManager.java +++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RCraftingManager.java @@ -52,6 +52,11 @@ public class RCraftingManager { Collection list = (Collection) recipes.values(); list.forEach(map -> MapUtils.removeKeys(map, predicate)); } + + if (MinecraftReflectionVersion.MINOR >= 18) { + Map byName = reflection.get(craftingManager, "d"); + MapUtils.removeKeys(byName, predicate); + } } } } From cae70469087e9b1f724aecf81f3cd72defb199d0 Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Thu, 21 Apr 2022 18:04:11 +0200 Subject: [PATCH 2/2] 1.18 MinecraftKey namespace a -> b --- .../serverutils/bukkit/reflection/RMinecraftKey.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RMinecraftKey.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RMinecraftKey.java index c194410..e65ba60 100644 --- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RMinecraftKey.java +++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RMinecraftKey.java @@ -36,7 +36,7 @@ public class RMinecraftKey { } else if (MinecraftReflectionVersion.MINOR == 17) { return reflection.invoke(instance, "getNamespace"); } else if (MinecraftReflectionVersion.MINOR >= 18) { - return reflection.invoke(instance, "a"); + return reflection.invoke(instance, "b"); } return reflection.get(instance, "namespace"); }