Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-07-01 00:34:43 +02:00
Code Issues Projects Releases Wiki Activity
664 Commits 6 Branches 11 Tags 8 MiB
b5f77d67b5
Commit Graph

82 Commits

Author SHA1 Message Date
Phoenix616
b5f77d67b5 Fix color of ShowItem insert bleeding into message 2018-10-23 19:02:09 +01:00
Phoenix616
0c6aaaa6f7 Fix damage not getting set properly 2018-09-10 01:11:42 +01:00
Phoenix616
adf5340932 Remove spaces from shortened strings for better readability 
This is necessary due to the extended length of some material names in 1.13 as they directly include the variation into the material where previously only the data value was used. (E.g. BLACK_STAINED_GLASS_PANE) By removing the spaces and using uppercase characters to separate parts the string stays both readable to the user and parseable by the plugin. It should also be backwards compatible with the old format. (At least with 1.13 material names)
 2018-09-10 00:33:27 +01:00
Phoenix616
e1998bcd7c Merge branch '1.12' into 1.13 
# Conflicts:
#	src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
 2018-09-10 00:31:26 +01:00
Phoenix616
12d2107ce1 Fix passing Material enum strings directly to getShortenedName 2018-09-10 00:25:25 +01:00
Phoenix616
173991ab4a Use spaces and proper casing for calculating width (Fixes #166) 
This also slightly changes which name part gets shortened first. It will first shorten the longest name and then the rest.
 2018-09-09 22:43:49 +01:00
Phoenix616
54b3b6966c Merge branch '1.12' into 1.13 
# Conflicts:
#	src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
#	src/test/java/com/Acrobot/Breeze/Tests/MaterialTest.java
 2018-09-09 14:47:32 +01:00
Phoenix616
516eefc5b6 Allow longer item names on signs by calculating the width 
This uses hardcoded widths for the main characters used in Minecraft and might not be precise for some characters but better than the previous 15 char hard limit.
 2018-09-09 14:37:09 +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
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
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
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
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
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
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
Phoenix616
c5c9e96b13 Properly stack partial stacks (Fixes #102) 2018-01-23 17:32:54 +01:00
Phoenix616
6d4db1c8f6 1.13 preparations: Get rid of numeric item ids 2018-01-12 17:54:57 +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
ac73442643 Added ability to show item icons and hover info with ShowItem 2018-01-06 17:44:35 +01:00
Phoenix616
b23a0d238e Allow partial transactions due to missing inventory space (Fixes #88) 2018-01-05 18:30:06 +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
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
61c08a3b18 Calculate the amount instead of using a loop (Fixes #78) 2017-10-25 15:22:26 +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
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
Phoenix616
9a9e89206b Fix NPE that occurs when STACK_TO_64 is true (DevBukkit-1222) 2017-08-06 11:40:20 +01:00
Phoenix616
4abb9ae518 Fix NPE when slot in chest is empty 2017-06-30 20:38:58 +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