From 17cf48a773cd5fb4b2774a148e29102a88f12d8e Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Tue, 11 Feb 2020 21:16:09 +0100 Subject: [PATCH] [CI skip] Fixes #1515 --- CHANGELOG.md | 4 ++++ .../mrCookieSlime/Slimefun/SlimefunPlugin.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83cd59519..c83655625 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,10 @@ ### Changes * /sf research now uses namespaced keys instead of ids +### Fixes +* Fixed #1515 +* Fixed back-button in guide-settings not working via commands + ## Release Candidate 5 (09 Feb 2020) ### Additions diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 4605dd5ed..f395ea9b5 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -167,6 +167,14 @@ public final class SlimefunPlugin extends JavaPlugin { updaterService.start(); } + // Registering all GEO Resources + getLogger().log(Level.INFO, "Loading GEO-Resources..."); + + new OilResource().register(); + new NetherIceResource().register(); + new UraniumResource().register(); + new SaltResource().register(); + getLogger().log(Level.INFO, "Loading Items..."); MiscSetup.setupItemSettings(); @@ -185,14 +193,6 @@ public final class SlimefunPlugin extends JavaPlugin { WikiSetup.addWikiPages(this); textureService.setup(registry.getAllSlimefunItems()); - getLogger().log(Level.INFO, "Loading World Generators..."); - - // Generating Oil as an OreGenResource (it iss a cool API) - new OilResource().register(); - new NetherIceResource().register(); - new UraniumResource().register(); - new SaltResource().register(); - // Setting up GitHub Connectors... gitHubService.connect(config.getBoolean("options.print-out-github-data-retrieving"));