From 5dbb400a0c188660936ad4a127b93373ff8bc7c9 Mon Sep 17 00:00:00 2001 From: Eric Date: Sun, 21 Aug 2022 19:19:09 +0200 Subject: [PATCH] Change version to 2.0-SNAPSHOT --- addons/askyblock/pom.xml | 4 +-- addons/bentobox/pom.xml | 4 +-- addons/worldguard/pom.xml | 4 +-- api/pom.xml | 4 +-- .../de/epiceric/shopchest/api/ShopChest.java | 2 +- .../epiceric/shopchest/api/ShopManager.java | 18 ++++++------- .../shopchest/api/command/ShopCommand.java | 14 +++++----- .../shopchest/api/command/SubCommand.java | 16 ++++++------ .../epiceric/shopchest/api/config/Config.java | 2 +- .../api/config/MaterialDoubleMap.java | 10 +++---- .../shopchest/api/config/MaterialList.java | 10 +++---- .../shopchest/api/config/Property.java | 12 ++++----- .../shopchest/api/config/StringList.java | 10 +++---- .../shopchest/api/event/ShopBuySellEvent.java | 12 ++++----- .../shopchest/api/event/ShopCreateEvent.java | 4 +-- .../shopchest/api/event/ShopEditEvent.java | 10 +++---- .../shopchest/api/event/ShopEvent.java | 6 ++--- .../shopchest/api/event/ShopExtendEvent.java | 4 +-- .../shopchest/api/event/ShopInfoEvent.java | 2 +- .../shopchest/api/event/ShopLoadedEvent.java | 4 +-- .../shopchest/api/event/ShopOpenEvent.java | 2 +- .../api/event/ShopPreCreateEvent.java | 16 ++++++------ .../shopchest/api/event/ShopPreEditEvent.java | 12 ++++----- .../shopchest/api/event/ShopPreInfoEvent.java | 4 +-- .../shopchest/api/event/ShopPreOpenEvent.java | 4 +-- .../api/event/ShopPreRemoveEvent.java | 4 +-- .../shopchest/api/event/ShopReloadEvent.java | 4 +-- .../api/event/ShopRemoveAllEvent.java | 8 +++--- .../shopchest/api/event/ShopRemoveEvent.java | 2 +- .../api/event/ShopSelectItemEvent.java | 20 +++++++------- .../shopchest/api/event/ShopUseEvent.java | 12 ++++----- .../epiceric/shopchest/api/flag/EditFlag.java | 6 ++--- .../de/epiceric/shopchest/api/flag/Flag.java | 6 ++--- .../shopchest/api/player/ShopPlayer.java | 22 ++++++++-------- .../de/epiceric/shopchest/api/shop/Shop.java | 26 +++++++++---------- .../shopchest/api/shop/ShopProduct.java | 12 ++++----- core/pom.xml | 8 +++--- .../shopchest/command/ShopCommandImpl.java | 2 +- .../de/epiceric/shopchest/shop/ShopImpl.java | 4 +-- nms/aggregator/pom.xml | 4 +-- nms/interfaces/pom.xml | 4 +-- nms/pom.xml | 4 +-- nms/v10r1/pom.xml | 6 ++--- nms/v11r1/pom.xml | 6 ++--- nms/v12r1/pom.xml | 6 ++--- nms/v13r1/pom.xml | 6 ++--- nms/v13r2/pom.xml | 6 ++--- nms/v14r1/pom.xml | 6 ++--- nms/v15r1/pom.xml | 6 ++--- nms/v8r1/pom.xml | 6 ++--- nms/v8r2/pom.xml | 6 ++--- nms/v8r3/pom.xml | 6 ++--- nms/v9r1/pom.xml | 6 ++--- nms/v9r2/pom.xml | 6 ++--- pom.xml | 2 +- 55 files changed, 206 insertions(+), 206 deletions(-) diff --git a/addons/askyblock/pom.xml b/addons/askyblock/pom.xml index 93106f2..8e3e4d0 100644 --- a/addons/askyblock/pom.xml +++ b/addons/askyblock/pom.xml @@ -13,7 +13,7 @@ de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT @@ -27,7 +27,7 @@ de.epiceric.shopchest shopchest-api - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/addons/bentobox/pom.xml b/addons/bentobox/pom.xml index 58c4ce4..b61b23c 100644 --- a/addons/bentobox/pom.xml +++ b/addons/bentobox/pom.xml @@ -13,7 +13,7 @@ de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT @@ -27,7 +27,7 @@ de.epiceric.shopchest shopchest-api - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/addons/worldguard/pom.xml b/addons/worldguard/pom.xml index 100e4a2..c8a9d95 100644 --- a/addons/worldguard/pom.xml +++ b/addons/worldguard/pom.xml @@ -13,7 +13,7 @@ de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT @@ -27,7 +27,7 @@ de.epiceric.shopchest shopchest-api - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/api/pom.xml b/api/pom.xml index 9979f02..9079132 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,13 +6,13 @@ de.epiceric.shopchest shopchest-api - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest API de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT diff --git a/api/src/main/java/de/epiceric/shopchest/api/ShopChest.java b/api/src/main/java/de/epiceric/shopchest/api/ShopChest.java index c454823..8d8c137 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/ShopChest.java +++ b/api/src/main/java/de/epiceric/shopchest/api/ShopChest.java @@ -9,7 +9,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; /** * The plugin's main entry point * - * @since 1.13 + * @since 2.0 */ public abstract class ShopChest extends JavaPlugin { diff --git a/api/src/main/java/de/epiceric/shopchest/api/ShopManager.java b/api/src/main/java/de/epiceric/shopchest/api/ShopManager.java index b1492f3..178122f 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/ShopManager.java +++ b/api/src/main/java/de/epiceric/shopchest/api/ShopManager.java @@ -16,7 +16,7 @@ import de.epiceric.shopchest.api.shop.ShopProduct; /** * Collection of methods to get, add or remove shops * - * @since 1.13 + * @since 2.0 */ public interface ShopManager { @@ -32,7 +32,7 @@ public interface ShopManager { * * @param id the shop's ID * @return the shop or an empty optional if there is no shop loaded - * @since 1.13 + * @since 2.0 */ Optional getShop(int id); @@ -41,7 +41,7 @@ public interface ShopManager { * * @param location the shop's chest location * @return the shop or an empty optional if there is no shop loaded - * @since 1.13 + * @since 2.0 */ Optional getShop(Location location); @@ -50,7 +50,7 @@ public interface ShopManager { * * @param vendor the player * @return a collection of shops - * @since 1.13 + * @since 2.0 * @see ShopPlayer#getShops() */ Collection getShops(OfflinePlayer vendor); @@ -60,7 +60,7 @@ public interface ShopManager { * * @param world the world * @return a collection of shops - * @since 1.13 + * @since 2.0 */ Collection getShops(World world); @@ -78,7 +78,7 @@ public interface ShopManager { * @param buyPrice the price a player can buy the product for. * @param sellPrice the price a player can sell the product for. * @return a completable future returning the new shop - * @since 1.13 + * @since 2.0 * @see ShopManager#addAdminShop(ShopProduct, Location, double, double) */ CompletableFuture addShop(OfflinePlayer vendor, ShopProduct product, Location location, double buyPrice, double sellPrice); @@ -96,7 +96,7 @@ public interface ShopManager { * @param buyPrice the price a player can buy the product for. * @param sellPrice the price a player can sell the product for. * @return a completable future returning the new shop - * @since 1.13 + * @since 2.0 * @see ShopManager#addShop(OfflinePlayer, ShopProduct, Location, double, double) */ CompletableFuture addAdminShop(ShopProduct product, Location location, double buyPrice, double sellPrice); @@ -106,7 +106,7 @@ public interface ShopManager { * * @param shop the shop to remove * @return a completable future returning nothing - * @since 1.13 + * @since 2.0 */ CompletableFuture removeShop(Shop shop); @@ -116,7 +116,7 @@ public interface ShopManager { * This does not trigger the {@link ShopReloadEvent}. * * @return a completable future returning the loaded shops - * @since 1.13 + * @since 2.0 */ CompletableFuture> reloadShops(); diff --git a/api/src/main/java/de/epiceric/shopchest/api/command/ShopCommand.java b/api/src/main/java/de/epiceric/shopchest/api/command/ShopCommand.java index 2a33f8b..3783ca5 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/command/ShopCommand.java +++ b/api/src/main/java/de/epiceric/shopchest/api/command/ShopCommand.java @@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender; /** * Represents the plugin's main command * - * @since 1.13 + * @since 2.0 */ public abstract class ShopCommand { private List subCommands = new ArrayList<>(); @@ -21,7 +21,7 @@ public abstract class ShopCommand { * Gets the command's name * * @return the name - * @since 1.13 + * @since 2.0 */ public abstract String getName(); @@ -31,7 +31,7 @@ public abstract class ShopCommand { * @param subCommand the sub command * @return {@code true} if the sub command has been registered, {@code false} if * the name has already been taken - * @since 1.13 + * @since 2.0 */ public final boolean addSubCommand(SubCommand subCommand) { boolean nameTaken = subCommands.stream().filter(sub -> sub.getName().equalsIgnoreCase(subCommand.getName())) @@ -49,7 +49,7 @@ public abstract class ShopCommand { * Removes a sub command from this command * * @param subCommand the sub command - * @since 1.13 + * @since 2.0 */ public final void removeSubCommand(SubCommand subCommand) { this.subCommands.remove(subCommand); @@ -66,7 +66,7 @@ public abstract class ShopCommand { * * @param sender the command sender * @param args the arguments - * @since 1.13 + * @since 2.0 */ public final void onExecute(CommandSender sender, String... args) { if (args.length > 0) { @@ -104,7 +104,7 @@ public abstract class ShopCommand { * @param sender the command sender * @param args the arguments * @return the tab completions - * @since 1.13 + * @since 2.0 */ public final List onTabComplete(CommandSender sender, String... args) { if (args.length == 1) { @@ -127,7 +127,7 @@ public abstract class ShopCommand { * Sends the help messages for all sub commands to the given sender * * @param sender the command sender - * @since 1.13 + * @since 2.0 */ public void sendUsage(CommandSender sender) { // Use same help format as in default bukkit help message diff --git a/api/src/main/java/de/epiceric/shopchest/api/command/SubCommand.java b/api/src/main/java/de/epiceric/shopchest/api/command/SubCommand.java index 6134590..efd48e4 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/command/SubCommand.java +++ b/api/src/main/java/de/epiceric/shopchest/api/command/SubCommand.java @@ -9,7 +9,7 @@ import org.bukkit.entity.Player; * Represents a sub command for the plugin's main command * * @see ShopCommand#addSubCommand(SubCommand) - * @since 1.13 + * @since 2.0 */ public abstract class SubCommand { private final String name; @@ -24,7 +24,7 @@ public abstract class SubCommand { * @param name the name * @param onlyPlayer whether only players can run this sub command * @see ShopCommand#addSubCommand(SubCommand) - * @since 1.13 + * @since 2.0 */ public SubCommand(String name, boolean onlyPlayer) { this.name = name; @@ -35,7 +35,7 @@ public abstract class SubCommand { * Gets the name of this sub command * * @return the name - * @since 1.13 + * @since 2.0 */ public String getName() { return name; @@ -47,7 +47,7 @@ public abstract class SubCommand { * If no permission is needed, this should return an empty string. * * @return the permission or an empty string - * @since 1.13 + * @since 2.0 */ public String getPermission() { return ""; @@ -71,7 +71,7 @@ public abstract class SubCommand { * * @param sender the sender * @return whether the sender can run this sub command - * @since 1.13 + * @since 2.0 */ public boolean canExecute(CommandSender sender) { return sender instanceof Player || !onlyPlayer; @@ -81,7 +81,7 @@ public abstract class SubCommand { * Gets the description of this sub command * * @return the description - * @since 1.13 + * @since 2.0 */ public abstract String getDescription(); @@ -93,7 +93,7 @@ public abstract class SubCommand { * * @param sender the sender * @param args the arguments of the sub command - * @since 1.13 + * @since 2.0 */ public abstract void onExecute(CommandSender sender, String... args); @@ -107,7 +107,7 @@ public abstract class SubCommand { * @param sender the command sender * @param args the arguments of the sub command * @return the tab completions - * @since 1.13 + * @since 2.0 */ public abstract List onTabComplete(CommandSender sender, String... args); diff --git a/api/src/main/java/de/epiceric/shopchest/api/config/Config.java b/api/src/main/java/de/epiceric/shopchest/api/config/Config.java index b5661d7..82542ba 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/config/Config.java +++ b/api/src/main/java/de/epiceric/shopchest/api/config/Config.java @@ -7,7 +7,7 @@ import de.epiceric.shopchest.api.database.DatabaseType; /** * Class to access configuration properties * - * @since 1.13 + * @since 2.0 */ public class Config { private Config() {} diff --git a/api/src/main/java/de/epiceric/shopchest/api/config/MaterialDoubleMap.java b/api/src/main/java/de/epiceric/shopchest/api/config/MaterialDoubleMap.java index 139ef55..5277e66 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/config/MaterialDoubleMap.java +++ b/api/src/main/java/de/epiceric/shopchest/api/config/MaterialDoubleMap.java @@ -13,7 +13,7 @@ import org.bukkit.Material; * A wrapper for {@code Map}, optimised for config * serialization * - * @since 1.13 + * @since 2.0 */ public class MaterialDoubleMap { private Map map; @@ -22,7 +22,7 @@ public class MaterialDoubleMap { * Creates a map with the given map's entries * * @param map the map to wrap - * @since 1.13 + * @since 2.0 */ public MaterialDoubleMap(Map map) { this.map = map; @@ -31,7 +31,7 @@ public class MaterialDoubleMap { /** * Creates an empty map * - * @since 1.13 + * @since 2.0 */ public MaterialDoubleMap() { this(new EnumMap<>(Material.class)); @@ -46,7 +46,7 @@ public class MaterialDoubleMap { * * @param str the comma seperated list of map entries * @return the parsed map - * @since 1.13 + * @since 2.0 */ public static MaterialDoubleMap valueOf(String str) { if (str.isEmpty()) { @@ -85,7 +85,7 @@ public class MaterialDoubleMap { * Gets an instance of the map * * @return the map - * @since 1.13 + * @since 2.0 */ public Map getMap() { return map; diff --git a/api/src/main/java/de/epiceric/shopchest/api/config/MaterialList.java b/api/src/main/java/de/epiceric/shopchest/api/config/MaterialList.java index 5d2adc4..708c9d1 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/config/MaterialList.java +++ b/api/src/main/java/de/epiceric/shopchest/api/config/MaterialList.java @@ -10,7 +10,7 @@ import org.bukkit.Material; /** * A wrapped for {@code List}, optimised for config serialization * - * @since 1.13 + * @since 2.0 */ public class MaterialList { private List list; @@ -19,7 +19,7 @@ public class MaterialList { * Creates a list with the given list's entries * * @param list the list to wrap - * @since 1.13 + * @since 2.0 */ public MaterialList(List list) { this.list = list; @@ -29,7 +29,7 @@ public class MaterialList { * Creates a list with the given materials * * @param materials the materials - * @since 1.13 + * @since 2.0 */ public MaterialList(Material... materials) { this(Arrays.asList(materials)); @@ -42,7 +42,7 @@ public class MaterialList { * * @param str the comma seperated list * @return the parsed list - * @since 1.13 + * @since 2.0 */ public static MaterialList valueOf(String str) { if (str.isEmpty()) { @@ -66,7 +66,7 @@ public class MaterialList { * Gets an instance of the list * * @return the list - * @since 1.13 + * @since 2.0 */ public List getList() { return list; diff --git a/api/src/main/java/de/epiceric/shopchest/api/config/Property.java b/api/src/main/java/de/epiceric/shopchest/api/config/Property.java index b49cbaa..b07b140 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/config/Property.java +++ b/api/src/main/java/de/epiceric/shopchest/api/config/Property.java @@ -3,7 +3,7 @@ package de.epiceric.shopchest.api.config; /** * Represents a configurable property * - * @since 1.13 + * @since 2.0 */ public class Property { private final Class type; @@ -22,7 +22,7 @@ public class Property { * Gets the section of this property * * @return the section - * @since 1.13 + * @since 2.0 */ public String getSection() { return section; @@ -32,7 +32,7 @@ public class Property { * Gets the key of this property * * @return the key - * @since 1.13 + * @since 2.0 */ public String getKey() { return section + "." + key; @@ -42,7 +42,7 @@ public class Property { * Gets the class of this property's type * * @return the type - * @since 1.13 + * @since 2.0 */ public Class getType() { return type; @@ -52,7 +52,7 @@ public class Property { * Gets the current value of this property * * @return the value - * @since 1.13 + * @since 2.0 */ public T get() { return value; @@ -65,7 +65,7 @@ public class Property { * * @param value the value * @throws IllegalArgumentException if {@code value} is null - * @since 1.13 + * @since 2.0 */ public void set(T value) { if (value == null) { diff --git a/api/src/main/java/de/epiceric/shopchest/api/config/StringList.java b/api/src/main/java/de/epiceric/shopchest/api/config/StringList.java index 45d8785..cedfcbc 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/config/StringList.java +++ b/api/src/main/java/de/epiceric/shopchest/api/config/StringList.java @@ -6,7 +6,7 @@ import java.util.List; /** * A wrapped for {@code List}, optimised for config serialization * - * @since 1.13 + * @since 2.0 */ public class StringList { private List list; @@ -15,7 +15,7 @@ public class StringList { * Creates a list with the given list's entries * * @param list the list to wrap - * @since 1.13 + * @since 2.0 */ public StringList(List list) { this.list = list; @@ -25,7 +25,7 @@ public class StringList { * Creates a list with the given strings * * @param strings the strings - * @since 1.13 + * @since 2.0 */ public StringList(String... strings) { this(Arrays.asList(strings)); @@ -36,7 +36,7 @@ public class StringList { * * @param str the comma seperated list * @return the parsed list - * @since 1.13 + * @since 2.0 */ public static StringList valueOf(String str) { if (str.isEmpty()) { @@ -59,7 +59,7 @@ public class StringList { * Gets an instance of the list * * @return the list - * @since 1.13 + * @since 2.0 */ public List getList() { return list; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopBuySellEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopBuySellEvent.java index 83b5d84..960d462 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopBuySellEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopBuySellEvent.java @@ -13,7 +13,7 @@ import org.bukkit.event.EventPriority; * If the transaction fails, this should be checked in a listener with * {@link EventPriority#MONITOR}. * - * @since 1.13 + * @since 2.0 */ public class ShopBuySellEvent extends ShopEvent implements Cancellable { private Type type; @@ -32,7 +32,7 @@ public class ShopBuySellEvent extends ShopEvent implements Cancellable { * Gets whether the type of transaction is a buy or a sell * * @return the type of transaction - * @since 1.13 + * @since 2.0 */ public Type getType() { return type; @@ -43,7 +43,7 @@ public class ShopBuySellEvent extends ShopEvent implements Cancellable { * calculation * * @return the amount - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -55,7 +55,7 @@ public class ShopBuySellEvent extends ShopEvent implements Cancellable { * This might not be equal to the amount specified in {@link Shop#getProduct()}. * * @param amount the amount - * @since 1.13 + * @since 2.0 */ public void setAmount(int amount) { this.amount = amount; @@ -68,7 +68,7 @@ public class ShopBuySellEvent extends ShopEvent implements Cancellable { * {@link Shop#getSellPrice()}. * * @return the price - * @since 1.13 + * @since 2.0 */ public double getPrice() { return price; @@ -79,7 +79,7 @@ public class ShopBuySellEvent extends ShopEvent implements Cancellable { * receive * * @param price the price - * @since 1.13 + * @since 2.0 */ public void setPrice(double price) { this.price = price; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopCreateEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopCreateEvent.java index e515210..0eb36f6 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopCreateEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopCreateEvent.java @@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable; /** * Called when a player clicks a chest to create a shop * - * @since 1.13 + * @since 2.0 */ public class ShopCreateEvent extends ShopEvent implements Cancellable { private double creationPrice; @@ -24,7 +24,7 @@ public class ShopCreateEvent extends ShopEvent implements Cancellable { * The price is only paid if the event is not cancelled. * * @return the creation price - * @since 1.13 + * @since 2.0 */ public double getCreationPrice() { return creationPrice; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopEditEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopEditEvent.java index f23bc80..9184a48 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopEditEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopEditEvent.java @@ -13,7 +13,7 @@ import de.epiceric.shopchest.api.shop.Shop; * Called when a player clicks a chest to edit a shop * * @see ShopSelectItemEvent - * @since 1.13 + * @since 2.0 */ public class ShopEditEvent extends ShopEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -36,7 +36,7 @@ public class ShopEditEvent extends ShopEvent implements Cancellable { * Gets the new item stack the shop will sell or buy * * @return the new product, or the old product if it has not been set - * @since 1.13 + * @since 2.0 */ public ItemStack getItemStack() { return Optional.ofNullable(itemStack).orElse(getShop().getProduct().getItemStack()); @@ -46,7 +46,7 @@ public class ShopEditEvent extends ShopEvent implements Cancellable { * Gets the new amount of items the shop will sell or buy * * @return the new amount, or the old amount if it has not been set - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount == -1 ? getShop().getProduct().getAmount() : amount; @@ -56,7 +56,7 @@ public class ShopEditEvent extends ShopEvent implements Cancellable { * Gets the new price for which players will be able to buy from the shop * * @return the new buy price, or the old buy price if it has not been set - * @since 1.13 + * @since 2.0 */ public double getBuyPrice() { return buyPrice == -1 ? getShop().getBuyPrice() : buyPrice; @@ -66,7 +66,7 @@ public class ShopEditEvent extends ShopEvent implements Cancellable { * Gets the new price for which players will be able to sell to the shop * * @return the new sell price, or the old sell price if it has not been set - * @since 1.13 + * @since 2.0 */ public double getSellPrice() { return sellPrice == -1 ? getShop().getSellPrice() : sellPrice; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopEvent.java index 352a5db..e426acc 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopEvent.java @@ -8,7 +8,7 @@ import org.bukkit.event.HandlerList; /** * Represents a shop related event * - * @since 1.13 + * @since 2.0 */ public abstract class ShopEvent extends Event { private static final HandlerList handlers = new HandlerList(); @@ -25,7 +25,7 @@ public abstract class ShopEvent extends Event { * Get the shop which is involved in this event * * @return the shop - * @since 1.13 + * @since 2.0 */ public Shop getShop() { return shop; @@ -35,7 +35,7 @@ public abstract class ShopEvent extends Event { * Gets the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopExtendEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopExtendEvent.java index 530e928..641935e 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopExtendEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopExtendEvent.java @@ -9,7 +9,7 @@ import org.bukkit.event.Cancellable; /** * Called when a player extends a shop's chest to a double chest * - * @since 1.13 + * @since 2.0 */ public class ShopExtendEvent extends ShopEvent implements Cancellable { private boolean cancelled; @@ -24,7 +24,7 @@ public class ShopExtendEvent extends ShopEvent implements Cancellable { * Gets the location of the placed chest * * @return the location of the placed chest - * @since 1.13 + * @since 2.0 */ public Location getNewChestLocation() { return newChestLocation; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopInfoEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopInfoEvent.java index 68c4019..28cd71c 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopInfoEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopInfoEvent.java @@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable; /** * Called when a player clicks a shop to retrieve information about it * - * @since 1.13 + * @since 2.0 */ public class ShopInfoEvent extends ShopEvent implements Cancellable { private boolean cancelled; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopLoadedEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopLoadedEvent.java index d384a0a..8d9d869 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopLoadedEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopLoadedEvent.java @@ -11,7 +11,7 @@ import de.epiceric.shopchest.api.shop.Shop; /** * Called after shops are loaded from the database due to a chunk load * - * @since 1.13 + * @since 2.0 */ public class ShopLoadedEvent extends Event { private static final HandlerList handlers = new HandlerList(); @@ -26,7 +26,7 @@ public class ShopLoadedEvent extends Event { * Gets the shops that have been loaded * * @return the shops - * @since 1.13 + * @since 2.0 */ public Collection getShops() { return shops; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopOpenEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopOpenEvent.java index 19218ac..04d60a8 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopOpenEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopOpenEvent.java @@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable; /** * Called when a player clicks a shop to open it * - * @since 1.13 + * @since 2.0 */ public class ShopOpenEvent extends ShopEvent implements Cancellable { private boolean cancelled; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreCreateEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreCreateEvent.java index dfcdeb2..c6dd4ec 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreCreateEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreCreateEvent.java @@ -14,7 +14,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; * creative inventory to cancel shop creation. * * @see ShopSelectItemEvent - * @since 1.13 + * @since 2.0 */ public class ShopPreCreateEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -40,7 +40,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; @@ -50,7 +50,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets the item stack the shop will sell or buy * * @return the product or {@code null} if it has not been selected - * @since 1.13 + * @since 2.0 */ public ItemStack getItemStack() { return itemStack == null ? null : itemStack.clone(); @@ -60,7 +60,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets the amount of items the shop will sell or buy * * @return the amount - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -70,7 +70,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets whether the item has already been selected * * @return whether the item has been selected - * @since 1.13 + * @since 2.0 */ public boolean isItemSelected() { return getItemStack() != null; @@ -80,7 +80,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets the price for which players will be able to buy from the shop * * @return the buy price - * @since 1.13 + * @since 2.0 */ public double getBuyPrice() { return buyPrice; @@ -90,7 +90,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets the price for which players will be able to sell to the shop * * @return the sell price - * @since 1.13 + * @since 2.0 */ public double getSellPrice() { return sellPrice; @@ -100,7 +100,7 @@ public class ShopPreCreateEvent extends Event implements Cancellable { * Gets whether the shop will be an admin shop * * @return whether the shop will be an admin shop - * @since 1.13 + * @since 2.0 */ public boolean isAdminShop() { return admin; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreEditEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreEditEvent.java index d7b131a..a97c2e4 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreEditEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreEditEvent.java @@ -14,7 +14,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; * creative inventory to cancel the shop edit. * * @see ShopSelectItemEvent - * @since 1.13 + * @since 2.0 */ public class ShopPreEditEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -40,7 +40,7 @@ public class ShopPreEditEvent extends Event implements Cancellable { * Gets the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; @@ -50,7 +50,7 @@ public class ShopPreEditEvent extends Event implements Cancellable { * Gets the item stack the shop will sell or buy * * @return the product or null if it has not been selected (yet) - * @since 1.13 + * @since 2.0 */ public ItemStack getItemStack() { return itemStack == null ? null : itemStack.clone(); @@ -69,7 +69,7 @@ public class ShopPreEditEvent extends Event implements Cancellable { * Gets the amount the player has set * * @return the amount or -1 if no amount was set - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -88,7 +88,7 @@ public class ShopPreEditEvent extends Event implements Cancellable { * Gets the buy price the player has set * * @return the buy price or -1 if no buy price was set - * @since 1.13 + * @since 2.0 */ public double getBuyPrice() { return buyPrice; @@ -107,7 +107,7 @@ public class ShopPreEditEvent extends Event implements Cancellable { * Gets the sell price the player has set * * @return the sell price or -1 if no sell price was set - * @since 1.13 + * @since 2.0 */ public double getSellPrice() { return sellPrice; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreInfoEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreInfoEvent.java index 4314c53..44d8b4d 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreInfoEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreInfoEvent.java @@ -9,7 +9,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; /** * Called when a player enters the command to retrieve information about a shop * - * @since 1.13 + * @since 2.0 */ public class ShopPreInfoEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -25,7 +25,7 @@ public class ShopPreInfoEvent extends Event implements Cancellable { * Gets the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreOpenEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreOpenEvent.java index 4428aeb..f672605 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreOpenEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreOpenEvent.java @@ -9,7 +9,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; /** * Called when a player enters the command to open a shop * - * @since 1.13 + * @since 2.0 */ public class ShopPreOpenEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -25,7 +25,7 @@ public class ShopPreOpenEvent extends Event implements Cancellable { * Get the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreRemoveEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreRemoveEvent.java index 0aaece9..4d1110d 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreRemoveEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopPreRemoveEvent.java @@ -9,7 +9,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; /** * Called when a player enters the command to remove a shop * - * @since 1.13 + * @since 2.0 */ public class ShopPreRemoveEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -25,7 +25,7 @@ public class ShopPreRemoveEvent extends Event implements Cancellable { * Gets the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopReloadEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopReloadEvent.java index e946869..102d24a 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopReloadEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopReloadEvent.java @@ -8,7 +8,7 @@ import org.bukkit.event.HandlerList; /** * Called when the shops are reloaded by a command * - * @since 1.13 + * @since 2.0 */ public class ShopReloadEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -24,7 +24,7 @@ public class ShopReloadEvent extends Event implements Cancellable { * Gets the sender that entered the reload command * * @return the sender - * @since 1.13 + * @since 2.0 */ public CommandSender getSender() { return sender; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveAllEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveAllEvent.java index aad6ddd..fdf061c 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveAllEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveAllEvent.java @@ -12,7 +12,7 @@ import java.util.List; /** * Called when a player enters the command to remove all shops of a player * - * @since 1.13 + * @since 2.0 */ public class ShopRemoveAllEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -32,7 +32,7 @@ public class ShopRemoveAllEvent extends Event implements Cancellable { * Gets the sender that entered the reload command * * @return the sender - * @since 1.13 + * @since 2.0 */ public CommandSender getSender() { return sender; @@ -42,7 +42,7 @@ public class ShopRemoveAllEvent extends Event implements Cancellable { * Gets the player whose shops will be removed * * @return the vendor - * @since 1.13 + * @since 2.0 */ public OfflinePlayer getVendor() { return vendor; @@ -54,7 +54,7 @@ public class ShopRemoveAllEvent extends Event implements Cancellable { * This list can be modified to include or exclude certain shops. * * @return a modifiable list of shops - * @since 1.13 + * @since 2.0 */ public List getShops() { return shops; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveEvent.java index fffc40d..5ebde9b 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopRemoveEvent.java @@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable; /** * Called when a player enters the command to remove a shop * - * @since 1.13 + * @since 2.0 */ public class ShopRemoveEvent extends ShopEvent implements Cancellable { private boolean cancelled; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopSelectItemEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopSelectItemEvent.java index 85040b5..be7bf53 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopSelectItemEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopSelectItemEvent.java @@ -11,7 +11,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; /** * Called when a player has selected an item * - * @since 1.13 + * @since 2.0 */ public class ShopSelectItemEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -37,7 +37,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * Gets the player who is involved in this event * * @return the player - * @since 1.13 + * @since 2.0 */ public ShopPlayer getPlayer() { return player; @@ -47,7 +47,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * Gets the item the player has selected * * @return the item - * @since 1.13 + * @since 2.0 */ public ItemStack getItem() { return item; @@ -59,7 +59,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * If {@code item} is {@code null}, the event will be cancelled. * * @param item the item - * @since 1.13 + * @since 2.0 */ public void setItem(ItemStack item) { if (item == null) { @@ -74,7 +74,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * Gets the amount of items the player wants to sell or buy at the shop * * @return the amount - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -84,7 +84,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * Gets the price for which players will be able to buy from the shop * * @return the buy price - * @since 1.13 + * @since 2.0 */ public double getBuyPrice() { return buyPrice; @@ -94,7 +94,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * Gets the price for which players will be able to sell to the shop * * @return the sell price - * @since 1.13 + * @since 2.0 */ public double getSellPrice() { return sellPrice; @@ -106,7 +106,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * @return whether the shop will be an admin shop * @see #isNormalShop() * @see #isEditingShop() - * @since 1.13 + * @since 2.0 */ public boolean isAdminShop() { return type == SelectFlag.Type.ADMIN; @@ -118,7 +118,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * @return whether the shop will be a normal shop * @see #isAdminShop() * @see #isEditingShop() - * @since 1.13 + * @since 2.0 */ public boolean isNormalShop() { return type == SelectFlag.Type.NORMAL; @@ -130,7 +130,7 @@ public class ShopSelectItemEvent extends Event implements Cancellable { * @return whether the shop is being edited * @see #isAdminShop() * @see #isNormalShop() - * @since 1.13 + * @since 2.0 */ public boolean isEditingShop() { return type == SelectFlag.Type.EDIT; diff --git a/api/src/main/java/de/epiceric/shopchest/api/event/ShopUseEvent.java b/api/src/main/java/de/epiceric/shopchest/api/event/ShopUseEvent.java index 5ecbf31..0ffa196 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/event/ShopUseEvent.java +++ b/api/src/main/java/de/epiceric/shopchest/api/event/ShopUseEvent.java @@ -13,7 +13,7 @@ import org.bukkit.event.EventPriority; * If the transaction fails, this should be checked in a listener with * {@link EventPriority#MONITOR}. * - * @since 1.13 + * @since 2.0 */ public class ShopUseEvent extends ShopEvent implements Cancellable { private Type type; @@ -32,7 +32,7 @@ public class ShopUseEvent extends ShopEvent implements Cancellable { * Gets whether the shop use is a buy or a sell * * @return the type of shop use - * @since 1.13 + * @since 2.0 */ public Type getType() { return type; @@ -43,7 +43,7 @@ public class ShopUseEvent extends ShopEvent implements Cancellable { * calculation * * @return the amount - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -55,7 +55,7 @@ public class ShopUseEvent extends ShopEvent implements Cancellable { * This might not be equal to the amount specified in {@link Shop#getProduct()}. * * @param amount the amount - * @since 1.13 + * @since 2.0 */ public void setAmount(int amount) { this.amount = amount; @@ -68,7 +68,7 @@ public class ShopUseEvent extends ShopEvent implements Cancellable { * {@link Shop#getSellPrice()} due to automatic item amount calculation. * * @return the price - * @since 1.13 + * @since 2.0 */ public double getPrice() { return price; @@ -79,7 +79,7 @@ public class ShopUseEvent extends ShopEvent implements Cancellable { * receive * * @param price the price - * @since 1.13 + * @since 2.0 */ public void setPrice(double price) { this.price = price; diff --git a/api/src/main/java/de/epiceric/shopchest/api/flag/EditFlag.java b/api/src/main/java/de/epiceric/shopchest/api/flag/EditFlag.java index 5b642ce..bccf15e 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/flag/EditFlag.java +++ b/api/src/main/java/de/epiceric/shopchest/api/flag/EditFlag.java @@ -34,7 +34,7 @@ public class EditFlag extends TimedFlag { * Gets the amount the player has set * * @return the amount or -1 if no amount was set - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -44,7 +44,7 @@ public class EditFlag extends TimedFlag { * Gets the buy price the player has set * * @return the buy price or -1 if no buy price was set - * @since 1.13 + * @since 2.0 */ public double getBuyPrice() { return buyPrice; @@ -54,7 +54,7 @@ public class EditFlag extends TimedFlag { * Gets the sell price the player has set * * @return the sell price or -1 if no sell price was set - * @since 1.13 + * @since 2.0 */ public double getSellPrice() { return sellPrice; diff --git a/api/src/main/java/de/epiceric/shopchest/api/flag/Flag.java b/api/src/main/java/de/epiceric/shopchest/api/flag/Flag.java index 60e7f81..3fe131c 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/flag/Flag.java +++ b/api/src/main/java/de/epiceric/shopchest/api/flag/Flag.java @@ -5,7 +5,7 @@ import de.epiceric.shopchest.api.player.ShopPlayer; /** * Represents a flag a player can have * - * @since 1.13 + * @since 2.0 */ public interface Flag { @@ -13,7 +13,7 @@ public interface Flag { * Called when this flag is assigned to a player * * @param player the player - * @since 1.13 + * @since 2.0 */ default void onAssign(ShopPlayer player) {}; @@ -23,7 +23,7 @@ public interface Flag { * The flag will be removed after this method is called. * * @param player the player - * @since 1.13 + * @since 2.0 */ default void onRemove(ShopPlayer player) {}; } \ No newline at end of file diff --git a/api/src/main/java/de/epiceric/shopchest/api/player/ShopPlayer.java b/api/src/main/java/de/epiceric/shopchest/api/player/ShopPlayer.java index 6054c4d..edcd84c 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/player/ShopPlayer.java +++ b/api/src/main/java/de/epiceric/shopchest/api/player/ShopPlayer.java @@ -13,7 +13,7 @@ import de.epiceric.shopchest.api.shop.Shop; /** * A wrapper for a {@link Player} with additional functions * - * @since 1.13 + * @since 2.0 */ public interface ShopPlayer { @@ -21,7 +21,7 @@ public interface ShopPlayer { * Gets the wrapped Bukkit player * * @return the wrapped player - * @since 1.13 + * @since 2.0 */ Player getBukkitPlayer(); @@ -32,7 +32,7 @@ public interface ShopPlayer { * * @param message the message (a format string) * @param args the arguments referenced by the format - * @since 1.13 + * @since 2.0 */ default void sendMessage(String message, Object... args) { getBukkitPlayer().sendMessage(MessageFormat.format(message, args)); @@ -52,7 +52,7 @@ public interface ShopPlayer { * Gets this player's flag * * @return the flag or an empty optional if the player does not have one - * @since 1.13 + * @since 2.0 */ Optional getFlag(); @@ -60,7 +60,7 @@ public interface ShopPlayer { * Sets this player's flag * * @param flag the flag - * @since 1.13 + * @since 2.0 */ void setFlag(Flag flag); @@ -68,7 +68,7 @@ public interface ShopPlayer { * Gets whether this player has a flag * * @return whether this player has a flag - * @since 1.13 + * @since 2.0 */ default boolean hasFlag() { return getFlag().isPresent(); @@ -77,7 +77,7 @@ public interface ShopPlayer { /** * Removes this player's flag * - * @since 1.13 + * @since 2.0 */ default void removeFlag() { setFlag(null); @@ -89,7 +89,7 @@ public interface ShopPlayer { * If the player has no shop limit {@link Integer#MAX_VALUE} is returned. * * @return the shop limit - * @since 1.13 + * @since 2.0 */ int getShopLimit(); @@ -99,7 +99,7 @@ public interface ShopPlayer { * This number includes shops that are not loaded. * * @return the amount of shops - * @since 1.13 + * @since 2.0 */ int getShopAmount(); @@ -107,7 +107,7 @@ public interface ShopPlayer { * Gets the loaded shops this player owns * * @return a collection of shops - * @since 1.13 + * @since 2.0 * @see ShopManager#getShops(org.bukkit.OfflinePlayer) */ Collection getShops(); @@ -117,7 +117,7 @@ public interface ShopPlayer { * * @param shop the shop * @return whether this player is the vendor - * @since 1.13 + * @since 2.0 */ default boolean isVendor(Shop shop) { return shop != null && shop.getVendor() diff --git a/api/src/main/java/de/epiceric/shopchest/api/shop/Shop.java b/api/src/main/java/de/epiceric/shopchest/api/shop/Shop.java index 6db28d7..2eeffdd 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/shop/Shop.java +++ b/api/src/main/java/de/epiceric/shopchest/api/shop/Shop.java @@ -13,7 +13,7 @@ import de.epiceric.shopchest.api.exceptions.ChestNotFoundException; /** * Represents a shop * - * @since 1.13 + * @since 2.0 * @see ShopManager#addShop(OfflinePlayer, ShopProduct, Location, double, double) * @see ShopManager#addAdminShop(ShopProduct, Location, double, double) */ @@ -24,7 +24,7 @@ public interface Shop { * * @return the ID * @throws IllegalStateException if the shop has not been added to the database yet - * @since 1.13 + * @since 2.0 */ int getId(); @@ -32,7 +32,7 @@ public interface Shop { * Gets the player who owns this shop * * @return the vendor or an empty optional if this shop is an admin shop - * @since 1.13 + * @since 2.0 */ Optional getVendor(); @@ -40,7 +40,7 @@ public interface Shop { * Gets a copy of the product this shop is buying or selling * * @return the product - * @since 1.13 + * @since 2.0 */ ShopProduct getProduct(); @@ -50,7 +50,7 @@ public interface Shop { * If the shop is on a double chest, it returns one of the chest's location. * * @return the location - * @since 1.13 + * @since 2.0 */ Location getLocation(); @@ -58,7 +58,7 @@ public interface Shop { * Gets the world this shop is located in * * @return the world - * @since 1.13 + * @since 2.0 */ default World getWorld() { return getLocation().getWorld(); @@ -68,7 +68,7 @@ public interface Shop { * Gets whether this shop is on a double chest * * @return whether the shop is on a double chest - * @since 1.13 + * @since 2.0 */ boolean isDoubleChest(); @@ -77,7 +77,7 @@ public interface Shop { * * @return the inventory * @throws ChestNotFoundException when there is no chest at the shop's location - * @since 1.13 + * @since 2.0 */ Inventory getInventory() throws ChestNotFoundException; @@ -85,7 +85,7 @@ public interface Shop { * Gets whether this shop is an admin shop * * @return whether this shop is an admin shop - * @since 1.13 + * @since 2.0 */ default boolean isAdminShop() { return !getVendor().isPresent(); @@ -95,7 +95,7 @@ public interface Shop { * Gets the price for which a player can buy the product from this shop * * @return the buy price - * @since 1.13 + * @since 2.0 */ double getBuyPrice(); @@ -103,7 +103,7 @@ public interface Shop { * Gets whether a player can buy from this shop * * @return whether buying is enabled - * @since 1.13 + * @since 2.0 */ default boolean canPlayerBuy() { return getBuyPrice() > 0; @@ -113,7 +113,7 @@ public interface Shop { * Gets the price for which a player can sell the product to this shop * * @return the sell price - * @since 1.13 + * @since 2.0 */ double getSellPrice(); @@ -121,7 +121,7 @@ public interface Shop { * Gets whether a player can sell to this shop * * @return whether selling is enabled - * @since 1.13 + * @since 2.0 */ default boolean canPlayerSell() { return getSellPrice() > 0; diff --git a/api/src/main/java/de/epiceric/shopchest/api/shop/ShopProduct.java b/api/src/main/java/de/epiceric/shopchest/api/shop/ShopProduct.java index 2d6b173..f78ef87 100644 --- a/api/src/main/java/de/epiceric/shopchest/api/shop/ShopProduct.java +++ b/api/src/main/java/de/epiceric/shopchest/api/shop/ShopProduct.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack; /** * Represents the item that can be bought or sold in one transaction * - * @since 1.13 + * @since 2.0 */ public abstract class ShopProduct implements Cloneable { private ItemStack itemStack; @@ -20,7 +20,7 @@ public abstract class ShopProduct implements Cloneable { * Gets a copy of this product's {@link ItemStack} with an amount of one * * @return the item - * @since 1.13 + * @since 2.0 */ public ItemStack getItemStack() { return itemStack.clone(); @@ -32,7 +32,7 @@ public abstract class ShopProduct implements Cloneable { * The passed item stack will be copied and its amount set to one. * * @param itemStack the item - * @since 1.13 + * @since 2.0 */ public void setItemStack(ItemStack itemStack) { this.itemStack = itemStack.clone(); @@ -43,7 +43,7 @@ public abstract class ShopProduct implements Cloneable { * Gets the amount of items bought or sold in one transaction * * @return the amount - * @since 1.13 + * @since 2.0 */ public int getAmount() { return amount; @@ -53,7 +53,7 @@ public abstract class ShopProduct implements Cloneable { * Sets the amount of items bought or sold in one transaction * * @param amount the amount - * @since 1.13 + * @since 2.0 */ public void setAmount(int amount) { this.amount = amount; @@ -63,7 +63,7 @@ public abstract class ShopProduct implements Cloneable { * Gets the localized name of this product's item in the configured langauge file * * @return the localized name - * @since 1.13 + * @since 2.0 */ public abstract String getLocalizedName(); diff --git a/core/pom.xml b/core/pom.xml index dc66626..2e8de4d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ de.epiceric.shopchest shopchest - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest https://www.spigotmc.org/resources/shopchest.11431/ @@ -15,7 +15,7 @@ de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT @@ -41,12 +41,12 @@ de.epiceric.shopchest shopchest-api - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms - 1.13-SNAPSHOT + 2.0-SNAPSHOT org.bstats diff --git a/core/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java b/core/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java index 057fe08..993543c 100644 --- a/core/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java +++ b/core/src/main/java/de/epiceric/shopchest/command/ShopCommandImpl.java @@ -38,7 +38,7 @@ public class ShopCommandImpl extends ShopCommand { * Gets the {@link PluginCommand plugin command} for registering the command * * @return the plugin command - * @since 1.13 + * @since 2.0 */ public PluginCommand getPluginCommand() { if (pluginCommand == null) { diff --git a/core/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java b/core/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java index 6ec7a78..7aa9c94 100644 --- a/core/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java +++ b/core/src/main/java/de/epiceric/shopchest/shop/ShopImpl.java @@ -190,7 +190,7 @@ public class ShopImpl implements Shop { * @param buyPrice the buy price * @throws IllegalStateException when a player can neither buy nor sell from this shop * @see Database#updateShop(Shop) - * @since 1.13 + * @since 2.0 */ public void setBuyPrice(double buyPrice) { if (buyPrice <= 0 && !canPlayerSell()) { @@ -214,7 +214,7 @@ public class ShopImpl implements Shop { * @param sellPrice the sell price * @throws IllegalStateException when a player can neither buy nor sell from this shop * @see Database#updateShop(Shop) - * @since 1.13 + * @since 2.0 */ public void setSellPrice(double sellPrice) { if (sellPrice <= 0 && !canPlayerBuy()) { diff --git a/nms/aggregator/pom.xml b/nms/aggregator/pom.xml index 2bc43b5..72c2f52 100644 --- a/nms/aggregator/pom.xml +++ b/nms/aggregator/pom.xml @@ -6,14 +6,14 @@ de.epiceric.shopchest shopchest-nms - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT diff --git a/nms/interfaces/pom.xml b/nms/interfaces/pom.xml index d70737b..928dd32 100644 --- a/nms/interfaces/pom.xml +++ b/nms/interfaces/pom.xml @@ -6,13 +6,13 @@ de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS Interfaces de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT diff --git a/nms/pom.xml b/nms/pom.xml index f2f3a82..c4e4f38 100644 --- a/nms/pom.xml +++ b/nms/pom.xml @@ -6,7 +6,7 @@ de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT pom @@ -31,6 +31,6 @@ de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT diff --git a/nms/v10r1/pom.xml b/nms/v10r1/pom.xml index 69dea48..31cda97 100644 --- a/nms/v10r1/pom.xml +++ b/nms/v10r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v10r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.10-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v11r1/pom.xml b/nms/v11r1/pom.xml index eb54e02..9f21aa3 100644 --- a/nms/v11r1/pom.xml +++ b/nms/v11r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v11r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.11-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v12r1/pom.xml b/nms/v12r1/pom.xml index e43c17e..f7142ab 100644 --- a/nms/v12r1/pom.xml +++ b/nms/v12r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v12r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.12-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v13r1/pom.xml b/nms/v13r1/pom.xml index 0008c91..8d6e211 100644 --- a/nms/v13r1/pom.xml +++ b/nms/v13r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v13r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.13-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v13r2/pom.xml b/nms/v13r2/pom.xml index 8c095ef..51ec6ab 100644 --- a/nms/v13r2/pom.xml +++ b/nms/v13r2/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v13r2 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.13-R2 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v14r1/pom.xml b/nms/v14r1/pom.xml index 56d510a..46959af 100644 --- a/nms/v14r1/pom.xml +++ b/nms/v14r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v14r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.14-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v15r1/pom.xml b/nms/v15r1/pom.xml index 71969a9..c57cba6 100644 --- a/nms/v15r1/pom.xml +++ b/nms/v15r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v15r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.15-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v8r1/pom.xml b/nms/v8r1/pom.xml index ad310cd..aac0d72 100644 --- a/nms/v8r1/pom.xml +++ b/nms/v8r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v8r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.8-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v8r2/pom.xml b/nms/v8r2/pom.xml index cd91317..0eaa5dc 100644 --- a/nms/v8r2/pom.xml +++ b/nms/v8r2/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v8r2 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.8-R2 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v8r3/pom.xml b/nms/v8r3/pom.xml index 6b558b1..196d17e 100644 --- a/nms/v8r3/pom.xml +++ b/nms/v8r3/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v8r3 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.8-R3 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v9r1/pom.xml b/nms/v9r1/pom.xml index 594ecda..6b17f86 100644 --- a/nms/v9r1/pom.xml +++ b/nms/v9r1/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v9r1 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.9-R1 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/nms/v9r2/pom.xml b/nms/v9r2/pom.xml index dabe5da..bed15d6 100644 --- a/nms/v9r2/pom.xml +++ b/nms/v9r2/pom.xml @@ -6,21 +6,21 @@ de.epiceric.shopchest shopchest-nms-v9r2 - 1.13-SNAPSHOT + 2.0-SNAPSHOT ShopChest NMS v1.9-R2 de.epiceric.shopchest shopchest-nms-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT de.epiceric.shopchest shopchest-nms-interfaces - 1.13-SNAPSHOT + 2.0-SNAPSHOT provided diff --git a/pom.xml b/pom.xml index 2b073d5..78dcfe6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.epiceric.shopchest shopchest-parent - 1.13-SNAPSHOT + 2.0-SNAPSHOT pom