Commit Graph

1454 Commits

Author SHA1 Message Date
7f29b5d1e8 ComponentPreset inventory to json 2020-08-07 13:22:10 +01:00
6012705e95 Implement Permission#format to replace the CaptionUtility#format method 2020-08-07 12:12:16 +01:00
21a97863ac Refactor Captions to Permission, reimplement message list in debug command 2020-08-07 11:53:32 +01:00
50cfecb3fd Several minor progress. Couple of bigger (inboxes and help) 2020-08-07 11:08:03 +01:00
1461804039 Remove last reference to PlotMessage in Core 2020-08-07 10:20:11 +01:00
6970dfa5f8 More json progress 2020-08-07 02:53:05 +02:00
18f630ba15 Bit more json 2020-08-06 14:06:19 +01:00
f68eb9c778 update plot list 2020-08-06 13:36:15 +01:00
4a960d9f2c update pagination to new json 2020-08-06 12:23:47 +01:00
f1e3902fea Several more progress 2020-08-05 11:48:10 +01:00
41a623a643 More work towards json 2020-08-04 19:01:25 +02:00
d3fe1d3b2b Fix plot info, sign usage in Plot.class 2020-08-04 15:07:07 +01:00
3fd3baaa47 Making progress on messages 2020-08-03 23:59:16 +02:00
4fb590889a Remove all permission related errors 2020-07-24 17:44:47 +02:00
115ca903b2 Remove unused stuff 2020-07-24 17:36:48 +02:00
e90170a384 Merge remote-tracking branch 'origin/v6' into feature/v6/json
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
#	Core/pom.xml
#	Core/src/main/java/com/plotsquared/core/PlotAPI.java
#	Core/src/main/java/com/plotsquared/core/PlotPlatform.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/command/Claim.java
#	Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java
#	Core/src/main/java/com/plotsquared/core/command/Command.java
#	Core/src/main/java/com/plotsquared/core/command/CommandCaller.java
#	Core/src/main/java/com/plotsquared/core/command/DebugExec.java
#	Core/src/main/java/com/plotsquared/core/command/Grant.java
#	Core/src/main/java/com/plotsquared/core/command/Inbox.java
#	Core/src/main/java/com/plotsquared/core/command/Load.java
#	Core/src/main/java/com/plotsquared/core/command/Save.java
#	Core/src/main/java/com/plotsquared/core/command/Setup.java
#	Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java
#	Core/src/main/java/com/plotsquared/core/util/BlockUtil.java
#	Core/src/main/java/com/plotsquared/core/util/Permissions.java
2020-07-24 17:28:52 +02:00
af44fe74ff Add namespaces for translations 2020-07-24 17:19:25 +02:00
d7a49e3316 This is not my fault 2020-07-24 14:08:40 +02:00
f53a8d3b06 Fix permissionprofile initialisation order 2020-07-24 14:02:49 +02:00
97a2ccbfe0 make sure the PlayerMetaDataKeys keys are loaded 2020-07-24 13:32:46 +02:00
dc1f669a1f Remove permission caching 2020-07-24 13:01:38 +02:00
fe7a57b2b7 Remove mainutil cache workaround 2020-07-24 12:48:45 +02:00
c9c62a1083 Remove dumb permission mess. 2020-07-24 12:44:04 +02:00
5608c5a901 Merge branch 'v6' into features/v6/permissions
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java
#	Core/src/main/java/com/plotsquared/core/util/Permissions.java
2020-07-24 12:20:45 +02:00
722361aedb Implement suggestions from PR comments 2020-07-24 12:15:25 +02:00
d2f40612f4 Switch from Class<T> to TypeLiteral, and implement managed meta access for temporary meta 2020-07-24 12:15:25 +02:00
6a63e5bb51 Expose the player's lock repository 2020-07-24 12:15:25 +02:00
ad40ab7e1e Grant plots to the correct player 2020-07-24 12:15:25 +02:00
05ce67fbfe Trick the compiler 2020-07-24 12:15:25 +02:00
555860cf83 Add managed persistent meta data access 2020-07-24 12:15:25 +02:00
2575787bd0 Add LockRepository 2020-07-24 12:15:25 +02:00
a1da452c41 Fix build properly 2020-07-23 18:09:37 +01:00
a7de76d150 Fix dependencies 2020-07-23 15:03:57 +02:00
2154e237ff Remove construction of fake player entities for offline players. 2020-07-23 15:03:57 +02:00
5fda3e9765 Get rid of PermHandler 2020-07-23 15:03:57 +02:00
bfbb81030f Start working on the new permission system 2020-07-23 15:03:57 +02:00
87285e08dc Fix plot ID issues 2020-07-23 14:11:34 +02:00
32a0765484 Force more compilation errors 2020-07-22 21:09:38 +02:00
c5e1b87c61 Fix small issues 2020-07-22 21:06:23 +02:00
603d1ee9bb Even more
Ok seriously, I stop here
2020-07-22 20:38:46 +02:00
86a0816b26 Merge remote-tracking branch 'origin/feature/v6/json' into feature/v6/json 2020-07-22 19:55:03 +02:00
287cb0f5ad Fix minor issues 2020-07-22 19:54:35 +02:00
3009db3aa7 Update FlagCommand.java 2020-07-22 19:47:58 +02:00
32e095ce15 More progress
I need a break, if something is missing, feel free to exchange that. K thx 🙏
2020-07-22 19:42:22 +02:00
da2fa24e74 Merge remote-tracking branch 'origin/v6' into v6 2020-07-22 12:05:50 +02:00
8d04728ebc More work 2020-07-22 00:08:51 +02:00
2aa5c276c9 Some more work done towards json 2020-07-21 21:39:52 +02:00
6040e1bb5e remove mainutil 2020-07-21 13:14:55 +02:00
20e9d13f60 Merge branch 'v6' into feature/v6/json
# Conflicts:
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/OperationUtil.java
2020-07-21 13:13:10 +02:00
5f76cc4f7b Give ConsolePlayer the same treatment 2020-07-21 13:07:33 +02:00