From e5fd1ad5b46d4abddd47ca4b737c1be8b1612ac9 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 4 Jan 2020 16:32:23 +0100 Subject: [PATCH] Fixed Iron Golems being repaired with slimefun ingots --- CHANGELOG.md | 2 ++ .../thebusybiscuit/slimefun4/core/guide/GuideSettings.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d37f02e0a..04192de72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,6 +85,8 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4 * Fixed #1337 * Fixed Applie Pie ID mismatch * Fixed #1344 +* Fixed #1349 +* Fixed #1332 ## Release Candidate 3 (21 Nov 2019) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#3 diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java index 8366e486d..a056bea8a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java @@ -182,7 +182,7 @@ public final class GuideSettings { if (SlimefunPlugin.getSettings().researchFireworksEnabled) { if (!PersistentDataAPI.hasByte(p, FIREWORKS_KEY) || PersistentDataAPI.getByte(p, FIREWORKS_KEY) == (byte) 1) { - menu.addItem(i, new CustomItem(Material.FIREWORK_ROCKET, "&bFireworks: &aYes", "", "&7When researching items, you will", "&7be presented with a big firework.", "", "&7\u21E8 Click to toggle your fireworks"), + menu.addItem(i, new CustomItem(Material.FIREWORK_ROCKET, "&bFireworks: &aYes", "", "&7When researching items, you will", "&7be presented with a big firework.", "", "&7\u21E8 &eClick to disable your fireworks"), (pl, slot, item, action) -> { PersistentDataAPI.setByte(pl, FIREWORKS_KEY, (byte) 0); openSettings(pl, guide); @@ -190,7 +190,7 @@ public final class GuideSettings { }); } else { - menu.addItem(i, new CustomItem(Material.FIREWORK_ROCKET, "&bFireworks: &4No", "", "&7When researching items, you will", "&7not be presented with a big firework.", "", "&7\u21E8 Click to toggle your fireworks"), + menu.addItem(i, new CustomItem(Material.FIREWORK_ROCKET, "&bFireworks: &4No", "", "&7When researching items, you will", "&7not be presented with a big firework.", "", "&7\u21E8 &eClick to enable your fireworks"), (pl, slot, item, action) -> { PersistentDataAPI.setByte(pl, FIREWORKS_KEY, (byte) 1); openSettings(pl, guide);