diff --git a/CHANGELOG.md b/CHANGELOG.md index 364ade4e7..8eb0bd9f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,7 +42,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#4 * Added support for multiple recipes on vanilla items * Added a "Craft last" button to the Automated Crafting Chamber * Added more ore-doubling Recipes to the Ore Crusher -* Added more dust recipes to the Ore Crusher +* Added Addons to the guide settings ### Changes * Revamped Guide Settings menu 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 a056bea8a..566fd5fbb 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 @@ -34,7 +34,7 @@ public final class GuideSettings { public static final NamespacedKey FIREWORKS_KEY = new NamespacedKey(SlimefunPlugin.instance, "research_fireworks"); - private static final int[] BACKGROUND_SLOTS = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35}; + private static final int[] BACKGROUND_SLOTS = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 26, 27, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 48, 50, 52, 53}; private GuideSettings() {} @@ -77,15 +77,14 @@ public final class GuideSettings { openCredits(pl, 0); return false; }); - + menu.addItem(4, new CustomItem(Material.WRITABLE_BOOK, "&aSlimefun Version", "&7&oThis is very important when reporting bugs!", "", "&7Minecraft Version: &a" + Bukkit.getBukkitVersion(), "&7Slimefun Version: &a" + Slimefun.getVersion(), - "&7CS-CoreLib Version: &a" + CSCoreLib.getLib().getDescription().getVersion(), - "&7Installed Addons: &b" + Slimefun.getInstalledAddons().size() + "&7CS-CoreLib Version: &a" + CSCoreLib.getLib().getDescription().getVersion() ), ChestMenuUtils.getEmptyClickHandler()); menu.addItem(6, new CustomItem(Material.COMPARATOR, @@ -124,6 +123,47 @@ public final class GuideSettings { ChatUtils.sendURL(pl, "https://github.com/TheBusyBiscuit/Slimefun4/wiki"); return false; }); + + menu.addItem(47, new CustomItem(Material.BOOKSHELF, + "&3Slimefun Addons", + "", + "&7Slimefun is huge. But its addons are what makes", + "&7this plugin truly shine. Go check them out, some", + "&7of them may be exactly what you were missing out on!", + "", + "&7Installed on this Server: &b" + Slimefun.getInstalledAddons().size(), + "", + "&7\u21E8 &eClick to see all available Addons for Slimefun4" + ), + (pl, slot, item, action) -> { + pl.closeInventory(); + ChatUtils.sendURL(pl, "https://github.com/TheBusyBiscuit/Slimefun4/wiki/Addons"); + return false; + }); + + menu.addItem(49, new CustomItem(Material.REDSTONE_TORCH, + "&4Report a bug", + "", + "&7Open Issues: &a" + SlimefunPlugin.getGitHubService().getIssues(), + "&7Pending Pull Requests: &a" + SlimefunPlugin.getGitHubService().getPullRequests(), + "", + "&7\u21E8 &eClick to go to the Slimefun4 Bug Tracker" + ), + (pl, slot, item, action) -> { + pl.closeInventory(); + ChatUtils.sendURL(pl, "https://github.com/TheBusyBiscuit/Slimefun4/issues"); + return false; + }); + + menu.addItem(51, new CustomItem(Material.TOTEM_OF_UNDYING, + "&cSoon", + "", + "&7Something will be added here later..." + ), + (pl, slot, item, action) -> { + pl.closeInventory(); + return false; + }); } private static void addConfigurableOptions(Player p, ChestMenu menu, ItemStack guide) { @@ -200,13 +240,6 @@ public final class GuideSettings { i++; } - - menu.addItem(i, new CustomItem(Material.REDSTONE, "&4Report a bug", "", "&7Open Issues: &a" + SlimefunPlugin.getGitHubService().getIssues(), "&7Pending Pull Requests: &a" + SlimefunPlugin.getGitHubService().getPullRequests(), "", "&7\u21E8 &eClick to go to the Slimefun4 Bug Tracker"), - (pl, slot, item, action) -> { - pl.closeInventory(); - ChatUtils.sendURL(pl, "https://github.com/TheBusyBiscuit/Slimefun4/issues"); - return false; - }); } private static void openCredits(Player p, int page) { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java index 37518de78..00b05b33a 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/multiblocks/OreCrusher.java @@ -29,25 +29,15 @@ public class OreCrusher extends MultiBlockMachine { "ORE_CRUSHER", new ItemStack[] {null, null, null, null, new ItemStack(Material.NETHER_BRICK_FENCE), null, new ItemStack(Material.IRON_BARS), new CustomItem(Material.DISPENSER, "Dispenser (Facing up)"), new ItemStack(Material.IRON_BARS)}, new ItemStack[] { - new ItemStack(Material.COAL_ORE), new ItemStack(Material.COAL, isDoubleDropsEnabled() ? 2: 1), - new ItemStack(Material.LAPIS_ORE), new ItemStack(Material.LAPIS_LAZULI, isDoubleDropsEnabled() ? 14: 7), - new ItemStack(Material.REDSTONE_ORE), new ItemStack(Material.REDSTONE, isDoubleDropsEnabled() ? 8: 4), - new ItemStack(Material.DIAMOND_ORE), new ItemStack(Material.DIAMOND, isDoubleDropsEnabled() ? 2: 1), - new ItemStack(Material.EMERALD_ORE), new ItemStack(Material.EMERALD, isDoubleDropsEnabled() ? 2: 1), - new ItemStack(Material.COBBLESTONE, 8), new ItemStack(Material.SAND, 1), SlimefunItems.GOLD_4K, SlimefunItems.GOLD_DUST, new ItemStack(Material.GRAVEL), new ItemStack(Material.SAND), - new ItemStack(Material.IRON_INGOT), SlimefunItems.IRON_DUST, - new ItemStack(Material.GOLD_INGOT), SlimefunItems.GOLD_DUST, - SlimefunItems.ALUMINUM_INGOT, SlimefunItems.ALUMINUM_DUST, - SlimefunItems.COPPER_INGOT, SlimefunItems.COPPER_DUST, - SlimefunItems.LEAD_INGOT, SlimefunItems.LEAD_DUST, - SlimefunItems.MAGNESIUM_INGOT, SlimefunItems.MAGNESIUM_DUST, - SlimefunItems.SILVER_INGOT, SlimefunItems.SILVER_DUST, - SlimefunItems.TIN_INGOT, SlimefunItems.TIN_DUST, - SlimefunItems.ZINC_INGOT, SlimefunItems.ZINC_DUST + new ItemStack(Material.COAL_ORE), new ItemStack(Material.COAL, isDoubleDropsEnabled() ? 2: 1), + new ItemStack(Material.LAPIS_ORE), new ItemStack(Material.LAPIS_LAZULI, isDoubleDropsEnabled() ? 14: 7), + new ItemStack(Material.REDSTONE_ORE), new ItemStack(Material.REDSTONE, isDoubleDropsEnabled() ? 8: 4), + new ItemStack(Material.DIAMOND_ORE), new ItemStack(Material.DIAMOND, isDoubleDropsEnabled() ? 2: 1), + new ItemStack(Material.EMERALD_ORE), new ItemStack(Material.EMERALD, isDoubleDropsEnabled() ? 2: 1) }, BlockFace.SELF );