Commit graph

611 commits

Author SHA1 Message Date
Pahimar
22337f0bbc Move away from System.currentTimeMillis to System.nanoTime (more accurate, less costly) 2016-05-26 16:03:40 -04:00
Pahimar
997e981f3e Added more detail into the log message on HOW EE3 determined the value for an object 2016-05-26 16:03:12 -04:00
Pahimar
c4f3039e60 Switch to proper API location for the recipe registry proxy 2016-05-26 16:01:45 -04:00
Pahimar
f41b0279a6 Added some more NPE protection to the ID based ItemStack comparator
Added back in the small and medium sized Alchemical Chest aludel recipes
Added a recipe to make a chalk block from 4 pieces of chalk
Created an EE test suite to test EE specific energy values
Re-registered several EE items
Removed a duplicate Gson type adapter registration
Changed the ItemStackSerializer to return JsonNull in the event that there is no registered name for the item (the item would never deserialize as it wouldn't have a name to lookup)
Changed the EnergyValueMapSerializer to allow serializing of null energy values (as JsonNull). Used for energy value testing.
2016-05-26 12:02:37 -04:00
Pahimar
9112666443 Remove unnecessary second load 2016-05-25 14:27:14 -04:00
Pahimar
cd7d965000 Change the tooltip to show No Exchange Energy in the event an item is blacklisted from being learned and from being exchanged (effectively no value) 2016-05-25 13:30:17 -04:00
Pahimar
9113460a3b Fix a bug in computing energy values where it would not attempt to load in the values stored in the pre/post energy value jsons before doing the calculation 2016-05-25 13:25:52 -04:00
Pahimar
41ae098ced Fix bug where the exchange blacklist was being loaded with the values from the knowledge blacklist 2016-05-25 12:42:18 -04:00
Pahimar
b76af2ea7f Move blacklist initialization to post init 2016-05-25 12:26:53 -04:00
Pahimar
b878506cf3 Add some more log markers for tests 2016-05-25 11:29:18 -04:00
Pahimar
b70bbe0e23 More fixing of energy value tests 2016-05-25 11:17:10 -04:00
Pahimar
7cace9895a Change location where EE3 looks for test files 2016-05-25 11:10:21 -04:00
Pahimar
ba6841db98 Formatting and reminders 2016-05-25 11:02:19 -04:00
Pahimar
85f8d4bfa8 Simplify the energy value test suite and remove more deprecated classes 2016-05-25 11:01:07 -04:00
Pahimar
747f67f16f When a player blacklists an object by setting its emc value to 0, also update other players that the item is now blacklisted 2016-05-25 10:20:04 -04:00
Pahimar
e9f834555f When ops make changes to the servers blacklist entries, the change is sent out to all currently logged in players so that they remain in sync with the servers entries. 2016-05-25 10:17:40 -04:00
Pahimar
73fd3a4e28 Added more NPE protection to BlacklistRegistry loading. Closes #1058 2016-05-25 09:56:42 -04:00
Pahimar
0c5f1ccb41 Remove an unnecessary old reference from MessageSetEnergyValue
Stub out MessageSetBlacklistEntry for later development tomorrow
2016-05-24 23:28:04 -04:00
Pahimar
568196aa9e Fix required permissions level for the regen energy values command
Change up the sync energy values command to be "push to all players" rather than "request a sync for the person running the command"
2016-05-24 23:17:26 -04:00
Pahimar
30c0eb46b7 Fix a possible NPE in the FluidStack comparator
Post calculation energy values set by command now send the new energy value mapping to all currently logged in players
Added methods for devs to see what items are currently blacklisted in the blacklist registry proxy
Added methods for devs to see what energy values are currently assigned in the energy value registry proxy
BlacklistRegistry contents are now synchronized with players when they log into a server, enabling players to play on different servers with different blacklist configurations without needing to update their own configs
Fixed issue in synching of all energy values where the incorrect map was used to synch against on the client side
2016-05-24 23:12:49 -04:00
Pahimar
c179405dab Fixed a bug where removing something from a blacklist didn't trigger a save, added some commands for adding/removing the currently held item to/from a blacklist, and changed the set energy commands to manage blacklist entries depending on values used (if the value is 0 then the item is blacklisted) 2016-05-24 14:58:56 -04:00
Pahimar
2046edf3fb Rewrote the Ability system to be what it was really trying to be, a blacklist registry. Also fixed writing the data to a global area, and made it one file per blacklist. Fixes #898 and #991 2016-05-23 17:47:31 -04:00
Pahimar
160a923ef4 Made sure parent directories are always created if needed on save 2016-05-23 09:29:21 -04:00
Pahimar
4fac58d422 Fixes meta on shift click, stll has the dupe exploit 2016-05-22 23:55:30 -04:00
Pahimar
2bed1e81ac Closes #1055 2016-05-22 23:28:30 -04:00
Pahimar
71ed8e2508 Added a regen energy values command. It will reload values from file, recalculate energy values, then send the new values to everyone on the server 2016-05-22 13:59:05 -04:00
Pahimar
a09dc48699 Remove some localizations 2016-05-22 13:29:37 -04:00
Pahimar
3290abb23e Death to the old Transmutation Knowledge! Long live Player Knowledge! 2016-05-22 13:21:46 -04:00
Pahimar
8d942d49d3 Getting there with the new Player Knowledge system - just need to change how the Tome, Research Station, and Transmutation Tablet interact with the player knowledge 2016-05-21 22:55:14 -04:00
Pahimar
1487490bf5 That should do it for player knowledge related API changes. Loads of stuff in the old TransmutationKnowledgeRegistry are now deprecated. 2016-05-21 22:23:21 -04:00
Pahimar
39448076b9 More work on the new player knowledge system - getting close 2016-05-21 10:45:25 -04:00
Pahimar
c79e76d8c1 More work on the new player knowledge system - getting close 2016-05-21 10:44:51 -04:00
Pahimar
b9d8e00f4b Invert some logic that was causing crashes when saving player knowledge to disk 2016-05-21 07:43:14 -04:00
Pahimar
2b46fa82eb Better protection of parsing values from json 2016-05-20 23:14:36 -04:00
Pahimar
26d1e76fe1 Better protection of parsing values from json 2016-05-20 23:12:40 -04:00
Pahimar
bd4b5bf5ee Better protection of parsing values from json 2016-05-20 23:07:28 -04:00
Pahimar
28080229f7 Better protection of parsing values from json 2016-05-20 23:05:57 -04:00
Pahimar
c6d02aee9d More work on the new player knowledge system 2016-05-20 22:55:49 -04:00
Pahimar
3e0907fa3e Working on the railroad, I mean the player knowledge system, all the live long day 2016-05-20 15:57:20 -04:00
Pahimar
5f570fc576 Better Singleton implementation of RecipeRegistry, and fix up the getStacksInRange to be more flexible about bounds 2016-05-20 13:56:53 -04:00
Pahimar
dde11a8f04 Remove the NEI Calcination handler - fixes #1047 2016-05-20 13:55:35 -04:00
Pahimar
766d277070 Remove bugged/unimplemented command. Fixes #1049 2016-05-20 13:49:17 -04:00
Pahimar
591a9ab2eb More work on the new player knowledge system 2016-05-19 22:17:31 -04:00
Pahimar
a7e85aba7b Improvements to the flud stack comparator, and fixed a missed case in the wrapped stack set comparator 2016-05-19 21:49:21 -04:00
Pahimar
429a0fc51b Make some changes to comparators, switch the recipe registry to a TreeMultimap (from HashMultimap), and dump WrappedStack's hashCode as we are no longer using HashMaps/etc (and it wasn't a great implementation anyways) 2016-05-19 21:10:55 -04:00
Pahimar
8d40883473 Better NPE protection in serializing energy value maps 2016-05-19 20:03:29 -04:00
Pahimar
43860832ff Start work on the new and improved PlayerKnowledge system 2016-05-19 15:55:14 -04:00
Pahimar
b0544a00ac Clean up some ItemStack copying and fix incorrect stack size in log message 2016-05-19 15:54:59 -04:00
Pahimar
f51f3659d6 Fix for #1046 2016-05-19 15:54:30 -04:00
Pahimar
0679af1993 Switch to the proper location of the RecipeRegistryProxy 2016-05-19 15:53:50 -04:00