mirror of
https://github.com/ChestShop-authors/ChestShop-3.git
synced 2024-09-24 20:42:46 +02:00
[CI-SKIP] Fix some formatting inconsistencies
Remove spaces on empty lines and changed doc comment formatting Also includes some minor comments and import fixes
This commit is contained in:
Phoenix616
parent
b3e62f199f
commit
036d309965
@ -16,11 +16,11 @@ public class FieldParser {
|
||||
*/
|
||||
public static String parse(Field field) {
|
||||
StringBuilder builder = new StringBuilder(50);
|
||||
|
||||
|
||||
if (field.isAnnotationPresent(ConfigurationComment.class)) {
|
||||
builder.append('#').append(field.getAnnotation(ConfigurationComment.class).value()).append('\n');
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
builder.append(field.getName()).append(": ").append(ValueParser.parseToYAML(field.get(null)));
|
||||
} catch (IllegalAccessException e) {
|
||||
|
||||
@ -34,7 +34,7 @@ package com.Acrobot.Breeze.Utils.Encoding;
|
||||
* @version 2.3.7
|
||||
*/
|
||||
public class Base64 {
|
||||
|
||||
|
||||
/* ******** P U B L I C F I E L D S ******** */
|
||||
|
||||
|
||||
@ -87,8 +87,8 @@ public class Base64 {
|
||||
* <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
|
||||
*/
|
||||
public final static int ORDERED = 32;
|
||||
|
||||
|
||||
|
||||
|
||||
/* ******** P R I V A T E F I E L D S ******** */
|
||||
|
||||
|
||||
@ -119,7 +119,7 @@ public class Base64 {
|
||||
private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
|
||||
private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
|
||||
|
||||
|
||||
|
||||
/* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */
|
||||
|
||||
/**
|
||||
@ -178,7 +178,7 @@ public class Base64 {
|
||||
-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9 // Decimal 244 - 255
|
||||
};
|
||||
|
||||
|
||||
|
||||
/* ******** U R L S A F E B A S E 6 4 A L P H A B E T ******** */
|
||||
|
||||
/**
|
||||
@ -305,7 +305,7 @@ public class Base64 {
|
||||
-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9 // Decimal 244 - 255
|
||||
};
|
||||
|
||||
|
||||
|
||||
/* ******** D E T E R M I N E W H I C H A L H A B E T ******** */
|
||||
|
||||
|
||||
@ -349,10 +349,10 @@ public class Base64 {
|
||||
* Defeats instantiation.
|
||||
*/
|
||||
private Base64() {}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* ******** E N C O D I N G M E T H O D S ******** */
|
||||
|
||||
|
||||
@ -903,11 +903,11 @@ public class Base64 {
|
||||
} // end else: don't compress
|
||||
|
||||
} // end encodeBytesToBytes
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* ******** D E C O D I N G M E T H O D S ******** */
|
||||
|
||||
|
||||
@ -1547,8 +1547,8 @@ public class Base64 {
|
||||
}
|
||||
} // end finally
|
||||
} // end decodeFileToFile
|
||||
|
||||
|
||||
|
||||
|
||||
/* ******** I N N E R C L A S S I N P U T S T R E A M ******** */
|
||||
|
||||
|
||||
@ -1754,12 +1754,12 @@ public class Base64 {
|
||||
} // end read
|
||||
|
||||
} // end inner class InputStream
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ import org.bukkit.inventory.ItemStack;
|
||||
*/
|
||||
public class InventoryUtil {
|
||||
private static Boolean legacyContents = null;
|
||||
|
||||
|
||||
private static ItemStack[] getStorageContents(Inventory inventory) {
|
||||
if (legacyContents == null) {
|
||||
try {
|
||||
@ -74,7 +74,7 @@ public class InventoryUtil {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Count amount of empty slots in an inventory
|
||||
*
|
||||
@ -88,7 +88,7 @@ public class InventoryUtil {
|
||||
emptyAmount++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return emptyAmount;
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ public class InventoryUtil {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if items fit in the inventory
|
||||
*
|
||||
@ -124,7 +124,7 @@ public class InventoryUtil {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -206,8 +206,7 @@ public class InventoryUtil {
|
||||
}
|
||||
|
||||
// Don't use the armor slots or extra slots
|
||||
private static int effectiveSize(Inventory inventory)
|
||||
{
|
||||
private static int effectiveSize(Inventory inventory) {
|
||||
return getStorageContents(inventory).length;
|
||||
}
|
||||
|
||||
@ -333,15 +332,17 @@ public class InventoryUtil {
|
||||
|
||||
/**
|
||||
* Get the max size an item stack is allowed to stack to while respecting the STACK_TO_64 config property
|
||||
*
|
||||
* @param item The item to get the max stacksize of
|
||||
* @return The max stacksize of the item stack's type or 64 if STACK_TO_64 is enabled
|
||||
*/
|
||||
public static int getMaxStackSize(ItemStack item) {
|
||||
return Properties.STACK_TO_64 ? 64 : item.getMaxStackSize();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get an array of different item stacks that are properly stacked to their max stack size
|
||||
*
|
||||
* @param items The items to stack
|
||||
* @return An array of item stacks which's amount is a maximum of the allowed stack size
|
||||
*/
|
||||
|
||||
@ -41,7 +41,7 @@ public class MaterialUtil {
|
||||
public static final boolean LONG_NAME = true;
|
||||
public static final boolean SHORT_NAME = false;
|
||||
public static final short MAXIMUM_SIGN_LETTERS = 15;
|
||||
|
||||
|
||||
private static final SimpleCache<String, Material> MATERIAL_CACHE = new SimpleCache<>(Properties.CACHE_SIZE);
|
||||
|
||||
/**
|
||||
@ -68,7 +68,7 @@ public class MaterialUtil {
|
||||
if (one.isSimilar(two)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
// Special check for banners as they might include the deprecated base color
|
||||
if (one.getType() == two.getType()
|
||||
&& one.getType() == Material.BANNER
|
||||
@ -79,7 +79,7 @@ public class MaterialUtil {
|
||||
Object c2 = m2.remove("base-color");
|
||||
return (one.getData().equals(two.getData()) || c1.equals(c2)) && m1.equals(m2);
|
||||
}
|
||||
|
||||
|
||||
// Special check for books as their pages might change when serialising (See SPIGOT-3206)
|
||||
return one.getType() == two.getType()
|
||||
&& one.getDurability() == two.getDurability()
|
||||
@ -156,7 +156,7 @@ public class MaterialUtil {
|
||||
public static String getSignName(ItemStack itemStack) {
|
||||
return getName(itemStack, MAXIMUM_SIGN_LETTERS);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns item's name, with a maximum length
|
||||
*
|
||||
@ -167,7 +167,7 @@ public class MaterialUtil {
|
||||
public static String getName(ItemStack itemStack, int maxLength) {
|
||||
String alias = Odd.getAlias(itemStack);
|
||||
String itemName = alias != null ? alias : itemStack.getType().toString();
|
||||
|
||||
|
||||
String data = DataValue.name(itemStack);
|
||||
String durability = "";
|
||||
if (data == null) {
|
||||
@ -181,16 +181,16 @@ public class MaterialUtil {
|
||||
if (itemStack.hasItemMeta()) {
|
||||
metaData = "#" + Metadata.getItemCode(itemStack);
|
||||
}
|
||||
|
||||
|
||||
int codeLength = (data + itemName + durability + metaData).length();
|
||||
String code = data + itemName;
|
||||
if (maxLength > 0 && codeLength > maxLength) {
|
||||
int exceeding = codeLength - maxLength;
|
||||
code = getShortenedName(code, code.length() - exceeding);
|
||||
}
|
||||
|
||||
|
||||
code = StringUtil.capitalizeFirstLetter(code, '_') + durability + metaData;
|
||||
|
||||
|
||||
ItemStack codeItem = getItem(code);
|
||||
if (!equals(itemStack, codeItem)) {
|
||||
throw new IllegalArgumentException("Cannot generate code for item " + itemStack + " with maximum length of " + maxLength
|
||||
@ -199,9 +199,10 @@ public class MaterialUtil {
|
||||
|
||||
return code;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get an item name shortened to a max length that is still reversable by {@link #getMaterial(String)}
|
||||
*
|
||||
* @param itemName The name of the item
|
||||
* @param maxLength The max length
|
||||
* @return The name shortened to the max length
|
||||
@ -245,7 +246,7 @@ public class MaterialUtil {
|
||||
}
|
||||
return String.join("_", itemParts);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gives you an ItemStack from a String
|
||||
*
|
||||
@ -267,7 +268,7 @@ public class MaterialUtil {
|
||||
Material material = getMaterial(split[0]);
|
||||
short durability = getDurability(itemName);
|
||||
MaterialData data = null;
|
||||
|
||||
|
||||
if (material == null) {
|
||||
if (!split[0].contains(" ")) {
|
||||
return null;
|
||||
@ -366,7 +367,7 @@ public class MaterialUtil {
|
||||
MaterialData data = getData(type, material);
|
||||
return data != null ? data.getData() : 0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets the dat from a string
|
||||
*
|
||||
@ -415,7 +416,7 @@ public class MaterialUtil {
|
||||
|
||||
return materialData;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns a string with the DataValue
|
||||
*
|
||||
@ -428,7 +429,7 @@ public class MaterialUtil {
|
||||
if (data == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
if (data instanceof TexturedMaterial) {
|
||||
return ((TexturedMaterial) data).getMaterial().name();
|
||||
} else if (data instanceof Colorable) {
|
||||
@ -453,11 +454,11 @@ public class MaterialUtil {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static class EnumParser<E extends Enum<E>> {
|
||||
private E parse(String name, E[] values) {
|
||||
name = name.toUpperCase();
|
||||
|
||||
|
||||
try {
|
||||
return E.valueOf(values[0].getDeclaringClass(), name);
|
||||
} catch (IllegalArgumentException exception) {
|
||||
@ -469,7 +470,7 @@ public class MaterialUtil {
|
||||
if (enumName.length() < length && enumName.startsWith(name)) {
|
||||
length = (short) enumName.length();
|
||||
currentEnum = e;
|
||||
} else if (typeParts.length > 1) {
|
||||
} else if (typeParts.length > 1) {
|
||||
String[] nameParts = enumName.split("_");
|
||||
if (typeParts.length == nameParts.length) {
|
||||
boolean matched = true;
|
||||
@ -552,7 +553,8 @@ public class MaterialUtil {
|
||||
if (!aliases.isEmpty()) {
|
||||
return aliases.iterator().next();
|
||||
}
|
||||
} catch (Exception ignored) {}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -563,10 +565,10 @@ public class MaterialUtil {
|
||||
isInitialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static class Show {
|
||||
private static ShowItem showItem = null;
|
||||
|
||||
|
||||
/**
|
||||
* Lets the class know that it's safe to use the ShowItem methods now
|
||||
*
|
||||
@ -575,7 +577,7 @@ public class MaterialUtil {
|
||||
public static void initialize(Plugin plugin) {
|
||||
showItem = (ShowItem) plugin;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Send a message with hover info and icons
|
||||
*
|
||||
@ -587,7 +589,7 @@ public class MaterialUtil {
|
||||
if (showItem == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
List<String> itemJson = new ArrayList<>();
|
||||
for (ItemStack item : InventoryUtil.mergeSimilarStacks(stock)) {
|
||||
try {
|
||||
@ -597,20 +599,20 @@ public class MaterialUtil {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
String joinedItemJson = itemJson.stream().collect(Collectors.joining("," + new JSONObject(ImmutableMap.of("text", " ")).toJSONString() + ", "));
|
||||
|
||||
|
||||
String messageJsonString = Arrays.stream(message.split("%item"))
|
||||
.map(s -> new JSONObject(ImmutableMap.of("text", s)).toJSONString())
|
||||
.collect(Collectors.joining("," + joinedItemJson + ","));
|
||||
|
||||
|
||||
while (messageJsonString.startsWith(",")) {
|
||||
messageJsonString = messageJsonString.substring(1);
|
||||
}
|
||||
while (messageJsonString.endsWith(",")) {
|
||||
messageJsonString = messageJsonString.substring(0, messageJsonString.length() - 1);
|
||||
}
|
||||
|
||||
|
||||
showItem.tellRaw(player, messageJsonString);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -269,7 +269,7 @@ public class ChestShop extends JavaPlugin {
|
||||
|
||||
registerEvent(new ItemInfoListener());
|
||||
registerEvent(new GarbageTextListener());
|
||||
|
||||
|
||||
Plugin authMe = getServer().getPluginManager().getPlugin("AuthMe");
|
||||
if (authMe != null && authMe.isEnabled()) {
|
||||
registerEvent(new AuthMeChestShopListener());
|
||||
|
||||
@ -41,7 +41,7 @@ public class ItemInfo implements CommandExecutor {
|
||||
} catch (IllegalArgumentException e) {
|
||||
sender.sendMessage(ChatColor.RED + "Full Name Error: " + e.getMessage());
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
sender.sendMessage(ChatColor.WHITE + "Shop Sign: " + ChatColor.GRAY + MaterialUtil.getSignName(item));
|
||||
} catch (IllegalArgumentException e) {
|
||||
|
||||
@ -49,11 +49,11 @@ public class Messages {
|
||||
public static String NO_CHEST_DETECTED = "Couldn't find a chest!";
|
||||
public static String INVALID_SHOP_DETECTED = "The shop cannot be used!";
|
||||
public static String CANNOT_ACCESS_THE_CHEST = "You don't have permissions to access this chest!";
|
||||
|
||||
|
||||
@PrecededBySpace
|
||||
public static String CLICK_TO_AUTOFILL_ITEM = "Click the sign with the item that this shop is for!";
|
||||
public static String NO_ITEM_IN_HAND = "You don't have an item in your hand to autofill!";
|
||||
|
||||
|
||||
@PrecededBySpace
|
||||
public static String PROTECTED_SHOP = "Successfully protected the shop with LWC!";
|
||||
public static String SHOP_CREATED = "Shop successfully created!";
|
||||
@ -78,6 +78,6 @@ public class Messages {
|
||||
public static String TOGGLE_MESSAGES_ON = "You will now receive messages from your shop(s).";
|
||||
|
||||
public static String prefix(String message) {
|
||||
return Configuration.getColoured( prefix + message);
|
||||
return Configuration.getColoured(prefix + message);
|
||||
}
|
||||
}
|
||||
|
||||
@ -155,7 +155,7 @@ public class Properties {
|
||||
@PrecededBySpace
|
||||
@ConfigurationComment("How much Heroes exp should people get for creating a ChestShop?")
|
||||
public static double HEROES_EXP = 100;
|
||||
|
||||
|
||||
@PrecededBySpace
|
||||
@ConfigurationComment("Add icons and make item names hoverable in transaction messages when ShowItem is installed?")
|
||||
public static boolean SHOWITEM_MESSAGE = true;
|
||||
|
||||
@ -134,7 +134,7 @@ public class Dependencies {
|
||||
WorldGuard,
|
||||
|
||||
Heroes,
|
||||
|
||||
|
||||
ShowItem
|
||||
}
|
||||
}
|
||||
|
||||
@ -141,7 +141,7 @@ public class PreShopCreationEvent extends Event {
|
||||
INVALID_ITEM,
|
||||
INVALID_PRICE,
|
||||
INVALID_QUANTITY,
|
||||
|
||||
|
||||
ITEM_AUTOFILL,
|
||||
|
||||
UNKNOWN_PLAYER,
|
||||
|
||||
@ -22,7 +22,11 @@ import org.bukkit.event.entity.EntityExplodeEvent;
|
||||
import org.bukkit.material.Directional;
|
||||
import org.bukkit.material.PistonBaseMaterial;
|
||||
import org.bukkit.metadata.FixedMetadataValue;
|
||||
import java.util.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
|
||||
import static com.Acrobot.Breeze.Utils.BlockUtil.getAttachedBlock;
|
||||
import static com.Acrobot.Breeze.Utils.BlockUtil.isSign;
|
||||
@ -192,7 +196,7 @@ public class SignBreak implements Listener {
|
||||
return attachedSigns;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static List<Block> getRetractBlocks(BlockPistonRetractEvent event) {
|
||||
try {
|
||||
return event.getBlocks();
|
||||
@ -205,41 +209,41 @@ public class SignBreak implements Listener {
|
||||
return blocks;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Those are fixes for a very old CraftBukkit's piston bug, where piston appears not to be a piston.
|
||||
private static BlockFace getPistonDirection(Block block) {
|
||||
return block.getState().getData() instanceof PistonBaseMaterial ? ((Directional) block.getState().getData()).getFacing() : null;
|
||||
}
|
||||
|
||||
|
||||
private static Block getRetractLocationBlock(BlockPistonRetractEvent event) {
|
||||
BlockFace pistonDirection = getPistonDirection(event.getBlock());
|
||||
return pistonDirection != null ? event.getBlock().getRelative((pistonDirection), 2).getLocation().getBlock() : null;
|
||||
}
|
||||
|
||||
|
||||
private static List<Block> getExtendBlocks(BlockPistonExtendEvent event) {
|
||||
try {
|
||||
return event.getBlocks();
|
||||
} catch (NoSuchMethodError outdated) { // backwards compatiblity
|
||||
BlockFace pistonDirection = getPistonDirection(event.getBlock());
|
||||
|
||||
|
||||
if (pistonDirection == null) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
|
||||
Block piston = event.getBlock();
|
||||
List<Block> pushedBlocks = new ArrayList<>();
|
||||
|
||||
|
||||
for (int currentBlock = 1; currentBlock < event.getLength() + 1; currentBlock++) {
|
||||
Block block = piston.getRelative(pistonDirection, currentBlock);
|
||||
Material blockType = block.getType();
|
||||
|
||||
|
||||
if (blockType == Material.AIR) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
pushedBlocks.add(block);
|
||||
}
|
||||
|
||||
|
||||
return pushedBlocks;
|
||||
}
|
||||
}
|
||||
|
||||
@ -33,11 +33,11 @@ public class SignCreate implements Listener {
|
||||
|
||||
PreShopCreationEvent preEvent = new PreShopCreationEvent(event.getPlayer(), (Sign) signBlock.getState(), line);
|
||||
ChestShop.callEvent(preEvent);
|
||||
|
||||
|
||||
for (byte i = 0; i < event.getLines().length; ++i) {
|
||||
event.setLine(i, preEvent.getSignLine(i));
|
||||
}
|
||||
|
||||
|
||||
if (preEvent.isCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@ public class ServerAccountCorrector implements Listener {
|
||||
if (!NameManager.isAdminShop(target) || NameManager.isServerEconomyAccount(target)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Account account = NameManager.getServerEconomyAccount();
|
||||
target = account != null ? account.getUuid() : null;
|
||||
|
||||
@ -59,14 +59,14 @@ public class ServerAccountCorrector implements Listener {
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public static void onCurrencyCheck(CurrencyCheckEvent event) {
|
||||
UUID target = event.getAccount();
|
||||
|
||||
|
||||
if (!NameManager.isAdminShop(target) || NameManager.isServerEconomyAccount(target)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Account account = NameManager.getServerEconomyAccount();
|
||||
target = account != null ? account.getUuid() : null;
|
||||
|
||||
|
||||
if (target == null) {
|
||||
event.hasEnough(true);
|
||||
return;
|
||||
@ -81,7 +81,7 @@ public class ServerAccountCorrector implements Listener {
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public static void onCurrencyHoldCheck(CurrencyHoldEvent event) {
|
||||
UUID target = event.getAccount();
|
||||
|
||||
|
||||
if (!NameManager.isAdminShop(target) || NameManager.isServerEconomyAccount(target)) {
|
||||
return;
|
||||
}
|
||||
@ -100,7 +100,7 @@ public class ServerAccountCorrector implements Listener {
|
||||
|
||||
Account account = NameManager.getServerEconomyAccount();
|
||||
target = account != null ? account.getUuid() : null;
|
||||
|
||||
|
||||
if (target == null) {
|
||||
event.setAmount(BigDecimal.valueOf(Double.MAX_VALUE));
|
||||
return;
|
||||
|
||||
@ -36,7 +36,7 @@ public class PriceRestrictionModule implements Listener {
|
||||
|
||||
if (!file.exists()) {
|
||||
configuration.addDefault("uses_materials", true);
|
||||
|
||||
|
||||
configuration.addDefault("max.buy_price.item_type", 5.53);
|
||||
configuration.addDefault("max.buy_price.piston_head", 3.51);
|
||||
configuration.addDefault("max.sell_price.placed_banner", 3.52);
|
||||
@ -72,7 +72,7 @@ public class PriceRestrictionModule implements Listener {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void convertToMaterial(String sectionPath) {
|
||||
ConfigurationSection section = configuration.getConfigurationSection(sectionPath);
|
||||
if (section != null) {
|
||||
@ -87,7 +87,7 @@ public class PriceRestrictionModule implements Listener {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void onPreShopCreation(PreShopCreationEvent event) {
|
||||
ItemStack material = MaterialUtil.getItem(event.getSignLine(ITEM_LINE));
|
||||
|
||||
@ -46,8 +46,7 @@ import static org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK;
|
||||
public class PlayerInteract implements Listener {
|
||||
|
||||
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
|
||||
public static void onInteract(PlayerInteractEvent event)
|
||||
{
|
||||
public static void onInteract(PlayerInteractEvent event) {
|
||||
Block block = event.getClickedBlock();
|
||||
if (block == null)
|
||||
return;
|
||||
@ -77,7 +76,7 @@ public class PlayerInteract implements Listener {
|
||||
}
|
||||
|
||||
boolean canAccess = ChestShopSign.canAccess(player, sign);
|
||||
|
||||
|
||||
if (Properties.ALLOW_AUTO_ITEM_FILL && ChatColor.stripColor(sign.getLine(ITEM_LINE)).equals(AUTOFILL_CODE)) {
|
||||
if (canAccess) {
|
||||
ItemStack item = player.getInventory().getItemInMainHand();
|
||||
@ -85,7 +84,7 @@ public class PlayerInteract implements Listener {
|
||||
String itemCode = MaterialUtil.getSignName(item);
|
||||
String[] lines = sign.getLines();
|
||||
lines[ITEM_LINE] = itemCode;
|
||||
|
||||
|
||||
SignChangeEvent changeEvent = new SignChangeEvent(block, player, lines);
|
||||
com.Acrobot.ChestShop.ChestShop.callEvent(changeEvent);
|
||||
if (!changeEvent.isCancelled()) {
|
||||
@ -102,7 +101,7 @@ public class PlayerInteract implements Listener {
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (canAccess) {
|
||||
if (!Properties.ALLOW_SIGN_CHEST_OPEN || player.isSneaking() || player.isInsideVehicle() || player.getGameMode() == GameMode.CREATIVE) {
|
||||
return;
|
||||
@ -148,7 +147,7 @@ public class PlayerInteract implements Listener {
|
||||
boolean adminShop = ChestShopSign.isAdminShop(sign);
|
||||
|
||||
// check if player exists in economy
|
||||
if(!adminShop && !VaultListener.getProvider().hasAccount(account.getName())) {
|
||||
if (!adminShop && !VaultListener.getProvider().hasAccount(account.getName())) {
|
||||
player.sendMessage(Messages.prefix(Messages.NO_ECONOMY_ACCOUNT));
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -30,11 +30,11 @@ public class EmptyShopDeleter implements Listener {
|
||||
Inventory ownerInventory = event.getOwnerInventory();
|
||||
Sign sign = event.getSign();
|
||||
Chest connectedChest = uBlock.findConnectedChest(sign);
|
||||
|
||||
|
||||
if (!shopShouldBeRemoved(ownerInventory, event.getStock())) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (!isInRemoveWorld(sign)) {
|
||||
return;
|
||||
}
|
||||
@ -50,11 +50,11 @@ public class EmptyShopDeleter implements Listener {
|
||||
ownerInventory.addItem(new ItemStack(Material.SIGN, 1));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static boolean shopShouldBeRemoved(Inventory inventory, ItemStack[] stock) {
|
||||
return Properties.REMOVE_EMPTY_SHOPS && !ChestShopSign.isAdminShop(inventory) && !InventoryUtil.hasItems(stock, inventory);
|
||||
}
|
||||
|
||||
|
||||
private static boolean isInRemoveWorld(Sign sign) {
|
||||
return Properties.REMOVE_EMPTY_WORLDS.isEmpty() || Properties.REMOVE_EMPTY_WORLDS.contains(sign.getWorld().getName());
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ import static com.Acrobot.ChestShop.Signs.ChestShopSign.AUTOFILL_CODE;
|
||||
* @author Acrobot
|
||||
*/
|
||||
public class ItemChecker implements Listener {
|
||||
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public static void onPreShopCreation(PreShopCreationEvent event) {
|
||||
String itemCode = event.getSignLine(ITEM_LINE);
|
||||
@ -39,15 +39,15 @@ public class ItemChecker implements Listener {
|
||||
for (ItemStack stack : chest.getInventory().getContents()) {
|
||||
if (!MaterialUtil.isEmpty(stack)) {
|
||||
itemCode = MaterialUtil.getSignName(stack);
|
||||
|
||||
|
||||
event.setSignLine(ITEM_LINE, itemCode);
|
||||
foundItem = true;
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!foundItem) {
|
||||
event.setSignLine(ITEM_LINE, ChatColor.BOLD + ChestShopSign.AUTOFILL_CODE);
|
||||
event.setOutcome(ITEM_AUTOFILL);
|
||||
@ -59,7 +59,7 @@ public class ItemChecker implements Listener {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (itemCode.length() > MAXIMUM_SIGN_LETTERS) {
|
||||
event.setOutcome(INVALID_ITEM);
|
||||
return;
|
||||
|
||||
@ -59,20 +59,20 @@ public class PartialTransactionModule implements Listener {
|
||||
event.setPrice(amountAffordable * pricePerItem);
|
||||
event.setStock(getCountedItemStack(event.getStock(), amountAffordable));
|
||||
}
|
||||
|
||||
|
||||
if (!InventoryUtil.hasItems(event.getStock(), event.getOwnerInventory())) {
|
||||
ItemStack[] itemsHad = getItems(event.getStock(), event.getOwnerInventory());
|
||||
int possessedItemCount = InventoryUtil.countItems(itemsHad);
|
||||
|
||||
|
||||
if (possessedItemCount <= 0) {
|
||||
event.setCancelled(NOT_ENOUGH_STOCK_IN_CHEST);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
event.setPrice(pricePerItem * possessedItemCount);
|
||||
event.setStock(itemsHad);
|
||||
}
|
||||
|
||||
|
||||
if (!InventoryUtil.fits(event.getStock(), event.getClientInventory())) {
|
||||
ItemStack[] itemsFit = getItemsThatFit(event.getStock(), event.getClientInventory());
|
||||
int possessedItemCount = InventoryUtil.countItems(itemsFit);
|
||||
@ -80,11 +80,11 @@ public class PartialTransactionModule implements Listener {
|
||||
event.setCancelled(NOT_ENOUGH_SPACE_IN_INVENTORY);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
event.setStock(itemsFit);
|
||||
event.setPrice(pricePerItem * possessedItemCount);
|
||||
}
|
||||
|
||||
|
||||
UUID seller = event.getOwnerAccount().getUuid();
|
||||
|
||||
CurrencyHoldEvent currencyHoldEvent = new CurrencyHoldEvent(BigDecimal.valueOf(event.getPrice()), seller, client.getWorld());
|
||||
@ -94,7 +94,7 @@ public class PartialTransactionModule implements Listener {
|
||||
event.setCancelled(SHOP_DEPOSIT_FAILED);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@EventHandler(priority = EventPriority.LOW)
|
||||
public static void onPreSellTransaction(PreTransactionEvent event) {
|
||||
if (event.isCancelled() || event.getTransactionType() != SELL) {
|
||||
@ -127,20 +127,20 @@ public class PartialTransactionModule implements Listener {
|
||||
event.setStock(getCountedItemStack(event.getStock(), amountAffordable));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!InventoryUtil.hasItems(event.getStock(), event.getClientInventory())) {
|
||||
ItemStack[] itemsHad = getItems(event.getStock(), event.getClientInventory());
|
||||
int possessedItemCount = InventoryUtil.countItems(itemsHad);
|
||||
|
||||
|
||||
if (possessedItemCount <= 0) {
|
||||
event.setCancelled(NOT_ENOUGH_STOCK_IN_INVENTORY);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
event.setPrice(pricePerItem * possessedItemCount);
|
||||
event.setStock(itemsHad);
|
||||
}
|
||||
|
||||
|
||||
if (!InventoryUtil.fits(event.getStock(), event.getOwnerInventory())) {
|
||||
ItemStack[] itemsFit = getItemsThatFit(event.getStock(), event.getOwnerInventory());
|
||||
int possessedItemCount = InventoryUtil.countItems(itemsFit);
|
||||
@ -148,7 +148,7 @@ public class PartialTransactionModule implements Listener {
|
||||
event.setCancelled(NOT_ENOUGH_SPACE_IN_CHEST);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
event.setStock(itemsFit);
|
||||
event.setPrice(pricePerItem * possessedItemCount);
|
||||
}
|
||||
@ -200,7 +200,7 @@ public class PartialTransactionModule implements Listener {
|
||||
boolean added = false;
|
||||
|
||||
int maxStackSize = InventoryUtil.getMaxStackSize(stack);
|
||||
|
||||
|
||||
for (ItemStack iStack : stacks) {
|
||||
if (iStack.getAmount() < maxStackSize && MaterialUtil.equals(toAdd, iStack)) {
|
||||
int newAmount = iStack.getAmount() + toAdd.getAmount();
|
||||
@ -226,7 +226,7 @@ public class PartialTransactionModule implements Listener {
|
||||
|
||||
return stacks.toArray(new ItemStack[stacks.size()]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Make an array of items fit into an inventory.
|
||||
*
|
||||
@ -236,9 +236,9 @@ public class PartialTransactionModule implements Listener {
|
||||
*/
|
||||
private static ItemStack[] getItemsThatFit(ItemStack[] stock, Inventory inventory) {
|
||||
List<ItemStack> resultStock = new LinkedList<>();
|
||||
|
||||
|
||||
int emptySlots = InventoryUtil.countEmpty(inventory);
|
||||
|
||||
|
||||
for (ItemStack item : InventoryUtil.mergeSimilarStacks(stock)) {
|
||||
int maxStackSize = InventoryUtil.getMaxStackSize(item);
|
||||
int free = 0;
|
||||
@ -247,11 +247,11 @@ public class PartialTransactionModule implements Listener {
|
||||
free += (maxStackSize - itemInInventory.getAmount()) % maxStackSize;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (free == 0 && emptySlots == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
if (item.getAmount() > free) {
|
||||
if (emptySlots > 0) {
|
||||
int requiredSlots = (int) Math.ceil(((double) item.getAmount() - free) / maxStackSize);
|
||||
@ -267,7 +267,7 @@ public class PartialTransactionModule implements Listener {
|
||||
}
|
||||
Collections.addAll(resultStock, InventoryUtil.getItemsStacked(item));
|
||||
}
|
||||
|
||||
|
||||
return resultStock.toArray(new ItemStack[resultStock.size()]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ public class ChestShopSign {
|
||||
Pattern.compile("^[\\w? #:-]+$")
|
||||
};
|
||||
public static final String AUTOFILL_CODE = "?";
|
||||
|
||||
|
||||
public static boolean isAdminShop(Inventory ownerInventory) {
|
||||
return ownerInventory instanceof AdminInventory;
|
||||
}
|
||||
|
||||
@ -40,8 +40,9 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get account info from a UUID
|
||||
* @param uuid The UUID of the player to get the account info
|
||||
* @return The account info or <tt>null</tt> if none was found
|
||||
*
|
||||
* @param uuid The UUID of the player to get the account info
|
||||
* @return The account info or <tt>null</tt> if none was found
|
||||
*/
|
||||
public static Account getAccount(UUID uuid) {
|
||||
try {
|
||||
@ -49,7 +50,7 @@ public class NameManager {
|
||||
try {
|
||||
Account account = accounts.queryBuilder().orderBy("lastSeen", false).where().eq("uuid", uuid).queryForFirst();
|
||||
if (account != null) {
|
||||
account.setUuid(uuid); //HOW IS IT EVEN POSSIBLE THAT UUID IS NOT SET EVEN IF WE HAVE FOUND THE PLAYER?!
|
||||
account.setUuid(uuid); // HOW IS IT EVEN POSSIBLE THAT UUID IS NOT SET EVEN IF WE HAVE FOUND THE PLAYER?!
|
||||
shortToAccount.put(account.getShortName(), account);
|
||||
usernameToAccount.put(account.getName(), account);
|
||||
return account;
|
||||
@ -66,8 +67,9 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get account info from a non-shortened username
|
||||
* @param fullName The full name of the player to get the account info
|
||||
* @return The account info or <tt>null</tt> if none was found
|
||||
*
|
||||
* @param fullName The full name of the player to get the account info
|
||||
* @return The account info or <tt>null</tt> if none was found
|
||||
* @throws IllegalArgumentException if the username is empty or null
|
||||
*/
|
||||
public static Account getAccount(String fullName) {
|
||||
@ -77,7 +79,7 @@ public class NameManager {
|
||||
try {
|
||||
Account account = accounts.queryBuilder().orderBy("lastSeen", false).where().eq("name", fullName).queryForFirst();
|
||||
if (account != null) {
|
||||
account.setName(fullName); //HOW IS IT EVEN POSSIBLE THAT UUID IS NOT SET EVEN IF WE HAVE FOUND THE PLAYER?!
|
||||
account.setName(fullName); // HOW IS IT EVEN POSSIBLE THAT THE NAME IS NOT SET EVEN IF WE HAVE FOUND THE PLAYER?!
|
||||
shortToAccount.put(account.getShortName(), account);
|
||||
return account;
|
||||
}
|
||||
@ -93,8 +95,9 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get account info from a username that might be shortened
|
||||
*
|
||||
* @param shortName The name of the player to get the account info
|
||||
* @return The account info or <tt>null</tt> if none was found
|
||||
* @return The account info or <tt>null</tt> if none was found
|
||||
* @throws IllegalArgumentException if the username is empty
|
||||
*/
|
||||
public static Account getAccountFromShortName(String shortName) {
|
||||
@ -108,7 +111,7 @@ public class NameManager {
|
||||
try {
|
||||
Account account = accounts.queryBuilder().where().eq("shortName", shortName).queryForFirst();
|
||||
if (account != null) {
|
||||
account.setShortName(shortName); //HOW IS IT EVEN POSSIBLE THAT UUID IS NOT SET EVEN IF WE HAVE FOUND THE PLAYER?!
|
||||
account.setShortName(shortName); // HOW IS IT EVEN POSSIBLE THAT THE NAME IS NOT SET EVEN IF WE HAVE FOUND THE PLAYER?!
|
||||
return account;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
@ -120,11 +123,12 @@ public class NameManager {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get the information from the last time a player logged in that previously used the shortened name
|
||||
*
|
||||
* @param shortName The name of the player to get the last account for
|
||||
* @return The last account or <tt>null</tt> if none was found
|
||||
* @return The last account or <tt>null</tt> if none was found
|
||||
* @throws IllegalArgumentException if the username is not a shortened name and longer than 15 chars
|
||||
*/
|
||||
public static Account getLastAccountFromShortName(String shortName) {
|
||||
@ -137,9 +141,10 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get the UUID from a player's (non-shortened) username
|
||||
* @param username The player's username
|
||||
* @return The UUID or <tt>null</tt> if the UUID can't be found or an error occurred
|
||||
* @deprecated Use {@link NameManager#getAccount(String)}
|
||||
*
|
||||
* @param username The player's username
|
||||
* @return The UUID or <tt>null</tt> if the UUID can't be found or an error occurred
|
||||
* @deprecated Use {@link NameManager#getAccount(String)}
|
||||
*/
|
||||
@Deprecated
|
||||
public static UUID getUUID(String username) {
|
||||
@ -161,9 +166,10 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get the username from a player's UUID
|
||||
* @param uuid The UUID of the player
|
||||
* @return The username that is stored or <tt>null</tt> if none was found
|
||||
* @deprecated Use {@link NameManager#getAccount(UUID)}
|
||||
*
|
||||
* @param uuid The UUID of the player
|
||||
* @return The username that is stored or <tt>null</tt> if none was found
|
||||
* @deprecated Use {@link NameManager#getAccount(UUID)}
|
||||
*/
|
||||
@Deprecated
|
||||
public static String getUsername(UUID uuid) {
|
||||
@ -184,10 +190,11 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get the full username from another username that might be shortened
|
||||
*
|
||||
* @param shortName The name of the player to get the full username for
|
||||
* @return The full username or <tt>null</tt> if none was found
|
||||
* @return The full username or <tt>null</tt> if none was found
|
||||
* @throws IllegalArgumentException if the username is not a shortened name and longer than 15 chars
|
||||
* @deprecated Use {@link NameManager#getAccountFromShortName(String)}
|
||||
* @deprecated Use {@link NameManager#getAccountFromShortName(String)}
|
||||
*/
|
||||
@Deprecated
|
||||
public static String getFullUsername(String shortName) {
|
||||
@ -200,9 +207,10 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get the short username from a full username
|
||||
* @param fullName The name of the player to get the short username for
|
||||
* @return The short username or <tt>null</tt> if none was found
|
||||
* @deprecated Use {@link NameManager#getAccount(String)}
|
||||
*
|
||||
* @param fullName The name of the player to get the short username for
|
||||
* @return The short username or <tt>null</tt> if none was found
|
||||
* @deprecated Use {@link NameManager#getAccount(String)}
|
||||
*/
|
||||
@Deprecated
|
||||
public static String getShortUsername(String fullName) {
|
||||
@ -212,7 +220,8 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Store the username of a player into the database and the username-uuid cache
|
||||
* @param player The data transfer object of the player to store
|
||||
*
|
||||
* @param player The data transfer object of the player to store
|
||||
*/
|
||||
public static void storeUsername(final PlayerDTO player) {
|
||||
final UUID uuid = player.getUniqueId();
|
||||
@ -243,8 +252,9 @@ public class NameManager {
|
||||
|
||||
/**
|
||||
* Get a new unique shortened name that hasn't been used by another player yet
|
||||
* @param player The player data to get the shortened name for
|
||||
* @return A new shortened name that hasn't been used before and is a maximum of 15 chars long
|
||||
*
|
||||
* @param player The player data to get the shortened name for
|
||||
* @return A new shortened name that hasn't been used before and is a maximum of 15 chars long
|
||||
*/
|
||||
private static String getNewShortenedName(PlayerDTO player) {
|
||||
String shortenedName = NameUtil.stripUsername(player.getName());
|
||||
@ -302,9 +312,9 @@ public class NameManager {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static Account getServerEconomyAccount() {
|
||||
return serverEconomyAccount;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -29,17 +29,17 @@ public class uBlock {
|
||||
|
||||
return sign;
|
||||
}
|
||||
|
||||
|
||||
public static Sign getConnectedSign(Block block) {
|
||||
Sign sign = uBlock.findAnyNearbyShopSign(block);
|
||||
|
||||
|
||||
if (sign == null) {
|
||||
Block neighbor = findNeighbor(block);
|
||||
if (neighbor != null) {
|
||||
sign = uBlock.findAnyNearbyShopSign(neighbor);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return sign;
|
||||
}
|
||||
|
||||
@ -61,15 +61,15 @@ public class uBlock {
|
||||
}
|
||||
return findConnectedChest(block, signFace);
|
||||
}
|
||||
|
||||
|
||||
private static Chest findConnectedChest(Block block, BlockFace signFace) {
|
||||
if (signFace != null ) {
|
||||
if (signFace != null) {
|
||||
Block faceBlock = block.getRelative(signFace);
|
||||
if (BlockUtil.isChest(faceBlock)) {
|
||||
return (Chest) faceBlock.getState();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (BlockFace bf : SHOP_FACES) {
|
||||
if (bf != signFace) {
|
||||
Block faceBlock = block.getRelative(bf);
|
||||
@ -121,12 +121,12 @@ public class uBlock {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static Chest findNeighbor(Chest chest) {
|
||||
Block neighbor = findNeighbor(chest.getBlock());
|
||||
return neighbor != null ? (Chest) neighbor.getState() : null;
|
||||
}
|
||||
|
||||
|
||||
public static Block findNeighbor(Block block) {
|
||||
for (BlockFace blockFace : CHEST_EXTENSION_FACES) {
|
||||
Block neighborBlock = block.getRelative(blockFace);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user