Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-17 07:45:09 +01:00
Code Issues Projects Releases Wiki Activity
699 Commits 6 Branches 11 Tags 7.2 MiB
816fe77f27
Commit Graph

350 Commits

Author SHA1 Message Date
Phoenix616
df76347697 Improve sign price corrections 
This includes a new price_precision config entry to set the amount of decimal places to allow on a shop sign (set to 2 by default). Thanks to @andrewkm for this idea.
It also fixes an issue where a zero inside the decimal places was removed instead of it's end and also removes the point and zeros from prices that only have trailing zeros to avoid confusion (e.g. in languages that use the decimal point for thousands)
 2018-09-05 23:07:35 +01:00
Phoenix616
01ebedcc84 Merge branch '1.12' into 1.13 2018-08-31 13:55:54 +01:00
Phoenix616
06e4e1bf17 Don't search offline players when checking for existing (Fixes #162) 2018-08-31 13:55:36 +01:00
Phoenix616
5f0bbfff0c Merge branch '1.12' into 1.13 2018-08-29 21:29:52 +01:00
Phoenix616
dd4177e7cb Query server's player cache for missing players 
This uses a cache for players that we haven't found before so to not check the cache too often and also checks if the online mode of the queried OfflinePlayer matches the server's mode (gotten from the first logged-in player in order to be compatible with BungeeCord requiring the server to be in offline-mode.
 2018-08-29 21:29:27 +01:00
Phoenix616
640364e7e7 Actually return the block that the sign is attached to 2018-08-29 21:02:06 +01:00
Brokkonaut
f5b3aa6b75 1.13 allows single chests besides each other. Handle that correctly. 2018-08-29 20:57:48 +01:00
Brokkonaut
b972e79132 Update to WorldGuard 7.0.0 (for 1.13) 2018-08-29 20:32:27 +01:00
Phoenix616
cf9e5bafde Merge branch '1.12' into 1.13 2018-08-23 22:12:58 +01:00
Phoenix616
836ef56864 Add more message placeholders (Fixes #159) 2018-08-23 22:10:24 +01:00
Phoenix616
e155b98c96 Merge branch '1.12' into 1.13 2018-08-22 00:29:12 +01:00
Phoenix616
fc62ab0823 Use different economy responses and make some events cancellable 
Also moved the creation fee subtraction to before the shop was created to be able to cancel the creation
 2018-08-22 00:21:34 +01:00
Phoenix616
89dcde83de Differentiate between wall and standing signs (Fixes #147) 2018-07-29 15:05:45 +01:00
Phoenix616
d4e39a3751 Make it compile with 1.13. No guarantees that it works without issues! 2018-07-26 00:13:06 +01:00
Daniel V
8ae72e5803 Feature: Reserve Support (#143) 
This introduces a new AccountCheckEvent to check if a user actually has an account with the used economy plugin. Also fix CurrencyTransferEvent logic (even though it's not used anywhere currently)
 2018-07-11 18:09:07 +01:00
Phoenix616
7311907559 Add more per material shop creation permissions 2018-06-24 00:17:35 +01:00
Phoenix616
1cb481097c Don't refund for non-finished signs (Fixes #141) 2018-06-23 15:01:41 +01:00
Phoenix616
247b2d239e Fix issues with alternative block materials forms 
This also removes the number in the name from /iteminfo and the autocompletion
 2018-06-18 20:04:17 +01:00
Phoenix616
5b925171e3 Add support for stored enchantments to /iteminfo and format it better 
Partly fixes #135
 2018-06-03 19:23:40 +01:00
Phoenix616
c39720b449 Don't try to get the MaterialData from every damage (Fixes #131) 
We will have to add a new way of handling that for 1.13 anyways when data isn't using damage values anymore.
 2018-05-15 23:58:34 +01:00
Phoenix616
036d309965 [CI-SKIP] Fix some formatting inconsistencies 
Remove spaces on empty lines and changed doc comment formatting
Also includes some minor comments and import fixes
 2018-05-07 15:32:51 +01:00
Phoenix616
b3e62f199f Add option to set the worlds where shops should be removed (Fixes #129) 
This also adds the ability to set string lists in the config.
 2018-05-05 16:23:30 +01:00
Phoenix616
34b6ab2cf2 Update spigot-api and ormlite-jdbc 
This might fix the Xerial driver warning from #9/BUKKIT-1073
 2018-04-18 14:58:15 +01:00
Phoenix616
88bffc6fde Move comments in above config fields. 
This should help avoid confusions as it matches the class' annotation layout and almost every other plugin does it like this.
 2018-04-02 18:20:52 +01:00
Phoenix616
ae8d1c79e9 Properly check if item is empty (Fixes #123) 2018-04-02 17:41:45 +01:00
Phoenix616
68ce9d56f6 Allow lowercase config keys too 2018-03-22 18:33:11 +01:00
Phoenix616
d28e44f377 Make sure to set the item if removed manually 2018-03-22 17:01:56 +01:00
Phoenix616
679000de15 Improve MaterialData handling 
- Adds ability to shorten MaterialData type strings
- Removes Banner color string in name
 2018-03-16 18:30:51 +01:00
Phoenix616
dd44217132 Fix issues with metadata IDs 
Also log more info when the code couldn't be generated and send it to the sender when the iteminfo command is used
 2018-03-16 18:24:52 +01:00
Phoenix616
51495cdefb Fix issues with banners and display their color 
Also print more info when the code couldn't be generated.
 2018-03-14 18:53:34 +01:00
Phoenix616
26ddb52434 Properly split the material name (Fixes #114) 2018-03-14 15:08:51 +01:00
Phoenix616
d04e17450b Make material name shortening testable and move test to proper package 2018-03-14 15:07:13 +01:00
Phoenix616
58a14bc508 Optimize StringUtil 2018-03-12 21:02:57 +01:00
Phoenix616
6e9824e6b0 Add better item name shortening. (Fixes #112) 2018-03-12 21:01:28 +01:00
Phoenix616
b22d8fd95d Move cache to own class in Breeze package 2018-03-12 21:01:03 +01:00
Tim222
21815197c6 Fix Vault-Accountcheck for renamed player (#106) 2018-01-27 17:12:34 +01:00
Phoenix616
c5c9e96b13 Properly stack partial stacks (Fixes #102) 2018-01-23 17:32:54 +01:00
Phoenix616
650d02e401 No need to log console message async (Fixes #101) 
Iirc this was only async for database logging or name resolving. Neither of these is done anymore and async access of the Bukkit API can lead to strange problems like the CME described in the mentioned issue.
 2018-01-22 01:00:24 +01:00
Phoenix616
e4fb9f9872 Use lowercase name instead of full lowercase permission 2018-01-22 00:39:42 +01:00
Phoenix616
1788fa9702 Fix NPE when section doesn't exist (Fixes #99) 2018-01-13 23:35:55 +01:00
Phoenix616
6d4db1c8f6 1.13 preparations: Get rid of numeric item ids 2018-01-12 17:54:57 +01:00
Phoenix616
0176ea1dc5 Check the block that the sign is attached to first (Fixes #97) 
Also fix some oddities and duplicate code/method execution
 2018-01-11 18:28:45 +01:00
Phoenix616
445ed9574a Send buy notification to shop owner, not to buyer (Fixes #98) 2018-01-11 15:29:04 +01:00
Phoenix616
4fd2bcb836 Send correct message when shop is full. (Fixes #95) 2018-01-09 19:55:37 +01:00
Phoenix616
eaeeb80fd3 Fix issues with partial item transfer due to full inventory 2018-01-08 23:56:58 +01:00
Phoenix616
3ad0849c3d Merge similar stacks when showing the ShowItem message 2018-01-08 22:53:44 +01:00
Phoenix616
b2a31b8eb2 Add ability to autofill sign by clicking it 
Also disable the worldguard shop flag by default...
 2018-01-07 02:11:59 +01:00
Phoenix616
ac73442643 Added ability to show item icons and hover info with ShowItem 2018-01-06 17:44:35 +01:00
Phoenix616
110d98d599 Fix cast exception (Fixes issue #93) 2018-01-06 15:44:51 +01:00
Phoenix616
0e8ef9f2be Revert cancelling change. The events don't and can't extend Cancellable. 2018-01-05 18:34:45 +01:00
Phoenix616
b23a0d238e Allow partial transactions due to missing inventory space (Fixes #88) 2018-01-05 18:30:06 +01:00
Phoenix616
a0505e995e Merge items in logger message 2018-01-03 17:28:31 +01:00
Phoenix616
d84313716f Add old piston checks back in for backwards compatibility. (Fixes #91) 
These checks are completely unsupported though!
 2017-12-31 01:13:13 +01:00
Phoenix616
7c9dd5c3f3 Check all blocks moved by pistons (Fixes DBO-1247) 2017-12-30 16:08:09 +01:00
Phoenix616
8687b94e22 Make sure the maxStackSize isn't zero (Fixes #87) 
By returning an empty array here we completely stop the transaction if the max stack size somehow manages to be zero.
 2017-12-04 16:39:23 +01:00
Phoenix616
0354258251 Migrate all versions and disable on fail. 
This should make it possible to theoretically upgrade from version 1 to version 3 databases.
 2017-11-26 18:57:32 +01:00
Phoenix616
5d73320889 Set sign lines even when the event is cancelled (Fixes #82) 
Also get the sign line from the event instead of the sign when checking if it is an admin shop so you can actually change that via an event listener.
 2017-11-20 13:44:59 +01:00
Phoenix616
1276c6f031 Add method to get the last account information from a shortened name 2017-11-17 22:08:06 +01:00
Phoenix616
29ef7f25aa Fix errors when server economy account is not defined or invalid 2017-11-15 21:13:07 +01:00
Phoenix616
4075b2e38a Use the alias on the sign if one is defined in OddItem 2017-11-15 21:08:32 +01:00
Phoenix616
d332603fb4 Do not automatically color config strings (Fixes BUKKIT-1241) 
This is necessary so that we still store the messages with the & code internally as they would get saved back to the config file using the converted color code (section sign) which could lead to encoding issues on different operating systems. (It also fixes issues with strings that contain an and sign that isn't supposed to be a color code) Instead we load the real string and color messages via the prefix method which should get called in every instance where a message is send.
 2017-11-13 15:11:22 +01:00
Phoenix616
519a4fca8a Names with a colon are valid (Fixes #81) 
The NameManager appends a unique id for every player that has the same short name as another already existing one with a colon to the end of the clashing usernames. This is necessary so that a player can't just change their name to another user's old name and get access to all his shops.
 2017-11-10 00:05:59 +01:00
Phoenix616
2d45dcdac0 Get rid of expensive calls to Bukkit#getOfflinePlayer with a username 
This changes events to store the database Account instead of an OfflinePlayer and deprecates any event method that uses/returns OfflinePlayer. This is necessary as Bukkit#getOfflinePlayer(String) queries Mojang for the UUID when the user was not found in the local cache. As we already store this information (name to UUID mapping) in our database we should not have no need to rely on querying Mojang. (This might make transactions fail for shop owners that haven't played before but that shouldn't really be an issue in most cases)
 2017-10-29 23:50:24 +01:00
Phoenix616
61c08a3b18 Calculate the amount instead of using a loop (Fixes #78) 2017-10-25 15:22:26 +01:00
Phoenix616
e81077143e Also check for full account name permission 2017-09-26 15:39:08 +01:00
Phoenix616
1d80edbf9b Get rid of google dependencies 
Mostly replaced with Java 8 features and our own cache
 2017-09-23 15:19:00 +01:00
Phoenix616
9b7000272d Merge remote-tracking branch 'origin/master' 2017-09-06 14:20:14 +01:00
Phoenix616
9da7d5198b Fix stacking issues (Fixes #74) 
This also fixes some conditions under which the STACK_TO_64 option did not get applied correctly and wrong inventory space checking for items with a max stack size of less than 64
 2017-09-06 14:19:34 +01:00
Max Lee
3434c8860c Merge pull request #64 from LukBukkit/master 
Fixed an error when trading with a admin shop (Fixes #59, #63 & DevBukkit #1219)
 2017-08-27 16:16:11 +01:00
Phoenix616
7199acb8ef Added progress to migration and made error messages prettier (#67) 2017-08-17 21:38:05 +01:00
Phoenix616
9368dfea75 Make sure owner name is set (Fixes DevBukkit-1225) 2017-08-15 13:02:26 +01:00
Phoenix616
9a9e89206b Fix NPE that occurs when STACK_TO_64 is true (DevBukkit-1222) 2017-08-06 11:40:20 +01:00
Phoenix616
0413f24e64 Fix error in config comment 2017-08-06 11:40:02 +01:00
LukBukkit
e672dc5e22
Fixed an error when trading with a admin shop (Fixes #59 & fixes #63) 2017-07-26 15:13:03 +02:00
Phoenix616
4a71af39af Return account by normal name if name is longer than 15 cars (DevBukkit-1217) 2017-07-09 17:30:26 +01:00
Phoenix616
b3b9e690dd Fix NPE when server economy account info can't be found (DevBukkit-1216) 
Also add a warning to the startup if that happens
 2017-07-09 17:00:31 +01:00
Phoenix616
4120455974 Strings already get colored by the Breeze library 2017-07-05 23:51:49 +01:00
Phoenix616
9269fc4049 Added bstats metrics as mcstats isn't really stable anymore 2017-07-05 15:23:28 +01:00
Phoenix616
2e7613ae9c Create LWC protections with UUIDs instead of the name 
Thanks to @Brokkonaut for noticing this
 2017-07-04 16:18:21 +01:00
Phoenix616
0dea862cd0 Add full shop message, location and respect cstoggle 
Inspired by @Brokkonaut's fork this adds a new NOT_ENOUGH_SPACE_IN_YOUR_SHOP message to send to the shop owner when someone tries to sell to his shop. It also adds new %world, %x, %y and %z variables to display the shop's location in the message, adds a config option to make both the full-shop and out-of-stock messages respect /cstoggle and makes values in the locale.yml support ampersand color codes.
 2017-07-04 16:06:34 +01:00
Phoenix616
b9f9166d6c Add permission check to version and reload command 2017-07-04 15:18:00 +01:00
Phoenix616
cae36a94bd Reload the NameManager when reloading the config 2017-07-04 15:14:57 +01:00
Phoenix616
f4e060071d Make accounts v3 migration more robust to errors (Fixes #58) 2017-07-03 00:46:43 +01:00
Phoenix616
70fa6292b1 Get OfflinePlayer from namewith offline mode UUIDs. Fixes #60 2017-07-02 23:32:06 +01:00
Phoenix616
0525c70452 Rewrite NameManager to support multiple short names per user 
This should fix the issue where the player's short name on the shop sign does not reflect the actual player's name. This works by storing every uuid-username combination together with the associated short name and the last time the player logged in with that combination.
 2017-07-01 17:14:41 +01:00
Phoenix616
7271cebd91 Properly use the plugin's logger 2017-06-30 21:00:30 +01:00
Phoenix616
4abb9ae518 Fix NPE when slot in chest is empty 2017-06-30 20:38:58 +01:00
Phoenix616
0b65a7cc92 Rewrite (and document) the NameManager 
This should fix issues with how name changes are handled and also prevent short names of different players from clashing. It also uses guava caches instead of maps now with a configurable cache size
 2017-06-30 20:28:18 +01:00
Phoenix616
cf2497ff91 Fix potential NPE 2017-06-28 22:11:54 +01:00
Phoenix616
ab1596632b Update spigot-api dependency to 1.12 pre6 and to log4j 2.1.0 2017-06-05 19:29:29 +01:00
Phoenix616
1948156b42 Update residence dependency 2017-05-09 14:54:32 +01:00
Phoenix616
fc5d84eebb Fix issue with selling written books (#1107) 
Also improved the manual add method.
 2017-05-04 18:54:49 +01:00
Phoenix616
583c50438c Revert "Fix merging of items that aren't actually equal. (Like skulls with textures)" 
This reverts commit 11d2280d3e.

The method isn't actually the issue and the workaround introduces new
issues.
 2017-02-20 00:39:30 +01:00
Phoenix616
11d2280d3e Fix merging of items that aren't actually equal. (Like skulls with textures) 2017-02-19 17:22:07 +01:00
Phoenix616
765548e0e5 Use Bukkit's addItem method if maxStackSize equals the item's natural stack size 2017-02-19 17:17:42 +01:00
Phoenix616
90f7dd5b0f No need to use the workaround anymore as CB adds large itemstacks properly now 2017-02-19 16:50:31 +01:00
Dan Mulloy
87071ca384 Merge branch 'master' into master 2017-01-16 13:53:21 -05:00
Eredrim
fc3c134c2a Update residence comptibility 2017-01-07 23:14:27 +01:00
Dan Mulloy
fa7a196bab Fix static access 2016-11-21 11:43:09 -05:00
L4BORG
2ff945bbe6 Fix Admin Shops 2016-11-10 03:17:27 +01:00