| Command | -Aliases | -Description | -
|---|---|---|
| /openinv [player] | -oi, inv, open | -Open a player's inventory. If unspecified, will select last player opened or own if none opened previously. | -
| /openender [player] | -oe | -Open a player's ender chest. If unspecified, will select last player opened or own if none opened previously. | -
| /searchinv <item> [minAmount] | -si | -Lists all online players that have a certain item in their inventory. | -
| /searchender <item> [minAmount] | -se | -Lists all online players that have a certain item in their ender chest. | -
| /searchenchant <[enchantment] [MinLevel]> | -searchenchants | -Lists all online players with a specific enchantment. | -
| /anycontainer [check] | -ac, anychest | -Check or toggle the AnyContainer function, allowing opening blocked containers. | -
| /silentcontainer [check] | -sc, silentchest | -Check or toggle the SilentContainer function, allowing opening containers silently. | -
| Node | -Description | -
|---|---|
| OpenInv.* | -Gives permission to use all of OpenInv. | -
| OpenInv.openinv | -Required to use /openinv. | -
| OpenInv.openself | -Required to open own inventory. | -
| OpenInv.editinv | -Required to make changes to open inventories. | -
| OpenInv.openonline | -Allows users to open online players' inventories. For compatibility reasons this is granted by the nodes OpenInv.openinv and OpenInv.openender. | -
| OpenInv.openoffline | -Allows users to open offline players' inventories. For compatibility reasons this is granted by the nodes OpenInv.openinv and OpenInv.openender. | -
| OpenInv.openender | -Required to use /openender. | -
| OpenInv.editender | -Required to make changes to open ender chests. | -
| OpenInv.openenderall | -Allows users to open others' ender chests. Without it, users can only open their own. | -
| OpenInv.exempt | -Prevents the player's inventory being opened by others. | -
| OpenInv.override | -Allows bypassing of the exempt permission. | -
| OpenInv.crossworld | -Allows cross-world usage of /openinv and /openender. | -
| OpenInv.search | -Required to use /searchinv and /searchender. | -
| OpenInv.searchenchant | -Required to use /searchenchant. | -
| OpenInv.anychest | -Required to use /anychest. | -
| OpenInv.any.default | -Cause AnyContainer to be enabled by default. | -
| OpenInv.silent | -Required to use /silentcontainer. | -
| OpenInv.silent.default | -Cause SilentContainer to be enabled by default. | -
| OpenInv.spectate | -Allows users in spectate gamemode to edit inventories. | -
- * Note: This method is potentially very heavily blocking. It should not ever be called on the - * main thread, and if it is, a stack trace will be displayed alerting server owners to the - * call. - * - * @param name the name of the Player - * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in - */ - default @Nullable OfflinePlayer matchPlayer(@NotNull String name) { - - // Warn if called on the main thread - if we resort to searching offline players, this may take several seconds. - if (Bukkit.getServer().isPrimaryThread()) { - this.getLogger().warning("Call to OpenInv#matchPlayer made on the main thread!"); - this.getLogger().warning("This can cause the server to hang, potentially severely."); - this.getLogger().warning("Trace:"); - for (StackTraceElement element : new Throwable().fillInStackTrace().getStackTrace()) { - this.getLogger().warning(element.toString()); - } - } - - OfflinePlayer player; - - try { - UUID uuid = UUID.fromString(name); - player = Bukkit.getOfflinePlayer(uuid); - // Ensure player is a real player, otherwise return null - if (player.hasPlayedBefore() || player.isOnline()) { - return player; - } - } catch (IllegalArgumentException ignored) { - // Not a UUID - } - - // Ensure name is valid if server is in online mode to avoid unnecessary searching - if (Bukkit.getServer().getOnlineMode() && !name.matches("[a-zA-Z0-9_]{3,16}")) { - return null; - } - - player = Bukkit.getServer().getPlayerExact(name); - - if (player != null) { - return player; - } - - player = Bukkit.getServer().getOfflinePlayer(name); - - if (player.hasPlayedBefore()) { - return player; - } - - player = Bukkit.getServer().getPlayer(name); - - if (player != null) { - return player; - } - - float bestMatch = 0; - for (OfflinePlayer offline : Bukkit.getServer().getOfflinePlayers()) { - if (offline.getName() == null) { - // Loaded by UUID only, name has never been looked up. - continue; - } - - float currentMatch = StringMetric.compareJaroWinkler(name, offline.getName()); - - if (currentMatch == 1.0F) { - return offline; - } - - if (currentMatch > bestMatch) { - bestMatch = currentMatch; - player = offline; - } - } - - // Only null if no players have played ever, otherwise even the worst match will do. - return player; - } - - /** - * Open an ISpecialInventory for a Player. - * - * @param player the Player - * @param inventory the ISpecialInventory - * @return the InventoryView for the opened ISpecialInventory - */ - @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory); - - /** - * Check the configuration value for whether or not OpenInv displays a notification to the user - * when a container is activated with AnyChest. - * - * @return true unless configured otherwise - */ - boolean notifyAnyChest(); - - /** - * Check the configuration value for whether or not OpenInv displays a notification to the user - * when a container is activated with SilentChest. - * - * @return true unless configured otherwise - */ - boolean notifySilentChest(); - - /** - * Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache - * when eligible. - * - * @param player the Player - * @param plugin the Plugin no longer holding a reference to the Player - * @throws IllegalStateException if the server version is unsupported - */ - void releasePlayer(@NotNull Player player, @NotNull Plugin plugin); - - /** - * Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to - * prevent issues with multiple copies of the same Player being loaded such as lishid#49. - * Changes made to loaded copies overwrite changes to the others when saved, leading to - * duplication bugs and more. - *
- * When finished with the Player object, be sure to call {@link #releasePlayer(Player, Plugin)} - * to prevent the cache from keeping it stored until the plugin is disabled. - *
- * When using a Player object from OpenInv, you must handle the Player coming online, replacing - * your Player reference with the Player from the PlayerJoinEvent. In addition, you must change - * any values in the Player to reflect any unsaved alterations to the existing Player which do - * not affect the inventory or ender chest contents. - *
- * OpenInv only saves player data when unloading a Player from the cache, and then only if - * {@link #disableSaving()} returns false. If you are making changes that OpenInv does not cause - * to persist when a Player logs in as noted above, it is suggested that you manually call - * {@link Player#saveData()} when releasing your reference to ensure your changes persist. - * - * @param player the Player - * @param plugin the Plugin holding the reference to the Player - * @throws IllegalStateException if the server version is unsupported - */ - void retainPlayer(@NotNull Player player, @NotNull Plugin plugin); - - /** - * Sets a player's AnyChest setting. - * - * @param offline the OfflinePlayer - * @param status the status - * @throws IllegalStateException if the server version is unsupported - */ - void setPlayerAnyChestStatus(@NotNull OfflinePlayer offline, boolean status); - - /** - * Sets a player's SilentChest setting. - * - * @param offline the OfflinePlayer - * @param status the status - * @throws IllegalStateException if the server version is unsupported - */ - void setPlayerSilentChestStatus(@NotNull OfflinePlayer offline, boolean status); - - /** - * Forcibly unload a cached Player's data. - * - * @param offline the OfflinePlayer to unload - * @throws IllegalStateException if the server version is unsupported - */ - void unload(@NotNull OfflinePlayer offline); - - Logger getLogger(); + /** + * Check if the server version is supported by OpenInv. + * + * @return true if the server version is supported + */ + boolean isSupportedVersion(); + + /** + * Check the configuration value for whether OpenInv saves player data when unloading players. This is exclusively + * for users who do not allow editing of inventories, only viewing, and wish to prevent any possibility of bugs such + * as lishid#40. If true, OpenInv will not ever save any edits made to players. + * + * @return false unless configured otherwise + */ + boolean disableSaving(); + + /** + * Check the configuration value for whether OpenInv allows offline access. If true, OpenInv will not load or allow + * modification of players while they are not online. This does not prevent other plugins from using existing loaded + * players who have gone offline. + * + * @return false unless configured otherwise + * @since 4.2.0 + */ + boolean disableOfflineAccess(); + + /** + * Check the configuration value for whether OpenInv uses history for opening commands. If false, OpenInv will use + * the previous parameterized search when no parameters are provided. + * + * @return false unless configured otherwise + * @since 4.3.0 + */ + boolean noArgsOpensSelf(); + + /** + * Get the active {@link IAnySilentContainer} implementation. + * + * @return the active implementation for the server version + * @throws IllegalStateException if the server version is unsupported + */ + @NotNull IAnySilentContainer getAnySilentContainer(); + + /** + * Get whether a user has AnyContainer mode enabled. + * + * @param offline the user to obtain the state of + * @return true if AnyContainer mode is enabled + */ + boolean getAnyContainerStatus(@NotNull OfflinePlayer offline); + + /** + * Set whether a user has AnyContainer mode enabled. + * + * @param offline the user to set the state of + * @param status the state of the mode + */ + void setAnyContainerStatus(@NotNull OfflinePlayer offline, boolean status); + + /** + * Get whether a user has SilentContainer mode enabled. + * + * @param offline the user to obtain the state of + * @return true if SilentContainer mode is enabled + */ + boolean getSilentContainerStatus(@NotNull OfflinePlayer offline); + + /** + * Set whether a user has SilentContainer mode enabled. + * + * @param offline the user to set the state of + * @param status the state of the mode + */ + void setSilentContainerStatus(@NotNull OfflinePlayer offline, boolean status); + + /** + * Get an {@link ISpecialEnderChest} for a user. + * + * @param player the {@link Player} owning the inventory + * @param online whether the owner is currently online + * @return the created inventory + * @throws IllegalStateException if the server version is unsupported + * @throws InstantiationException if there was an issue creating the inventory + */ + @NotNull ISpecialEnderChest getSpecialEnderChest( + @NotNull Player player, + boolean online + ) throws InstantiationException; + + /** + * Get an {@link ISpecialPlayerInventory} for a user. + * + * @param player the {@link Player} owning the inventory + * @param online whether the owner is currently online + * @return the created inventory + * @throws IllegalStateException if the server version is unsupported + * @throws InstantiationException if there was an issue creating the inventory + */ + @NotNull ISpecialPlayerInventory getSpecialInventory( + @NotNull Player player, + boolean online + ) throws InstantiationException; + + /** + * @deprecated Use {@link #openInventory(Player, ISpecialInventory, boolean)} + */ + @Deprecated(forRemoval = true, since = "5.2.0") + @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory); + + /** + * Open an {@link ISpecialInventory} for a {@link Player}. + * + * @param player the viewer + * @param inventory the inventory to open + * @param viewOnly whether the inventory should be view-only + * @return the resulting {@link InventoryView} + */ + @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory, boolean viewOnly); + + /** + * Check if a {@link Player} is currently loaded by OpenInv. + * + * @param playerUuid the {@link UUID} of the {@code Player} + * @return whether the {@code Player} is loaded + * @since 4.2.0 + */ + boolean isPlayerLoaded(@NotNull UUID playerUuid); + + /** + * Load a {@link Player} from an {@link OfflinePlayer}. If the user has not played before or the default world for + * the server is not loaded, this will return {@code null}. + * + * @param offline the {@code OfflinePlayer} to load a {@code Player} for + * @return the loaded {@code Player} + * @throws IllegalStateException if the server version is unsupported + */ + @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline); + + /** + * Match an existing {@link OfflinePlayer}. If the name is a {@link UUID#toString() UUID string}, this will only + * return the user if they have actually played on the server before, unlike {@link Bukkit#getOfflinePlayer(UUID)}. + * + *
This method is potentially very heavily blocking. It should not ever be called on the + * main thread, and if it is, a stack trace will be displayed alerting server owners to the + * call. + * + * @param name the string to match + * @return the user with the closest matching name + */ + @Nullable OfflinePlayer matchPlayer(@NotNull String name); + + /** + * Forcibly close inventories of and unload any cached data for a user. + * + * @param offline the {@link OfflinePlayer} to unload + */ + void unload(@NotNull OfflinePlayer offline); + + Logger getLogger(); } diff --git a/api/src/main/java/com/lishid/openinv/event/OpenPlayerSaveEvent.java b/api/src/main/java/com/lishid/openinv/event/OpenPlayerSaveEvent.java new file mode 100644 index 00000000..7f0e16c6 --- /dev/null +++ b/api/src/main/java/com/lishid/openinv/event/OpenPlayerSaveEvent.java @@ -0,0 +1,56 @@ +package com.lishid.openinv.event; + +import com.google.errorprone.annotations.RestrictedApi; +import com.lishid.openinv.internal.ISpecialInventory; +import org.bukkit.entity.Player; +import org.bukkit.event.HandlerList; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +/** + * Event fired before OpenInv saves a player's data when closing an {@link ISpecialInventory}. + */ +public class OpenPlayerSaveEvent extends PlayerSaveEvent { + + private static final HandlerList HANDLERS = new HandlerList(); + + private final ISpecialInventory inventory; + + /** + * Construct a new {@code OpenPlayerSaveEvent}. + * + *
The constructor is not considered part of the API, and may be subject to change.
+ * + * @param player the player to be saved + * @param inventory the {@link ISpecialInventory} being closed + */ + @RestrictedApi( + explanation = "Constructor is not considered part of the API and may be subject to change.", + allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java" + ) + @ApiStatus.Internal + OpenPlayerSaveEvent(@NotNull Player player, @NotNull ISpecialInventory inventory) { + super(player); + this.inventory = inventory; + } + + /** + * Get the {@link ISpecialInventory} that triggered the save by being closed. + * + * @return the special inventory + */ + public @NotNull ISpecialInventory getInventory() { + return inventory; + } + + @NotNull + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + public static HandlerList getHandlerList() { + return HANDLERS; + } + +} diff --git a/api/src/main/java/com/lishid/openinv/event/PlayerSaveEvent.java b/api/src/main/java/com/lishid/openinv/event/PlayerSaveEvent.java new file mode 100644 index 00000000..3fd98039 --- /dev/null +++ b/api/src/main/java/com/lishid/openinv/event/PlayerSaveEvent.java @@ -0,0 +1,67 @@ +package com.lishid.openinv.event; + + +import com.google.errorprone.annotations.RestrictedApi; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +/** + * Event fired before a {@link Player} loaded via OpenInv is saved. + */ +public class PlayerSaveEvent extends PlayerEvent implements Cancellable { + + private static final HandlerList HANDLERS = new HandlerList(); + + private boolean cancelled = false; + + /** + * Construct a new {@code PlayerSaveEvent}. + * + *The constructor is not considered part of the API, and may be subject to change.
+ * + * @param player the player to be saved + */ + @RestrictedApi( + explanation = "Constructor is not considered part of the API and may be subject to change.", + allowedOnPath = ".*/com/lishid/openinv/event/(OpenPlayerSaveEvent|OpenEvents).java" + ) + @ApiStatus.Internal + PlayerSaveEvent(@NotNull Player player) { + super(player); + } + + /** + * Get whether the event is cancelled. + * + * @return true if the event is cancelled + */ + @Override + public boolean isCancelled() { + return cancelled; + } + + /** + * Set whether the event is cancelled. + * + * @param cancel whether the event is cancelled + */ + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } + + @NotNull + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + public static HandlerList getHandlerList() { + return HANDLERS; + } + +} diff --git a/api/src/main/java/com/lishid/openinv/event/PlayerToggledEvent.java b/api/src/main/java/com/lishid/openinv/event/PlayerToggledEvent.java new file mode 100644 index 00000000..ed00a5ee --- /dev/null +++ b/api/src/main/java/com/lishid/openinv/event/PlayerToggledEvent.java @@ -0,0 +1,71 @@ +package com.lishid.openinv.event; + +import com.google.errorprone.annotations.RestrictedApi; +import com.lishid.openinv.util.setting.PlayerToggle; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +import java.util.UUID; + +/** + * Event fired after OpenInv modifies a toggleable setting for a player. + */ +public class PlayerToggledEvent extends Event { + + private static final HandlerList HANDLERS = new HandlerList(); + + private final @NotNull PlayerToggle toggle; + private final @NotNull UUID uuid; + private final boolean enabled; + + @RestrictedApi( + explanation = "Constructor is not considered part of the API and may be subject to change.", + allowedOnPath = ".*/com/lishid/openinv/event/OpenEvents.java" + ) + @ApiStatus.Internal + PlayerToggledEvent(@NotNull PlayerToggle toggle, @NotNull UUID uuid, boolean enabled) { + this.toggle = toggle; + this.uuid = uuid; + this.enabled = enabled; + } + + /** + * Get the {@link PlayerToggle} affected. + * + * @return the toggle + */ + public @NotNull PlayerToggle getToggle() { + return toggle; + } + + /** + * Get the {@link UUID} of the player whose setting was changed. + * + * @return the player ID + */ + public @NotNull UUID getPlayerId() { + return uuid; + } + + /** + * Get whether the toggle is enabled. + * + * @return true if the toggle is enabled + */ + public boolean isEnabled() { + return enabled; + } + + @NotNull + @Override + public HandlerList getHandlers() { + return HANDLERS; + } + + public static HandlerList getHandlerList() { + return HANDLERS; + } + +} diff --git a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java index 02cab779..3f83147a 100644 --- a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java +++ b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2020 lishid. All rights reserved. + * Copyright (C) 2011-2023 lishid. All rights reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,45 +17,106 @@ package com.lishid.openinv.internal; import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.BlockState; +import org.bukkit.block.EnderChest; +import org.bukkit.block.data.Directional; +import org.bukkit.entity.Cat; import org.bukkit.entity.Player; +import org.bukkit.inventory.InventoryHolder; +import org.bukkit.util.BoundingBox; import org.jetbrains.annotations.NotNull; public interface IAnySilentContainer { - /** - * Opens the container at the given coordinates for the Player. If you do not want blocked - * containers to open, be sure to check {@link #isAnyContainerNeeded(Player, Block)} - * first. - * - * @param player the Player opening the container - * @param silent whether the container's noise is to be silenced - * @param block the Block - * @return true if the container can be opened - */ - boolean activateContainer(@NotNull Player player, boolean silent, @NotNull Block block); - - /** - * Closes the Player's currently open container silently, if necessary. - * - * @param player the Player closing a container - */ - void deactivateContainer(@NotNull Player player); - - /** - * Checks if the container at the given coordinates is blocked. - * - * @param player the Player opening the container - * @param block the Block - * @return true if the container is blocked - */ - boolean isAnyContainerNeeded(@NotNull Player player, @NotNull Block block); - - /** - * Checks if the given block is a container which can be unblocked or silenced. - * - * @param block the BlockState - * @return true if the Block is a supported container - */ - boolean isAnySilentContainer(@NotNull Block block); + /** + * Forcibly open the container at the given coordinates for the Player. This will open blocked containers! Be sure + * to check {@link #isAnyContainerNeeded(Block)} first if that is not desirable. + * + * @param player the {@link Player} opening the container + * @param silent whether the container's noise is to be silenced + * @param block the {@link Block} of the container + * @return true if the container can be opened + */ + boolean activateContainer(@NotNull Player player, boolean silent, @NotNull Block block); + + /** + * Perform operations required to close the current container silently. + * + * @param player the {@link Player} closing a container + */ + void deactivateContainer(@NotNull Player player); + + /** + * Check if the container at the given coordinates is blocked. + * + * @param block the {@link Block} of the container + * @return true if the container is blocked + */ + boolean isAnyContainerNeeded(@NotNull Block block); + + /** + * Check if a shulker box block cannot be opened under ordinary circumstances. + * + * @param shulkerBox the shulker box block + * @return whether the container is blocked + */ + default boolean isShulkerBlocked(@NotNull Block shulkerBox) { + Directional directional = (Directional) shulkerBox.getBlockData(); + BlockFace facing = directional.getFacing(); + // Construct a new 1-block bounding box at the origin. + BoundingBox box = new BoundingBox(0, 0, 0, 1, 1, 1); + // Expand the box in the direction the shulker will open. + box.expand(facing, 0.5); + // Move the box away from the origin by a block so only the expansion intersects with a box around the origin. + box.shift(facing.getOppositeFace().getDirection()); + // Check if the relative block's collision shape (which will be at the origin) intersects with the expanded box. + return shulkerBox.getRelative(facing).getCollisionShape().overlaps(box); + } + + /** + * Check if a chest cannot be opened under ordinary circumstances. + * + * @param chest the chest block + * @return whether the container is blocked + */ + default boolean isChestBlocked(@NotNull Block chest) { + org.bukkit.block.Block relative = chest.getRelative(0, 1, 0); + return relative.getType().isOccluding() + || !chest.getWorld().getNearbyEntities(BoundingBox.of(relative), Cat.class::isInstance).isEmpty(); + } + + /** + * Check if the given {@link Block} is a container which can be unblocked or silenced. + * + * @param block the potential container + * @return true if the type is a supported container + */ + boolean isAnySilentContainer(@NotNull Block block); + + /** + * Check if the given {@link BlockState} is a container which can be unblocked or silenced. + * + * @param blockState the potential container + * @return true if the type is a supported container + */ + default boolean isAnySilentContainer(@NotNull BlockState blockState) { + return (blockState instanceof InventoryHolder holder && isAnySilentContainer(holder)) + || blockState instanceof EnderChest; + } + + /** + * Check if the given {@link InventoryHolder} is a container which can be unblocked or silenced. + * + * @param holder the potential container + * @return true if the type is a supported container + */ + default boolean isAnySilentContainer(@NotNull InventoryHolder holder) { + return holder instanceof org.bukkit.block.EnderChest + || holder instanceof org.bukkit.block.Chest + || holder instanceof org.bukkit.block.DoubleChest + || holder instanceof org.bukkit.block.ShulkerBox + || holder instanceof org.bukkit.block.Barrel; + } } diff --git a/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java b/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java deleted file mode 100644 index 37677047..00000000 --- a/api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2011-2020 lishid. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, seeThis casts the field to the correct class. Any issues will result in a {@code null} return value.
+ *
+ * @param fieldType the {@link Class} of {@code Object} stored in the {@code Field}
+ * @param holder the containing {@code Object}
+ * @param Unmodifiable because I said so. Use your own crafting grid. Used to prevent plugins (particularly sorting plugins) from adding placeholders to inventories. Note that this method is specifically for converting an ISpecialPlayerInventory slot number into a regular
- * player inventory slot number.
- *
- * @param view the open inventory view
- * @param rawSlot the raw slot in the view
- * @return the converted slot number
- */
- public int convertToPlayerSlot(InventoryView view, int rawSlot) {
- return this.accessor.getPlayerDataManager().convertToPlayerSlot(view, rawSlot);
- }
-
- @Override
- public boolean disableSaving() {
- return this.getConfig().getBoolean("settings.disable-saving", false);
- }
-
- @NotNull
- @Override
- public IAnySilentContainer getAnySilentContainer() {
- return this.accessor.getAnySilentContainer();
- }
-
- @Override
- public boolean getPlayerAnyChestStatus(@NotNull final OfflinePlayer player) {
- boolean defaultState = false;
-
- if (player.isOnline()) {
- Player onlinePlayer = player.getPlayer();
- if (onlinePlayer != null) {
- defaultState = Permissions.ANY_DEFAULT.hasPermission(onlinePlayer);
- }
- }
-
- return this.getConfig().getBoolean("toggles.any-chest." + this.getPlayerID(player), defaultState);
- }
-
- @Override
- public boolean getPlayerSilentChestStatus(@NotNull final OfflinePlayer offline) {
- boolean defaultState = false;
-
- if (offline.isOnline()) {
- Player onlinePlayer = offline.getPlayer();
- if (onlinePlayer != null) {
- defaultState = Permissions.SILENT_DEFAULT.hasPermission(onlinePlayer);
- }
- }
-
- return this.getConfig().getBoolean("toggles.silent-chest." + this.getPlayerID(offline), defaultState);
- }
-
- @NotNull
- @Override
- public ISpecialEnderChest getSpecialEnderChest(@NotNull final Player player, final boolean online)
- throws InstantiationException {
- String id = this.getPlayerID(player);
- if (this.enderChests.containsKey(id)) {
- return this.enderChests.get(id);
- }
- ISpecialEnderChest inv = this.accessor.newSpecialEnderChest(player, online);
- this.enderChests.put(id, inv);
- this.playerCache.put(id, player);
- return inv;
- }
-
- @NotNull
- @Override
- public ISpecialPlayerInventory getSpecialInventory(@NotNull final Player player, final boolean online)
- throws InstantiationException {
- String id = this.getPlayerID(player);
- if (this.inventories.containsKey(id)) {
- return this.inventories.get(id);
- }
- ISpecialPlayerInventory inv = this.accessor.newSpecialPlayerInventory(player, online);
- this.inventories.put(id, inv);
- this.playerCache.put(id, player);
- return inv;
- }
-
- @Override
- public boolean isSupportedVersion() {
- return this.accessor != null && this.accessor.isSupported();
- }
-
- @Override
- public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) {
-
- String key = this.getPlayerID(offline);
- if (this.playerCache.containsKey(key)) {
- return this.playerCache.get(key);
- }
-
- Player player = offline.getPlayer();
- if (player != null) {
- this.playerCache.put(key, player);
- return player;
- }
-
- if (!this.isSupportedVersion()) {
- return null;
- }
-
- if (Bukkit.isPrimaryThread()) {
- return this.accessor.getPlayerDataManager().loadPlayer(offline);
- }
-
- Future Implementation note: a return value of {@code null} will cause the command to cease
+ * execution with no feedback. Appropriate feedback should be sent in the implementation. Note that this method is specifically for converting an ISpecialPlayerInventory slot number into a regular
- * player inventory slot number.
- *
- * @param view the open inventory view
- * @param rawSlot the raw slot in the view
- * @return the converted slot number
- */
- int convertToPlayerSlot(InventoryView view, int rawSlot);
-
-}
diff --git a/plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java b/plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java
deleted file mode 100644
index 8fc6f09d..00000000
--- a/plugin/src/main/java/com/lishid/openinv/internal/OpenInventoryView.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2011-2021 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see