From 0412a2aec1a13e64ac53c2a34885723f9ea61d3b Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 30 Jul 2020 10:23:44 +0200 Subject: [PATCH] Fixes #2151 --- CHANGELOG.md | 1 + .../slimefun4/core/services/MetricsService.java | 2 +- .../implementation/items/multiblocks/OreWasher.java | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4d8ab3dc..a675134df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ * Fixed Metrics not updating automatically * Fixed #2143 * Fixed #2145 +* Fixed #2151 ## Release Candidate 14 (12 Jul 2020) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java index d60f0961f..9b00e302c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java @@ -175,7 +175,7 @@ public class MetricsService { return node.getObject().getInt("tag_name"); } catch (UnirestException e) { - plugin.getLogger().log(Level.SEVERE, "Failed to fetch latest builds for SFMetrics"); + plugin.getLogger().log(Level.WARNING, "Failed to fetch latest builds for Metrics: {0}", e.getMessage()); return -1; } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java index 73e2a4fe3..099ab6f04 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreWasher.java @@ -34,6 +34,18 @@ public class OreWasher extends MultiBlockMachine { legacyMode = SlimefunPlugin.getCfg().getBoolean("options.legacy-ore-washer"); dusts = new ItemStack[] { SlimefunItems.IRON_DUST, SlimefunItems.GOLD_DUST, SlimefunItems.COPPER_DUST, SlimefunItems.TIN_DUST, SlimefunItems.ZINC_DUST, SlimefunItems.ALUMINUM_DUST, SlimefunItems.MAGNESIUM_DUST, SlimefunItems.LEAD_DUST, SlimefunItems.SILVER_DUST }; } + + @Override + protected void registerDefaultRecipes(List recipes) { + // Iron and Gold are displayed as Ore Crusher recipes, as that is their primary + // way of obtainining them. But we also wanna display them here, so we just + // add these two recipes manually + recipes.add(SlimefunItems.SIFTED_ORE); + recipes.add(SlimefunItems.IRON_DUST); + + recipes.add(SlimefunItems.SIFTED_ORE); + recipes.add(SlimefunItems.GOLD_DUST); + } @Override public List getDisplayRecipes() {