2.6.0 json cleanup#146
Closed
BoyStijn wants to merge 54 commits into
Closed
Conversation
- Improvements to Setting Section comparison code(due to errors when ne ones were added) should be a lot beefier and handle any future additions without problems - Added configurable default item settings and ability to disable editing of individual item settings - Added type checking to ObjectHolder - Moved State String generation to ShopItemStack - ShopItemStack Settings are ignored if not set to UserEditable in the config(uses default setting instead)
- Moved #createShop to Utils - Made #createShop more generic so sign creation and commands could both use it - Added SHOP_CREATION Debug Level at bit 11(1024) - Added toDebug method to Shop to allow a easily readable output of the shop - Re-wrote updateSign methods to make them simpler to understand and allow sign/event passing from #createShop - Removed event storing and related methods from Shop as it was unnecessary - Deprecated #b64OverstackFixer since it is only used in legacy code - Fixed some spelling in comments(the green underlines were bothering me) - Removed unused `failed` methods from Utils
- Added configurable colours for the middle lines on trade sides per material type Tradeshop#135 - Removed Message call in CommandRunner that should never be used and would never actually send if it was. - Added SET_MANAGER and SET_MEMBER commands to the autofill for player names - Added Config support for map values so individual setting enums are not required for settings that may change(like sign types), This should automatically add new items to existing maps as well - Changed SettingSection weights to start at 50 increments based on nest depth to make them more easily readable - Changed Member and Manager Lists into Sets to prevent Duplicates(hopefully) - Added Shop#saveShop with a boolean parameter so that conditional saves don't need a separate if statement - Removed Wall sign types since each sign type is handled the same whether it is on a wall or not - Adjusted sign code to properly handle above - Fixed error in ShoptradeListener where shops in the OOS state but without a product would try to check on stock.
- Added conditional saving for Setting and Message files - Added thorough change detection for setting defaults and upgrades to prevent unnecessary saves and fix bug preventing changes to default sign colours to be changed from their default values - Fixed bug preventing setUser commands from working due to failed removal(which wasn't necessary for the set to process) - Added missing return in ShopTradeListener which caused `OOS` code to run after `Incomplete` code in a switch
- Additions for Tradeshop#138
- Fix for more stupid mistakes - Removed `Internal Permissions` as it is replaced by `Registered Permissions` Tradeshop#138 - fixed phrasing in `NO_TRADE_PERMISSION` pre-comment and `NO_TS_CREATE_PERMISSION` default message - Prevent NONE permission from registering - Added Permission registration debug to STARTUP level - Fixed many places where getUsersUUID was not provided with which roles to get users for - Fixed not checking for Create permission in CreateShop method allowing anyone to create and shop type by placing the sign
- Remove `Player Level` command
- Mapped Setting now supports nested maps(so section > setting groups can be generated) this has no limit but cannot be changed externally so it should be fine and not encounter any un-ending loops - Changed Per-Item settings to use Mapped values instead of individual settings and sections - Changed ShopItemStackSettingKeys to load settings on each get call rather than when enums are created(since I think the latter could have problems when reloading)
- Remove Debugger from utils to prevent early access - Add in server default and user-editable settings for per-shop settings including hopper import/export and no-cost - Update old values into new locations including no-cost-text, no-cost-amount, and existing hopper settings - Fix for improper mapped settings writing - Remove hopper settings from Metrics, need to add back before 2.6.0 - Add in asType settings to ObjectHolder so conversion code doesn't need to be added after retrieval. - Changed old makeReadable Code to utilize WordUtils. - Removed getString from ShopType to avoid early setting calls, replace with Setting enum value - Add try/catch to skippableHoppers boolean updater to avoid early settings call - Call updateSkippableHoppers a second time after settings has been fully initiated - Add ShopSettingKeys - Add Edit Settings GUI to `/ts edit` menu - Added skippableShop cache so shops can be handled with a different time values and be removed when their settings are changed and should be reprocessed. - Added try/catch for IlleaglWorldException to PlayerSetting#getInvolvedStatus methods to prevent error when trying to load shops from unloaded worlds - Fix for null appearing on shop sign lines 2/3 due to color being added - Change availableTradeAmount for iTrade Shops to be 999 - Change updateStatus to change to OPEN when availableTrade > 0 - Change getFullTradeCount to check if costs can be traded on BiTrade Shops when no Product is in stock - Change Hopper protection to not skip shop hoppers(code is commented out dependent on input) - Add delayed Shop sign and available trade update on inventory close(when it is a shop inventory) - Changed trade and trade check code to support new noCost setting
- Proper fix for null appearing on signs(was due to the new sign color settings not being loaded) - Changed serialized value for ObjectHolder so data storage is more readable - Fix for bad data on a shop sign(That side of the trade will more than likely be removed) - Dry'd Line formatting on signs for lines 2/3 - Added serialized name for `itemSettings` to properly read in the object with the old `shopSettings` name - Added method to add ItemStacks to an inventory while temporary setting the inventories Max Stack Size to prevent overstacking items(May add as a shop setting in the future) - Added updateFullTradeCount and updateSign to what command
- Updated plugin versions in POM.xml - Fix for non DATA_ERROR debug output
- Moved inventoryGUI to a local directory instead of it's own to prevent potential conflicts - Fix for add Error during shop creation when adding users.
- RemoveSide commands now default to the only item if no index was specified and the shop only has one item on the side - Fix for members showing up as managers in the edit menu - Fix for managers not showing in edit menu
- Minor Testing done seems Okay - Adds support for checking all 26 spots around a sign - Checks for Chests/Signs based on the direction for the block - Directions in the config should be formatted as `dir1+dir1+dir3` i.e `BACK` | `BACK+DOWN` | `LEFT+DOWN+BACK` - There is no limit to the amount of directions(other than not being able to repeat a direction) but only 3 are needed to check specif the surrounding 26 blocks
- Moved RelativeCardinals to be nested in RelativeDirection - Change allowed-directions in lang to chest-directions - Updated comment for above to be more descriptive of usage and options
- Add SQLITE option to data-storage-type pre-comment - POM Version updates - POM Improvements - Added `Clean` and `skipDocs` profiles for maven builds - Moved `original` and JavaDocs output to `target/output-Files` sub folders - Updated JavaDoc exclusions - Excluded `META-INF/maven` files from builds
removed java.io.Serializable interface from classes removed serialization method from classes (or changed to `toString` if the method was used) removed deserialization method from classes (or changed to `fromString` if the method was used)
Member
|
We are not merging into |
Author
|
My bad |
Member
|
Future reference: resubmitted in #147 . |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request Etiquette
There are several guidelines you should follow in order for your Pull Request to be merged.
Replace
[ ]with[x]to cross the checkbox.Changes
Removed unused (de)serialization methodes
toStringif the method was used)fromStringif the method was used)