Commit Graph

  • 8c5c1922c9 Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-24 12:34:41 +01:00
  • 707559e023 Merge remote-tracking branch 'origin/v6' into v6 Alexander Söderberg 2020-07-24 13:33:00 +02:00
  • 97a2ccbfe0 make sure the PlayerMetaDataKeys keys are loaded Alexander Söderberg 2020-07-24 13:32:46 +02:00
  • 95f2a7a908 fix version dordsor21 2020-07-24 12:22:13 +01:00
  • e53c53bb4a Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-24 12:21:40 +01:00
  • d906a85095 Fix some issues I caused with Guice dordsor21 2020-07-24 12:18:36 +01:00
  • dc1f669a1f Remove permission caching Alexander Söderberg 2020-07-24 13:01:38 +02:00
  • 0ea862b572 Merge pull request #2886 from IntellectualSites/features/v6/permissions Alexander Söderberg 2020-07-24 12:49:37 +02:00
  • fe7a57b2b7 Remove mainutil cache workaround Alexander Söderberg 2020-07-24 12:48:45 +02:00
  • c9c62a1083 Remove dumb permission mess. Alexander Söderberg 2020-07-24 12:44:04 +02:00
  • 5608c5a901 Merge branch 'v6' into features/v6/permissions Alexander Söderberg 2020-07-24 12:20:45 +02:00
  • 722361aedb Implement suggestions from PR comments Alexander Söderberg 2020-07-24 12:15:07 +02:00
  • d2f40612f4 Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta Alexander Söderberg 2020-07-23 20:52:32 +02:00
  • 6a63e5bb51 Expose the player's lock repository Alexander Söderberg 2020-07-23 19:30:52 +02:00
  • ad40ab7e1e Grant plots to the correct player Alexander Söderberg 2020-07-23 19:26:29 +02:00
  • 05ce67fbfe Trick the compiler Alexander Söderberg 2020-07-23 19:19:48 +02:00
  • 555860cf83 Add managed persistent meta data access Alexander Söderberg 2020-07-23 19:18:21 +02:00
  • 2575787bd0 Add LockRepository Alexander Söderberg 2020-07-23 18:30:50 +02:00
  • 2cfb646065 Javadoc no fun dordsor21 2020-07-23 18:11:52 +01:00
  • a1da452c41 Fix build properly dordsor21 2020-07-23 18:09:37 +01:00
  • 420e38bead idek? dordsor21 2020-07-23 18:07:23 +01:00
  • 41c4018a27 Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-23 18:06:45 +01:00
  • 4d4f755607 6.0.0-SUPER-SNAPSHOT dordsor21 2020-07-23 18:06:14 +01:00
  • d8e5daf12b Fix missing Main->Chunk Util change dordsor21 2020-07-23 18:04:01 +01:00
  • c3322021d0 mavenLocal, poms dordsor21 2020-07-23 18:02:29 +01:00
  • 45cc88091e Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-23 17:33:05 +01:00
  • 27498f68fb Many Much - Add readregions to queues for when we're setting our own consumer (usually meaning the queue writes its own blocks, so it doesn't know which chunks to actually load) - Finish removing chunk/regionTasks - Allow the queue to not remove tickets from chunks (useful for swapping chunks so they don't unload needlessly) - Remove a lot of unused methods - Implement entities to queues - Remove chunk unloading (the server should really handle it) dordsor21 2020-07-23 17:30:23 +01:00
  • d8e80daa93 Fix annoying guice injection issue Alexander Söderberg 2020-07-23 15:40:43 +02:00
  • 384a6730a4 Merge remote-tracking branch 'origin/features/v6/permissions' into features/v6/permissions Alexander Söderberg 2020-07-23 15:06:00 +02:00
  • a7de76d150 Fix dependencies N0tMyFaultOG 2020-07-23 14:03:56 +02:00
  • 2154e237ff Remove construction of fake player entities for offline players. Alexander Söderberg 2020-07-23 12:47:00 +02:00
  • 5fda3e9765 Get rid of PermHandler Alexander Söderberg 2020-07-22 12:35:48 +02:00
  • b302bb9379 Make VaultPermissionHandler extent BukkitPermissionHandler Alexander Söderberg 2020-07-22 12:06:56 +02:00
  • bfbb81030f Start working on the new permission system Alexander Söderberg 2020-07-21 14:28:54 +02:00
  • 63ce3292aa Fix PlayerManager injection Alexander Söderberg 2020-07-23 15:03:27 +02:00
  • b9a8846ee9 Fix WorldManager injection Alexander Söderberg 2020-07-23 14:56:06 +02:00
  • 6ae1d28f80 Fix WorldManager injection Alexander Söderberg 2020-07-23 14:56:06 +02:00
  • 17d358f8fe Fix plot ID issues Alexander Söderberg 2020-07-23 14:11:34 +02:00
  • cfd71457d2 Clean up BlockUtil Alexander Söderberg 2020-07-19 14:49:26 +02:00
  • 87285e08dc Fix plot ID issues Alexander Söderberg 2020-07-23 14:11:34 +02:00
  • b3a63123fd Fix dependencies N0tMyFaultOG 2020-07-23 14:03:56 +02:00
  • 7fc8238fb0 Remove construction of fake player entities for offline players. Alexander Söderberg 2020-07-23 12:47:00 +02:00
  • 32a0765484 Force more compilation errors Alexander Söderberg 2020-07-22 21:09:38 +02:00
  • c5e1b87c61 Fix small issues Alexander Söderberg 2020-07-22 21:06:23 +02:00
  • 603d1ee9bb Even more N0tMyFaultOG 2020-07-22 20:38:46 +02:00
  • 86a0816b26 Merge remote-tracking branch 'origin/feature/v6/json' into feature/v6/json Alexander Söderberg 2020-07-22 19:55:03 +02:00
  • 287cb0f5ad Fix minor issues Alexander Söderberg 2020-07-22 19:54:35 +02:00
  • 3009db3aa7 Update FlagCommand.java N0tMyFaultOG 2020-07-22 19:47:58 +02:00
  • 32e095ce15 More progress N0tMyFaultOG 2020-07-22 19:42:22 +02:00
  • 9d6744ec15 Get rid of PermHandler Alexander Söderberg 2020-07-22 12:35:48 +02:00
  • 532f2caa37 Make VaultPermissionHandler extent BukkitPermissionHandler Alexander Söderberg 2020-07-22 12:06:56 +02:00
  • da2fa24e74 Merge remote-tracking branch 'origin/v6' into v6 Alexander Söderberg 2020-07-22 12:05:50 +02:00
  • 8d04728ebc More work N0tMyFaultOG 2020-07-22 00:08:51 +02:00
  • 2aa5c276c9 Some more work done towards json N0tMyFaultOG 2020-07-21 21:39:52 +02:00
  • 6dba31b257 Start working on the new permission system Alexander Söderberg 2020-07-21 14:28:54 +02:00
  • 6040e1bb5e remove mainutil Alexander Söderberg 2020-07-21 13:14:55 +02:00
  • 20e9d13f60 Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-21 13:13:10 +02:00
  • 73e3572c72 Fix the redstone flag on roads Alexander Söderberg 2020-07-21 13:11:28 +02:00
  • 5f76cc4f7b Give ConsolePlayer the same treatment Alexander Söderberg 2020-07-21 13:07:33 +02:00
  • 186a810bf6 Bring back PAPI placeholders and raw colour formatting Alexander Söderberg 2020-07-21 13:05:40 +02:00
  • 207e56969b Remove ChunkManager#chunkTask dordsor21 2020-07-19 16:03:40 +01:00
  • 94b6a27cf3 add missing license headers dordsor21 2020-07-19 16:02:30 +01:00
  • 21693e344c Switch from MainUtil dordsor21 2020-07-19 14:37:42 +01:00
  • d2443f6de8 Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-19 14:29:08 +01:00
  • ed27422e69 Move IJ/xyz cache out of MainUItil to its own class dordsor21 2020-07-19 14:21:52 +01:00
  • d24c89405a Switch to using a Clipboard for regen in preparation for WE changes dordsor21 2020-07-19 14:17:38 +01:00
  • 2d518dfe2b Clean up BlockUtil Alexander Söderberg 2020-07-19 14:49:26 +02:00
  • f357fa74f3 Remove unused files Alexander Söderberg 2020-07-19 14:37:53 +02:00
  • 335cf5d2e9 Fix issues Alexander Söderberg 2020-07-19 14:34:42 +02:00
  • ed3eedd238 Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-19 14:32:31 +02:00
  • 23783b8b0b add deprecations Alexander Söderberg 2020-07-19 14:24:42 +02:00
  • 193054f1fc Move shit out of MainUtil into more appropriate classes Alexander Söderberg 2020-07-19 14:23:55 +02:00
  • 87a8ff742f 5.13.1 N0tMyFaultOG 2020-07-19 14:16:13 +02:00
  • 656700b5be Start reimplementing chunk generation. This would either need to be one WorldEdit operation or (preferable) WorldEdit allows Extents (including EditSessions) into the regenerate adapter method dordsor21 2020-07-19 13:12:27 +01:00
  • 3e84f3b3a4 Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-18 15:27:52 +01:00
  • 5360df6012 Add PlotRangeIterator for the many places where it'll be used. All one of them, in fact. This was not a waste of time. I am very happy I did this. This was worthwhile. Yup. Alexander Söderberg 2020-07-18 16:08:37 +02:00
  • 39fdaa367c Make PlotQuery iterable Alexander Söderberg 2020-07-18 16:18:23 +02:00
  • 7e0cdb12d7 Replace some common messages Hannes Greule 2020-07-18 15:06:51 +02:00
  • 03983e8886 Allow forcing of queues down pipelines to ensure whenDone runnables are called correctly Also remove autoQueue since it's never used and would be a bad idea dordsor21 2020-07-18 13:55:54 +01:00
  • 57af50ed49 Continue implementation of new queue system - Move ChunkCoordinatorBuild to Core - Add core ChunkCoordinator - Add Factories for ChunkCoordinator and its Builder - Reimplement refreshChunk but in WorldUtil - Allow custom Consumers to be used by the Queue when sent to the ChunkCoordinator - Start switching ChunkTasks to use the new ChunkCoordinator system - Replace GlobalBlockQueue's "empty task" system with normal sync TaskManager - Remove lombok from the queue system - Add back forceSync and chunkObject from LocalBlockQueue dordsor21 2020-07-18 12:07:56 +01:00
  • e80ade65c7 Clean up PlotId Alexander Söderberg 2020-07-18 11:05:16 +02:00
  • 4d24112ec7 Fix merge issues Alexander Söderberg 2020-07-17 23:06:40 +02:00
  • 1a269a1227 Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-17 23:05:45 +02:00
  • d077fafd29 Some random bukkitutil/worldutil improvements Alexander Söderberg 2020-07-17 22:58:10 +02:00
  • 5478e70576 Fix some more captions Alexander Söderberg 2020-07-17 21:46:15 +02:00
  • 66b94ab9f1 Start switching to WorldEdit Worlds dordsor21 2020-07-17 17:21:32 +01:00
  • 74c6fc954e Merge branch 'v6' into feature/v6/pipeline-queue dordsor21 2020-07-17 17:16:49 +01:00
  • 22bd2eb238 Super minor issues from previous merges Alexander Söderberg 2020-07-17 18:06:38 +02:00
  • 2a72f274c9 Fix failed merge Alexander Söderberg 2020-07-17 18:00:08 +02:00
  • 3a1b56494a Merge branch 'v6' into feature/v6/json Alexander Söderberg 2020-07-17 17:58:14 +02:00
  • 932052772c Fix edge cases for time conversion Alexander Söderberg 2020-07-17 17:51:03 +02:00
  • 43d058d3db Address comments Alexander Söderberg 2020-07-17 17:39:41 +02:00
  • 020b030667 More fixes Alexander Söderberg 2020-07-17 16:38:07 +02:00
  • 5a3eacde0b Replace method synchronization logic Alexander Söderberg 2020-07-17 16:25:57 +02:00
  • 7f412f5472 Begin work on the task system Alexander Söderberg 2020-07-15 13:18:09 +02:00
  • 33b6ef66d6 Delombok + import organisation Alexander Söderberg 2020-07-17 17:24:45 +02:00
  • 9fefe57c90 Switch to using QueueCoordinators everywhere dordsor21 2020-07-17 15:41:06 +01:00
  • ed77522c08 Add wna block setting, use WorldEdit worlds rather than Strings. dordsor21 2020-07-17 14:38:50 +01:00
  • 09aca839a8 Add back changes to ChunkCoordinator dordsor21 2020-07-17 14:00:01 +01:00
  • def9a1bcf8 begin new block setting/chunk pipeline This will ultimately replace both the GlobalBlockQueue and the ChunkTask stuff dordsor21 2020-07-17 13:22:33 +01:00