From c1755965369c265cdb48fdf06255de2080af69bc Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 05:33:02 +0300 Subject: [PATCH 1/6] Improve the handling of non-registered worlds --- .../mrCookieSlime/Slimefun/SlimefunPlugin.java | 16 +++++----------- .../mrCookieSlime/Slimefun/api/BlockStorage.java | 4 ++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index f91cf72d5..40c9d5213 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -391,21 +391,15 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { } }); - for (World world : Bukkit.getWorlds()) { + // Save all registered Worlds + getRegistry().getWorlds().forEach((world, storage) -> { try { - BlockStorage storage = BlockStorage.getStorage(world); - - if (storage != null) { - storage.save(true); - } - else { - getLogger().log(Level.SEVERE, "Could not save Slimefun Blocks for World \"{0}\"", world.getName()); - } + storage.save(true); } catch (Exception x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world.getName() + "' for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); } - } + }); for (UniversalBlockMenu menu : registry.getUniversalInventories().values()) { menu.save(); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index 9797a9bc8..58f1224e5 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -480,6 +480,10 @@ public class BlockStorage { public static void setBlockInfo(Location l, Config cfg, boolean updateTicker) { BlockStorage storage = getStorage(l.getWorld()); + if (storage == null) { + Slimefun.getLogger().warning("Could not set Block info for non-registered World '" + l.getWorld().getName() + "'. Is some plugin trying to store data in a fake world?"); + return; + } storage.storage.put(l, cfg); String id = cfg.getString("id"); From ecd97b3e500a1b5316790d8dc8dcaa3881001b2a Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 05:54:21 +0300 Subject: [PATCH 2/6] Fixed a tiny typo --- .../thebusybiscuit/slimefun4/api/ErrorReport.java | 4 ++-- .../slimefun4/core/networks/cargo/CargoUtils.java | 2 +- .../slimefun4/core/services/BackupService.java | 2 +- .../core/services/PerWorldSettingsService.java | 2 +- .../core/services/github/GitHubConnector.java | 2 +- .../implementation/guide/ChestSlimefunGuide.java | 4 ++-- .../implementation/items/androids/Script.java | 2 +- .../items/magical/talismans/MagicianTalisman.java | 2 +- .../items/multiblocks/miner/ActiveMiner.java | 4 ++-- .../java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 6 +++--- .../me/mrCookieSlime/Slimefun/api/BlockStorage.java | 10 +++++----- .../Slimefun/api/inventory/BlockMenuPreset.java | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java index a04bf3739..95ec565a9 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java @@ -82,7 +82,7 @@ public class ErrorReport { throwable.printStackTrace(stream); addon.getLogger().log(Level.WARNING, ""); - addon.getLogger().log(Level.WARNING, "An Error occured! It has been saved as: "); + addon.getLogger().log(Level.WARNING, "An Error occurred! It has been saved as: "); addon.getLogger().log(Level.WARNING, "/plugins/Slimefun/error-reports/{0}", file.getName()); addon.getLogger().log(Level.WARNING, "Please put this file on https://pastebin.com and report this to the developer(s)."); @@ -93,7 +93,7 @@ public class ErrorReport { addon.getLogger().log(Level.WARNING, ""); } catch (IOException x) { - addon.getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving an Error-Report for Slimefun " + SlimefunPlugin.getVersion()); + addon.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving an Error-Report for Slimefun " + SlimefunPlugin.getVersion()); } }); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java index 47bee5f73..3d2c79dd1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java @@ -408,7 +408,7 @@ final class CargoUtils { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occured while trying to filter items for a Cargo Node (" + id + ") at " + new BlockPosition(block)); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while trying to filter items for a Cargo Node (" + id + ") at " + new BlockPosition(block)); return false; } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java index fab96c403..04200e50d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BackupService.java @@ -60,7 +60,7 @@ public class BackupService implements Runnable { } } catch (IOException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while creating a backup for Slimefun " + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while creating a backup for Slimefun " + SlimefunPlugin.getVersion()); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java index bae567485..dec933960 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/PerWorldSettingsService.java @@ -53,7 +53,7 @@ public class PerWorldSettingsService { migrate(); } catch (IOException e) { - plugin.getLogger().log(Level.WARNING, "An error occured while migrating old world settings", e); + plugin.getLogger().log(Level.WARNING, "An error occurred while migrating old world settings", e); } for (World world : worlds) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java index 73feca0b1..cb30fa294 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubConnector.java @@ -98,7 +98,7 @@ abstract class GitHubConnector { onSuccess(element); } catch (IOException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while parsing GitHub-Data for Slimefun " + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while parsing GitHub-Data for Slimefun " + SlimefunPlugin.getVersion()); onFailure(); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java index 88c956b7a..6e75a706b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java @@ -686,8 +686,8 @@ public class ChestSlimefunGuide implements SlimefunGuideImplementation { } private void printErrorMessage(Player p, Throwable x) { - p.sendMessage(ChatColor.DARK_RED + "An internal server error has occured. Please inform an admin, check the console for further info."); - Slimefun.getLogger().log(Level.SEVERE, "An error has occured while trying to open a SlimefunItem in the guide!", x); + p.sendMessage(ChatColor.DARK_RED + "An internal server error has occurred. Please inform an admin, check the console for further info."); + Slimefun.getLogger().log(Level.SEVERE, "An error has occurred while trying to open a SlimefunItem in the guide!", x); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java index 9aac880dc..f075fcd86 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/Script.java @@ -195,7 +195,7 @@ public final class Script { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occured while trying to load Android Script '" + file.getName() + "'"); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while trying to load Android Script '" + file.getName() + "'"); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java index d91c8ead3..24bbd93e1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/MagicianTalisman.java @@ -29,7 +29,7 @@ public class MagicianTalisman extends Talisman { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "The following Exception occured while trying to register the following Enchantment: " + enchantment); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "The following Exception occurred while trying to register the following Enchantment: " + enchantment); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java index 2800d93b0..8a5e3c2f1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/ActiveMiner.java @@ -197,7 +197,7 @@ class ActiveMiner implements Runnable { nextColumn(); } catch (Exception e) { - Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occured while running an Industrial Miner at " + new BlockPosition(chest)); + Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occurred while running an Industrial Miner at " + new BlockPosition(chest)); stop(); } }); @@ -343,7 +343,7 @@ class ActiveMiner implements Runnable { } } catch (Exception e) { - Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occured while moving a Piston for an Industrial Miner at " + new BlockPosition(block)); + Slimefun.getLogger().log(Level.SEVERE, e, () -> "An Error occurred while moving a Piston for an Industrial Miner at " + new BlockPosition(block)); stop(); } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 40c9d5213..8a2fa5b02 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -397,7 +397,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { storage.save(true); } catch (Exception x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); } }); @@ -454,7 +454,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { SlimefunItemSetup.setup(this); } catch (Exception | LinkageError x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while initializing SlimefunItems for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while initializing SlimefunItems for Slimefun " + getVersion()); } } @@ -463,7 +463,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { ResearchSetup.setupResearches(); } catch (Exception | LinkageError x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occured while initializing Slimefun Researches for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while initializing Slimefun Researches for Slimefun " + getVersion()); } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index 58f1224e5..0c318134d 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -232,7 +232,7 @@ public class BlockStorage { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while loading this Block Inventory: " + file.getName()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while loading this Block Inventory: " + file.getName()); } } } @@ -248,7 +248,7 @@ public class BlockStorage { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while loading this universal Inventory: " + file.getName()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while loading this universal Inventory: " + file.getName()); } } } @@ -313,7 +313,7 @@ public class BlockStorage { Files.move(tmpFile.toPath(), cfg.getFile().toPath(), StandardCopyOption.ATOMIC_MOVE); } catch (IOException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while copying a temporary File for Slimefun " + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while copying a temporary File for Slimefun " + SlimefunPlugin.getVersion()); } } } @@ -418,7 +418,7 @@ public class BlockStorage { logger.log(Level.WARNING, ""); logger.log(Level.WARNING, "IGNORE THIS ERROR UNLESS IT IS SPAMMING"); logger.log(Level.WARNING, ""); - logger.log(Level.SEVERE, x, () -> "An Error occured while parsing Block Info for Slimefun " + SlimefunPlugin.getVersion()); + logger.log(Level.SEVERE, x, () -> "An Error occurred while parsing Block Info for Slimefun " + SlimefunPlugin.getVersion()); return null; } } @@ -681,7 +681,7 @@ public class BlockStorage { return id != null && id.equalsIgnoreCase(slimefunItem); } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occured while checking " + new BlockPosition(l) + " for: \"" + slimefunItem + "\""); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while checking " + new BlockPosition(l) + " for: \"" + slimefunItem + "\""); return false; } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java index 48937ae2a..0a160f544 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java @@ -196,7 +196,7 @@ public abstract class BlockMenuPreset extends ChestMenu { newInstance(menu, l.getBlock()); } catch (Exception | LinkageError x) { - getSlimefunItem().error("An eror occured while trying to create a BlockMenu", x); + getSlimefunItem().error("An Error occurred while trying to create a BlockMenu", x); } }); } From 4ed2258eb0b1bb9f03d68fd2fd0b7dcac6af67fe Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 12:49:18 +0300 Subject: [PATCH 3/6] Replace stream with for loop --- .../me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 8a2fa5b02..a95c1b466 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,11 +1,7 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; @@ -392,14 +388,14 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { }); // Save all registered Worlds - getRegistry().getWorlds().forEach((world, storage) -> { + for (Map.Entry entry : getRegistry().getWorlds().entrySet()) { try { - storage.save(true); + entry.getValue().save(true); } catch (Exception x) { - getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving Slimefun-Blocks in World '" + world + "' for Slimefun " + getVersion()); + getLogger().log(Level.SEVERE, x, () -> "An Error occurred while saving Slimefun-Blocks in World '" + entry.getKey() + "' for Slimefun " + getVersion()); } - }); + } for (UniversalBlockMenu menu : registry.getUniversalInventories().values()) { menu.save(); From ade18c7bd8b21515b51d9c797608ac400a165331 Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 12:58:04 +0300 Subject: [PATCH 4/6] Remove unused import --- .../java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index a95c1b466..1912f0eba 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,13 +1,16 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Server; -import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; From 386cbea53b58765b7bb3390fbb19193607c92ddc Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 12:59:02 +0300 Subject: [PATCH 5/6] Whoops --- src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 1912f0eba..c3534bb62 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,11 +1,7 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.logging.Level; import java.util.stream.Collectors; From e52ac9d43b49cd451d8000e3c71a1603d021c2ba Mon Sep 17 00:00:00 2001 From: SoSeDiK Date: Thu, 25 Jun 2020 13:06:34 +0300 Subject: [PATCH 6/6] Make it compile --- .../java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index c3534bb62..b9fd4a396 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -1,7 +1,12 @@ package me.mrCookieSlime.Slimefun; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors;