diff --git a/.github/workflows/closed-issues-reason.yml b/.github/workflows/closed-issues-reason.yml index e95e90e84..243012fcd 100644 --- a/.github/workflows/closed-issues-reason.yml +++ b/.github/workflows/closed-issues-reason.yml @@ -43,7 +43,7 @@ jobs: * [ ] Your issue is not a bug, please only use this issue tracker to report bugs. Any other kind of communication should happen on discord. * [ ] Your issue has already been reported before, it is a duplicate. Check the other issues first before posting! * [ ] You posted an error without using pastebin. Please always post errors via pastebin otherwise they become nearly unreadable. - * [ ] You seem to be reporting multiple bugs at once. Please make a seperate issue for each bug you encountered, so we can properly handle them individually. + * [ ] You seem to be reporting multiple bugs at once. Please make a separate issue for each bug you encountered, so we can properly handle them individually. * [ ] Your issue has already been fixed in a later version of Slimefun or CS-CoreLib, you should update. * [ ] You are using an outdated and unsupported version of Slimefun / CS-CoreLib, again, you should update. * [ ] You are using an unofficially modified build of Slimefun. We only support official versions of Slimefun - for obvious reasons. diff --git a/CHANGELOG.md b/CHANGELOG.md index cd6937313..fc9637aa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -238,7 +238,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#14 * Fixed a rare concurrency issue with world saving * Fixed some contributors showing up twice * Fixed #2062 -* Fixed Grappling hooks disappearing when fired at Item frames or paintaings +* Fixed Grappling hooks disappearing when fired at Item frames or paintings * Fixed Grappling hooks not getting removed when the Player leaves * Fixed Grappling hooks making Bat sounds * Fixed #1959 @@ -284,7 +284,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13 * Auto Disenchanting is now a tiny bit faster * Small performance improvements * Dried Kelp Blocks can now be used as fuel for Tier 1 Androids -* Androids now have a seperate category in the Slimefun Guide +* Androids now have a separate category in the Slimefun Guide * Android Interface recipes now require steel ingots * Changed and unified a couple of tooltips * Changed tooltip on jetpacks and jet boots to say "Crouch" instead of "Hold Shift" @@ -331,7 +331,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#12 * Fixed #1834 * Fixed #1843 * Fixed #1873 -* Fixed Electric Smeltery not prioritisting recipes +* Fixed Electric Smeltery not prioritising recipes * Fixed #1851 * Fixed #1891 * Fixed #1893 @@ -431,7 +431,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#10 * Internal clean up and further documentation * Changed Automatic Ignition Chamber to be a Dropper * Teleporters are now significantly faster -* Item permissions have been moved to a seperate permissions.yml file +* Item permissions have been moved to a separate permissions.yml file * Salt now only requires 2 blocks of Sand * Fireworks from researching no longer damages entities * Very slight performance improvements for Cargo networks @@ -516,7 +516,7 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#6 https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#5 #### Additions -* Aded preset messages.yml files +* Added preset messages.yml files * Added user-configurable localization * Added many more options to the messages.yml * Added custom model data support for Languages @@ -529,8 +529,8 @@ https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#5 * Added ability to translate messages for Players * Added the ability to translate Researches * Added StatusEffect API -* Added translatibility to categories -* Added translatibility to geo-resources +* Added translatability to categories +* Added translatability to geo-resources #### Changes * Removed Solar Array diff --git a/README.md b/README.md index 3cc4a8c32..84dd916b8 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ Over 100 people have already contributed to this amazing project. You guys are a Please consider helping us maintain this project too, your engagement keeps the project alive <3. ### Translations -Slimefun4 has recently added suport for translations, note that translations are still _work in progress_.
+Slimefun4 has recently added support for translations, note that translations are still _work in progress_.
So not everything may be available for translation yet.
[Read more...](https://github.com/Slimefun/Slimefun4/wiki/Translating-Slimefun) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java index ecaa01476..792bb6de0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/geo/ResourceManager.java @@ -89,9 +89,9 @@ public class ResourceManager { * @param world * The {@link World} of this {@link Location} * @param x - * The {@link Chunk} x cordinate + * The {@link Chunk} x coordinate * @param z - * The {@link Chunk} z cordinate + * The {@link Chunk} z coordinate * * @return An {@link OptionalInt}, either empty or containing the amount of the given {@link GEOResource} */ diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java index f70839edf..47e6f804e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/TeleportationManager.java @@ -148,7 +148,7 @@ public final class TeleportationManager { @ParametersAreNonnullByDefault private void onTeleport(Player p, Location destination, boolean success, boolean resistance) { // This needs to run on the main Thread so we force it, as the - // async teleportation might happen on a seperate Thread. + // async teleportation might happen on a separate Thread. Slimefun.runSync(() -> { if (success) { // Apply Resistance Effect, if enabled diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java index f3736695a..13a08a12a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/package-info.java @@ -1,4 +1,4 @@ /** - * This package contains everything related to slimefun's ingame command. + * This package contains everything related to Slimefun's ingame command. */ package io.github.thebusybiscuit.slimefun4.core.commands; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java index 87fda6b4e..14f426c5c 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/package-info.java @@ -1,5 +1,5 @@ /** - * This package contains the Settings menu forthe {@link io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide} as + * This package contains the Settings menu for the {@link io.github.thebusybiscuit.slimefun4.core.guide.SlimefunGuide} as * well as the interface {@link io.github.thebusybiscuit.slimefun4.core.guide.options.SlimefunGuideOption} for adding * your own options */ diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java index fdf732de2..cdb6ea3ff 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java @@ -453,7 +453,7 @@ abstract class ChestTerminalNetwork extends Network { } } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, "An Exception occured while trying to read data from a Barrel", x); + Slimefun.getLogger().log(Level.SEVERE, "An Exception occurred while trying to read data from a Barrel", x); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java index 155bed61c..4a303ab0e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/package-info.java @@ -1,5 +1,5 @@ /** - * This package holds the core systems of Slimefun, these are not neccessarily used as an API - * but ratherprovide the core functionality of this {@link org.bukkit.plugin.Plugin}. + * This package holds the core systems of Slimefun, these are not necessarily used as an API + * but rather provide the core functionality of this {@link org.bukkit.plugin.Plugin}. */ package io.github.thebusybiscuit.slimefun4.core; \ No newline at end of file diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/researching/Research.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/researching/Research.java index 5ddb56b59..63e69b884 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/researching/Research.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/researching/Research.java @@ -86,7 +86,7 @@ public class Research implements Keyed { /** * This method returns whether this {@link Research} is enabled. * {@code false} can mean that this particular {@link Research} was disabled or that - * researches alltogether have been disabled. + * researches altogether have been disabled. * * @return Whether this {@link Research} is enabled or not */ diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java index 6ee30899f..d965cefde 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/AutoSavingService.java @@ -46,7 +46,7 @@ public class AutoSavingService { /** * This method saves every {@link PlayerProfile} in memory and removes profiles - * that were markes for deletion. + * that were marked for deletion. */ private void saveAllPlayers() { Iterator iterator = PlayerProfile.iterator(); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java index 5fcb9face..809d3f336 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java @@ -74,7 +74,7 @@ public class BlockDataService implements PersistentDataService, Keyed { /** * This method checks whether the given {@link Material} is a Tile Entity. * This is used to determine whether the {@link Block} produced by this {@link Material} - * produces a {@link TileState}, making it useable as a {@link PersistentDataHolder}. + * produces a {@link TileState}, making it usable as a {@link PersistentDataHolder}. * * Due to {@link Block#getState()} being a very expensive call performance-wise though, * this simple lookup method is used instead. diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/SlimefunProfiler.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/SlimefunProfiler.java index 9c250fb99..b69118d89 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/SlimefunProfiler.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/profiler/SlimefunProfiler.java @@ -81,7 +81,7 @@ public class SlimefunProfiler { /** * This method schedules a given amount of entries for the future. * Be careful to {@link #closeEntry(Location, SlimefunItem, long)} all of them again! - * No {@link PerformanceSummary} will be sent until all entires were closed. + * No {@link PerformanceSummary} will be sent until all entries were closed. * * If the specified amount is negative, scheduled entries will be removed * diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java index 4e64e85c9..d1fd6ca5f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java @@ -251,7 +251,7 @@ public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { recipeService.refresh(); } catch (Exception | LinkageError x) { - getLogger().log(Level.SEVERE, x, () -> "An Exception occured while iterating through the Recipe list on Minecraft Version " + minecraftVersion.getName() + " (Slimefun v" + getVersion() + ")"); + getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while iterating through the Recipe list on Minecraft Version " + minecraftVersion.getName() + " (Slimefun v" + getVersion() + ")"); } }), 0); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java index 166a9b371..abaf92d2a 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/VanillaItem.java @@ -17,7 +17,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; * automatically * replace it in the recipes by its vanilla equivalent. * - * A {@link VanillaItem} is also automatically useable in workbenches. + * A {@link VanillaItem} is also automatically usable in workbenches. * * @author TheBusyBiscuit * diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/EnchantmentRune.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/EnchantmentRune.java index f4522a725..d3ee4d37f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/EnchantmentRune.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/EnchantmentRune.java @@ -72,7 +72,7 @@ public class EnchantmentRune extends SimpleSlimefunItem { addRandomEnchantment(p, item); } catch (Exception x) { - error("An Exception occured while trying to apply an Enchantment Rune", x); + error("An Exception occurred while trying to apply an Enchantment Rune", x); } }, 20L); } 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 099ab6f04..1fdfc48aa 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 @@ -38,7 +38,7 @@ public class OreWasher extends MultiBlockMachine { @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 + // way of obtaining 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); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java index 6e00d584e..f2de2473b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ButcherAndroidListener.java @@ -26,7 +26,7 @@ import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils; import me.mrCookieSlime.Slimefun.api.Slimefun; /** - * This {@link Listener} handles the collecton of drops from an {@link Entity} that was + * This {@link Listener} handles the collection of drops from an {@link Entity} that was * killed by a {@link ButcherAndroid}. * * @author TheBusyBiscuit diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java index b88085838..e084cb084 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/DebugFishListener.java @@ -98,7 +98,7 @@ public class DebugFishListener implements Listener { sendInfo(p, b); } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, "An Exception occured while using a Debug-Fish", x); + Slimefun.getLogger().log(Level.SEVERE, "An Exception occurred while using a Debug-Fish", x); } } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java index 7f8dba7a0..8a95420e5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/VillagerTradingListener.java @@ -31,7 +31,7 @@ public class VillagerTradingListener implements Listener { } @EventHandler(ignoreCancelled = true) - public void onPreBrew(InventoryClickEvent e) { + public void onPreTrade(InventoryClickEvent e) { Inventory clickedInventory = e.getClickedInventory(); Inventory topInventory = e.getView().getTopInventory(); diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java index 57324b8ae..3b7f3584f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/UraniumResource.java @@ -12,8 +12,8 @@ class UraniumResource extends SlimefunResource { } @Override - public int getDefaultSupply(Environment envionment, Biome biome) { - if (envionment == Environment.NORMAL) { + public int getDefaultSupply(Environment environment, Biome biome) { + if (environment == Environment.NORMAL) { return 5; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java index d4188abf4..1ece100a1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java @@ -32,7 +32,7 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; /** * The {@link ArmorTask} is responsible for handling {@link PotionEffect PotionEffects} for * {@link Radioactive} items or any {@link SlimefunArmorPiece}. - * It also handles the prevention of radioation through a Hazmat Suit + * It also handles the prevention of radiation through a Hazmat Suit * * @author TheBusyBiscuit * diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java index d9c439772..5731622f1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/SlimefunStartupTask.java @@ -57,7 +57,7 @@ public class SlimefunStartupTask implements Runnable { new BlockStorage(world); } catch (Exception x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occured while trying to load World \"" + world.getName() + "\" for Slimefun v" + SlimefunPlugin.getVersion()); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Error occurred while trying to load World \"" + world.getName() + "\" for Slimefun v" + SlimefunPlugin.getVersion()); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java index 64a2ffb13..2fc7f82db 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java @@ -132,7 +132,7 @@ public class TickerTask implements Runnable { } } catch (ArrayIndexOutOfBoundsException | NumberFormatException x) { - Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception has occured while trying to parse Chunk: " + chunk); + Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception has occurred while trying to parse Chunk: " + chunk); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java index 9e315fe81..6c0f4adcb 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java @@ -16,7 +16,7 @@ import org.bukkit.entity.Firework; import org.bukkit.inventory.meta.FireworkMeta; /** - * This is a simple utility classs for spawning random and colorful {@link Firework} rockets. + * This is a simple utility class for spawning random and colorful {@link Firework} rockets. * * @author TheBusyBiscuit * diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java index ef0dbbd3e..696d548ad 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/itemstack/ItemStackWrapper.java @@ -24,7 +24,7 @@ import org.bukkit.inventory.meta.ItemMeta; */ public final class ItemStackWrapper extends ItemStack { - private static final String ERROR_MESSAGE = "ItemStackWrappers are immutable and not indended for actual usage."; + private static final String ERROR_MESSAGE = "ItemStackWrappers are immutable and not intended for actual usage."; private final ItemMeta meta; private final int amount; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java index 7520c71c3..b70654d26 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java @@ -564,14 +564,14 @@ public class SlimefunItem implements Placeable { * This sets whether or not this {@link SlimefunItem} is allowed to be * used in a normal Crafting Table. * - * @param useable + * @param usable * Whether this {@link SlimefunItem} should be useable in a workbench * * @return This instance of {@link SlimefunItem} */ @Nonnull - public SlimefunItem setUseableInWorkbench(boolean useable) { - this.useableInWorkbench = useable; + public SlimefunItem setUseableInWorkbench(boolean usable) { + this.useableInWorkbench = usable; return this; } @@ -717,7 +717,7 @@ public class SlimefunItem implements Placeable { } /** - * This method returns the wiki page that has been asigned to this item. + * This method returns the wiki page that has been assigned to this item. * It will return null, if no wiki page was found. * * @see SlimefunItem#addOficialWikipage(String) @@ -888,7 +888,7 @@ public class SlimefunItem implements Placeable { for (SlimefunItem sfi : SlimefunPlugin.getRegistry().getAllSlimefunItems()) { if (sfi.isItem(wrapper)) { // If we have to loop all items for the given item, then at least - // set the id via PersistenDataAPI for future performance boosts + // set the id via PersistentDataAPI for future performance boosts SlimefunPlugin.getItemDataService().setItemData(item, sfi.getID()); return sfi; diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestSlimefunGuideListener.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestSlimefunGuideListener.java index aadef5254..94cacd965 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestSlimefunGuideListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestSlimefunGuideListener.java @@ -59,7 +59,7 @@ class TestSlimefunGuideListener { /** * This returns an {@link Arguments} {@link Stream} of boolean combinations. - * It performs a certesian product on two boolean sets. + * It performs a cartesian product on two boolean sets. * * @return a {@link Stream} of {@link Arguments} */ diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVanillaMachinesListener.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVanillaMachinesListener.java index 71ca41ca3..a36b616f1 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVanillaMachinesListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVanillaMachinesListener.java @@ -258,7 +258,7 @@ public class TestVanillaMachinesListener { } @Test - public void testBrewingithVanillaItem() { + public void testBrewingWithVanillaItem() { VanillaItem item = TestUtilities.mockVanillaItem(plugin, Material.BLAZE_POWDER, true); item.register(plugin); diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVillagerTradingListener.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVillagerTradingListener.java index ebcc2c629..64961661d 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVillagerTradingListener.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestVillagerTradingListener.java @@ -56,7 +56,7 @@ class TestVillagerTradingListener { InventoryView view = player.openInventory(inv); view.setCursor(item); InventoryClickEvent event = new InventoryClickEvent(view, SlotType.CONTAINER, 1, ClickType.LEFT, InventoryAction.PICKUP_ONE); - listener.onPreBrew(event); + listener.onPreTrade(event); return event; }