mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Fixed a bunch of typos
This commit is contained in:
parent
1f636271d6
commit
be5f793695
2
.github/workflows/closed-issues-reason.yml
vendored
2
.github/workflows/closed-issues-reason.yml
vendored
@ -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.
|
||||
|
14
CHANGELOG.md
14
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
|
||||
|
@ -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_.<br>
|
||||
Slimefun4 has recently added support for translations, note that translations are still _work in progress_.<br>
|
||||
So not everything may be available for translation yet.<br>
|
||||
[Read more...](https://github.com/Slimefun/Slimefun4/wiki/Translating-Slimefun)
|
||||
|
||||
|
@ -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}
|
||||
*/
|
||||
|
@ -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
|
||||
|
@ -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;
|
@ -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
|
||||
*/
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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;
|
@ -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
|
||||
*/
|
||||
|
@ -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<PlayerProfile> iterator = PlayerProfile.iterator();
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
*
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
*
|
||||
|
@ -72,7 +72,7 @@ public class EnchantmentRune extends SimpleSlimefunItem<ItemDropHandler> {
|
||||
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);
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ public class OreWasher extends MultiBlockMachine {
|
||||
@Override
|
||||
protected void registerDefaultRecipes(List<ItemStack> 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);
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
*
|
||||
|
@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
*
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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}
|
||||
*/
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user