diff --git a/src/config.yml b/src/config.yml index 1c88194bf..f6bc39103 100644 --- a/src/config.yml +++ b/src/config.yml @@ -7,6 +7,7 @@ options: prefix: '&a&lSlimefun &7>' auto-save-delay-in-minutes: 10 show-vanilla-recipes-in-guide: true + allow-free-creative-research: true guide: default-view-book: false URID: diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 10e9365e9..f1f3bc6ea 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -65,8 +65,9 @@ public class SlimefunGuide { public static int forks = 0; public static int code_lines = 0; public static Date last_update = new Date(); - + static boolean all_recipes = true; + public static boolean creative_research = true; private static final int category_size = 36; @Deprecated @@ -866,7 +867,7 @@ public class SlimefunGuide { @Override public boolean onClick(final Player p, int slot, ItemStack item, ClickAction action) { boolean canBuy = false; - if (p.getGameMode() == GameMode.CREATIVE) canBuy = true; + if (p.getGameMode() == GameMode.CREATIVE && creative_research) canBuy = true; else if (p.getLevel() >= cost) { p.setLevel(p.getLevel() - cost); canBuy = true; @@ -878,7 +879,7 @@ public class SlimefunGuide { if (researched) openCategory(p, category, true, selected_page, experimental); else if (!Research.isResearching(p)){ if (p.getGameMode() == GameMode.CREATIVE) { - research.unlock(p, true); + research.unlock(p, creative_research); openCategory(p, category, survival, selected_page, experimental); } else { diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index c3f475cf2..641c8b8c0 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -384,6 +384,7 @@ public class SlimefunStartup extends JavaPlugin { if (clearlag) new ClearLaggIntegration(this); + SlimefunGuide.creative_research = config.getBoolean("options.allow-free-creative-research"); // Do not show /sf elevator command in our Log, it could get quite spammy CSCoreLib.getLib().filterLog("([A-Za-z0-9_]{3,16}) issued server command: /sf elevator (.{0,})"); }