diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index 9da0bee94..78efcd56d 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -98,6 +98,7 @@ tasks { relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") + relocate("io.leangen.geantyref", "net.momirealms.craftengine.libraries.geantyref") } } diff --git a/bukkit/loader/build.gradle.kts b/bukkit/loader/build.gradle.kts index cc6493188..9e4762b96 100644 --- a/bukkit/loader/build.gradle.kts +++ b/bukkit/loader/build.gradle.kts @@ -76,5 +76,6 @@ tasks { relocate("software.amazon.eventstream", "net.momirealms.craftengine.libraries.eventstream") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") + relocate("io.leangen.geantyref", "net.momirealms.craftengine.libraries.geantyref") } } diff --git a/bukkit/paper-loader/build.gradle.kts b/bukkit/paper-loader/build.gradle.kts index 734d68c50..ac2894f04 100644 --- a/bukkit/paper-loader/build.gradle.kts +++ b/bukkit/paper-loader/build.gradle.kts @@ -148,5 +148,6 @@ tasks { relocate("software.amazon.eventstream", "net.momirealms.craftengine.libraries.eventstream") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") + relocate("io.leangen.geantyref", "net.momirealms.craftengine.libraries.geantyref") } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index ceff97962..d41f1c2f1 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -98,6 +98,7 @@ tasks { relocate("com.ezylang.evalex", "net.momirealms.craftengine.libraries.evalex") relocate("com.google.common.jimfs", "net.momirealms.craftengine.libraries.jimfs") relocate("org.apache.commons", "net.momirealms.craftengine.libraries.commons") + relocate("io.leangen.geantyref", "net.momirealms.craftengine.libraries.geantyref") } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/Config.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/Config.java index 245813e8d..23ab0aaeb 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/Config.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/Config.java @@ -129,6 +129,7 @@ public class Config { protected boolean recipe$enable; protected boolean recipe$disable_vanilla_recipes$all; protected Set recipe$disable_vanilla_recipes$list; + protected List recipe$ingredient_sources; protected boolean image$illegal_characters_filter$command; protected boolean image$illegal_characters_filter$chat; @@ -370,6 +371,7 @@ public class Config { recipe$enable = config.getBoolean("recipe.enable", true); recipe$disable_vanilla_recipes$all = config.getBoolean("recipe.disable-vanilla-recipes.all", false); recipe$disable_vanilla_recipes$list = config.getStringList("recipe.disable-vanilla-recipes.list").stream().map(Key::of).collect(Collectors.toSet()); + recipe$ingredient_sources = config.getStringList("recipe.ingredient-sources"); // image image$illegal_characters_filter$anvil = config.getBoolean("image.illegal-characters-filter.anvil", true); @@ -820,6 +822,10 @@ public class Config { return instance.item$client_bound_model; } + public static List recipeIngredientSources() { + return instance.recipe$ingredient_sources; + } + public YamlDocument loadOrCreateYamlData(String fileName) { Path path = this.plugin.dataFolderPath().resolve(fileName); if (!Files.exists(path)) {