Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-21 06:41:35 +01:00
Code Issues Projects Releases Wiki Activity
3,190 Commits 7 Branches 0 Tags 108 MiB
3d44a09756
Commit Graph

1288 Commits

Author SHA1 Message Date
fullwall
d17ca61e6e Implement event, and use it to link hologram display entity. unify some old tracker implementations. WIP implementation of unified player linking 2023-10-30 01:37:00 +08:00
fullwall
751e2a28ac Misc small changes 2023-10-29 02:09:08 +08:00
fullwall
dd247a9ee0 Fix typo causing npcs to be damageable 2023-10-24 23:10:03 +08:00
fullwall
8efde00530 Re-mounting interaction entities seems to work 2023-10-23 02:07:59 +08:00
fullwall
e889476e7b Fixes for hologram display entities 2023-10-23 01:58:06 +08:00
fullwall
8f6e65c4e2 Fix animation trigger incorrectly registered 2023-10-22 00:33:40 +08:00
fullwall
33dce9174b Add bossbar provider 2023-10-20 22:08:37 +08:00
fullwall
9d9b3c4349 Micro optimisations 2023-10-15 21:57:13 +08:00
fullwall
ad89e9aa83 Make more async friendly 2023-10-15 20:53:01 +08:00
fullwall
ea34a18ebe Remove viaversion from pom 2023-10-15 11:47:20 +08:00
fullwall
ae4495207e remove result message for commands by default 2023-10-14 22:41:10 +08:00
fullwall
7f6b6df4cf Bump deps 
Del
 2023-10-13 21:50:23 +08:00
fullwall
5829ffcc07 Commit util method 2023-10-09 01:05:41 +08:00
fullwall
ba74dc8ad2 Fix /npc shop edit multiline item descriptions 2023-10-09 00:54:31 +08:00
fullwall
9bb88a6db1 Add some debug for navigation, add --at arg for /npc playsound 2023-10-03 23:06:25 +08:00
fullwall
e98cfd5b8e Set MobType immediately 2023-10-01 22:50:30 +08:00
fullwall
28916be24e More reflection to avoid accessing record type 2023-10-01 17:32:13 +08:00
fullwall
05048be1f7 Initial 1.20.2 update 2023-10-01 17:27:38 +08:00
fullwall
97ddf858ce Full update 2023-09-20 22:05:05 +08:00
fullwall
c994315060 MOdified method signature 2023-09-20 21:52:53 +08:00
fullwall
fe0d058160 Null check knockback event 2023-09-20 20:31:05 +08:00
fullwall
7b650a2af4 Fix incorrect onDespawn usage leaking teams in ScoreboardTrait 2023-09-18 18:39:23 +08:00
fullwall
3e7b465a04 Fix guided waypoint provider neighbour generation 2023-09-17 22:56:33 +08:00
fullwall
2931f95939 Add some scoreboard team debug 2023-09-13 23:00:02 +08:00
fullwall
bec532952a Update guided help 2023-09-13 00:44:07 +08:00
fullwall
8ca064aab3 Switch text back to manual loading due to type error 2023-09-12 01:33:11 +08:00
fullwall
28a3e0bf79 Simplify getAllNPCs() implementation 2023-09-03 23:41:38 +08:00
fullwall
7c0eb422a6 Tweak PlayerDeathEvent to not use npc.getEntity() 2023-09-01 02:36:04 +08:00
fullwall
6c80f7554d Remove outdated text editor translations 2023-09-01 02:04:06 +08:00
fullwall
63ef3cdc73 Remove /npc scoreboard and make scoreboard trait just persist entity tags 2023-08-28 01:57:30 +08:00
fullwall
db6058bbd0 Reimplement hologram display entities using interaction entities as suggested by Owen1212055 2023-08-28 01:49:14 +08:00
fullwall
60e169f352 Remove imports 2023-08-14 01:32:27 +08:00
fullwall
82d841ad62 Add missing imports 2023-08-14 01:31:34 +08:00
Brando!
e0fa527c25
Add option to have players purchase items only once (#3037) 
* Add option to have players purchase items only once

* In the process of updating `purchases` to be a map

NOT FINISHED!

* Fix bug in previous commit. Thanks for the help fullwall!
 2023-08-14 01:20:41 +08:00
fullwall
3e374b7289 Add messag 2023-08-14 01:16:58 +08:00
fullwall
a9f79deb2d Add /npc skin -e 2023-08-14 01:16:00 +08:00
fullwall
cae7c9abd9 Fix typo 2023-08-12 21:09:46 +08:00
fullwall
438a671b4d Set profile fetch result 2023-08-12 20:46:18 +08:00
fullwall
583e633228 Catch exceptions in ProfileFetchThread 2023-08-12 20:42:45 +08:00
fullwall
eeea90ea05 Fix manual --track in bossbar trait 2023-08-12 20:31:15 +08:00
fullwall
47d9330a56 StraightLineTargetingStrategy should update target 2023-08-09 21:23:22 +08:00
fullwall
6ff59a1fe0 Bugfix for rotationtrait 2023-08-08 22:44:23 +08:00
fullwall
8719c1f182 Implement new metadata 2023-08-06 18:57:42 +08:00
fullwall
6fd768992a Tweak remove --owner 2023-08-01 23:18:45 +08:00
fullwall
c0230e07e7 Remove debug 2023-08-01 23:11:50 +08:00
fullwall
5138dc615a Small fixes 2023-07-29 23:26:02 +08:00
fullwall
71ad607732 Add some skinTrait debug 2023-07-23 22:42:00 +08:00
fullwall
5003f0c367 Fix <item> hologram, cancel EntityTameEvent for protected NPCs 2023-07-19 23:53:43 +08:00
fullwall
9082f6ac3f Don't use boss bossbar if null 2023-07-15 23:02:02 +08:00
fullwall
e1a4f88126 Work around a paper API mismatch with spigot 2023-07-12 01:08:54 +08:00
fullwall
29a98c8da6 Charge costs directly 2023-07-11 11:25:26 +08:00
fullwall
b7bda87394 Fix poms 2023-07-11 03:45:32 +08:00
fullwall
33571d7eec Disable fallback location for wander 2023-07-11 00:40:29 +08:00
fullwall
d0abea6dd5 Implement getters and setters in wander waypoint goal 2023-07-10 02:58:23 +08:00
fullwall
0e9dcf210f Fix typo from /npc list change 2023-07-09 20:40:48 +08:00
fullwall
a9fea94c61 Catch protocollib errors again, change /npc list to use uuid rather than id 2023-07-09 18:57:30 +08:00
fullwall
ea00df6c7e Don't clear the page items unless there's a page there 2023-07-09 00:02:47 +08:00
fullwall
e7de8d6b53 Make worldguard region a setter to clear the cache 2023-07-08 23:11:48 +08:00
fullwall
ecc5239899 Set pathfind on wander spawn 2023-07-08 21:52:24 +08:00
fullwall
8c35505444 Give slightly more leeway for lookclose range 2023-07-08 21:43:23 +08:00
fullwall
94a798ca45 Enforce controllable permission for players 2023-07-08 21:40:32 +08:00
fullwall
c0be235538 Send an extra headrotation packet since spigot resets head rotation now, make some protocollib methods async, bump avoid-water costs by one block 2023-07-08 21:36:04 +08:00
fullwall
5b5811cfea Fix /npc item parsing behavior 2023-07-04 00:45:37 +08:00
fullwall
d39c198956 Cache old waypoint providers in memory to enable switching 2023-07-04 00:16:22 +08:00
fullwall
58655fc45e Implement wander worldguard region change 2023-07-03 02:12:40 +08:00
fullwall
eb1af71429 ClickRedirectTrait should also check for PlayerFilter on init 2023-06-26 00:39:33 +08:00
fullwall
952c18efde Make shop actions ordered 2023-06-26 00:37:07 +08:00
fullwall
a06b2ed2c6 Pushed missing file 2023-06-26 00:13:20 +08:00
fullwall
46f4444c10 Implement new PlayerFilter method, async-friendly chunk trackers 2023-06-25 21:58:09 +08:00
Brando!
a2d7284fbc
individual costs for NPC commands (#3033) 
* Add individual cost option for `/npc cmd cost`

* Add individual experience cost option for `/npc cmd expcost`

* Begin individual item cost impl

Everything is finished except for saving/loading the items. I just need to figure out how to properly save the ItemStacks either by using the DataKey or by somehow figuring out how to use the Persist API

* Add item saving and loading

* Add cost and exp cost to describe message

* Remove debug/todo things

* Make `-1` default to allow for cost-free commands

* Update `describe` function to have proper space alignment

* Change names of cost values

* Update parameter name
 2023-06-25 13:41:19 +08:00
fullwall
053438bfbf Add /npc bossbar --viewpermission 2023-06-25 00:25:49 +08:00
fullwall
f3b7ba0e52 ClickRedirectTrait is respected for playerfilter 2023-06-20 23:29:36 +08:00
fullwall
6d5f881b91 Tweak /npc sound command to allow arbitrary sounds (as long as they are registered with NMS) 2023-06-19 20:55:16 +08:00
fullwall
ad023c3bd5 Various bugfixes including for /npc sitting, item action, event listening to push/knockback events 2023-06-19 20:39:50 +08:00
fullwall
c001b65988 More item tweaks 2023-06-19 02:27:13 +08:00
fullwall
ad442e4bd3 ItemAction tweak 2023-06-19 01:44:29 +08:00
fullwall
cd550e634e Cancel use item twice 2023-06-18 17:53:47 +08:00
fullwall
a551fe4890 Add /npc setequipment 2023-06-18 17:23:55 +08:00
Brando!
da2ab6324a
npc hologram margintop/marginbottom command (#3027) 
* Add `npc hologram margin` command

* Revert `mb` and `mt` declaration change.

* Change `margin` to `margintop` and `marginbottom`

Also fix mistake in usage syntax.
 2023-06-18 00:08:44 +08:00
fullwall
3e263bed97 Modernise runTriggers 2023-06-17 00:15:19 +08:00
fullwall
b1b7f17861 Try again 2023-06-15 00:33:11 +08:00
fullwall
b51785b754 Bump some dependency versions 2023-06-15 00:32:01 +08:00
fullwall
6750225f5d Update protocollib version 2023-06-15 00:13:09 +08:00
fullwall
8e4c38ded1 Implement /npc knockback 2023-06-14 23:47:42 +08:00
fullwall
e64816eda2 Make triggers prompt pause the pathfinding to prevent difficult states to problem solve. Add CommandTrigger. 2023-06-14 23:45:36 +08:00
fullwall
2082a98a79 Add shift click to edit special shop page items 2023-06-14 23:19:05 +08:00
fullwall
a7c6195b37 1.20.1 (nil changes) 2023-06-13 20:26:05 +08:00
fullwall
8b107587e7 QoL fix for npc players with death messages 2023-06-13 20:13:21 +08:00
fullwall
9704f1493c Implement new push / knockback events 2023-06-12 21:20:51 +08:00
fullwall
ff736ebd4b Backport some Llama controllable changes, minor camel fixes 2023-06-12 09:47:03 +08:00
fullwall
3702b019cd Make some create flags require admin 2023-06-11 17:06:22 +08:00
fullwall
64b200837d Add sittable support to /npc sitting, disable array pooling for now 2023-06-11 16:51:28 +08:00
fullwall
ddc938a38c Simplify mount trait 2023-06-11 16:00:33 +08:00
fullwall
9facad1b2a Initial 1.20 update 2023-06-08 22:37:50 +08:00
fullwall
e3e1aed1b0 Add isSneaking to SneakTrait 2023-06-08 20:57:44 +08:00
fullwall
2466677cc3 Add workaround for async entity tracker server forks 2023-06-08 20:53:38 +08:00
fullwall
0473887462 Fix path debugging for mc pathfinder 2023-06-01 23:51:05 +08:00
fullwall
eb10e76ca7 Continue to update paused in lookclose 2023-05-29 23:40:53 +08:00
fullwall
735a947475 Backwards compatibility fix for ItemAction 2023-05-29 01:08:48 +08:00
fullwall
5dc627ab49 Fix copypasta issue in /npc metadata set 2023-05-24 23:28:05 +08:00
fullwall
ee77512185 Add new setting for global shop view permission, add insert after selected waypoint functionality 2023-05-20 17:10:53 +08:00
fullwall
7e3f628b55 Replace ChatColor import 2023-05-16 23:46:33 +08:00
fullwall
513a6c7cce Use new duration option 2023-05-14 22:54:45 +08:00
fullwall
eb63c91a38 Add permission node to plugin.yml 2023-05-14 21:13:16 +08:00
fullwall
308690841a Add some basic command permissions to ignore errors 2023-05-14 21:09:37 +08:00
fullwall
8df17d2f02 WIP fix for tp cross-world 2023-05-12 01:09:45 +08:00
fullwall
46ccf0895f Implement playerfilter change 2023-05-11 21:40:01 +08:00
fullwall
fa9b99a05b WIP implementation of shop item copying using shift click 2023-05-07 22:43:05 +08:00
fullwall
55bda3ac13 npc shop changes 2023-05-07 22:03:20 +08:00
fullwall
deb9976a9b Inline eventlistenchunk 2023-05-07 20:09:37 +08:00
fullwall
147a07f413 Simplify wander 2023-05-06 23:10:29 +08:00
fullwall
35af40a9c5 Implement wander changes 2023-05-06 23:06:33 +08:00
fullwall
232f5247f1 Rework /npc follow toggling 2023-05-06 00:45:57 +08:00
fullwall
3bd406a742 PermissionAction should be global operations 2023-05-05 00:08:43 +08:00
fullwall
d9a4a3e5e2 Make /npc rotate use arm swing to fix rotation 2023-05-04 01:51:48 +08:00
fullwall
71ab3d8dd2 Don't set body yaw if headonly true 2023-05-02 02:28:23 +08:00
fullwall
3fe2d189f4 Fix skinlayers trait, add /npc lookclose --linkedbody 2023-05-02 00:50:50 +08:00
fullwall
64bec7eb40 Add exception logging for reflection when debugging 2023-05-02 00:10:07 +08:00
fullwall
8b1550dc43 Adjust RotationTrait head yaw cone 2023-05-01 00:18:57 +08:00
fullwall
dd440ed653 Remove guava Function usage, track script extensions 2023-04-30 01:13:53 +08:00
fullwall
406bea7b53 Trial removing arm swing in favour of manual position packets 2023-04-30 00:18:24 +08:00
fullwall
6a8300980d Fix an issue with /npc metadata and enum keys, set lookclose target to null if not enabled 2023-04-27 18:55:42 +08:00
fullwall
7db27a3eee Add stuck action setting 2023-04-26 00:15:26 +08:00
fullwall
19b917e905 Add unstable API for hologramtrait 2023-04-25 23:56:50 +08:00
fullwall
7a345b2962 Convert /npc pose to flag yaw / pitch arguments 2023-04-25 23:29:22 +08:00
fullwall
17c3329b19 Allow extra arg for /npc pose 2023-04-25 23:12:55 +08:00
fullwall
e2e4b2a0c1 Implement basic stat tracking for traits 2023-04-25 23:11:20 +08:00
fullwall
c1ae7aa0d3 Add /npc pose [yaw] [pitch] --save [name] 2023-04-25 22:23:41 +08:00
fullwall
283a2a3381 Change EntityDamageEvent listenerpriority to lowest 2023-04-24 21:27:15 +08:00
fullwall
85c91780c9 Adjust hologram name NPC implementation 2023-04-24 17:55:04 +08:00
fullwall
ed4f43a5aa Implement player placeholders in hologram names 2023-04-23 23:46:20 +08:00
fullwall
798ec1c3aa Fix wrong registry name creation for /npc create 2023-04-23 16:38:12 +08:00
fullwall
b53955ebb2 Remove VocalChord/SpeechFactory 2023-04-20 23:42:48 +08:00
fullwall
78c025a061 Fix wrong command ID for /npc command remove 2023-04-20 22:00:26 +08:00
fullwall
fe0abfdcb5 Add /npc panda -e 2023-04-20 01:35:44 +08:00
fullwall
71ecc7086b Implement playerfilter api 2023-04-17 01:47:32 +08:00
fullwall
5bb73b3a95 Partially restore uuid version reset code 2023-04-16 02:21:30 +08:00
fullwall
f895169e92 Remove debug code 2023-04-11 01:02:24 +08:00
fullwall
fcb0c7d953 Tweak how equipment updates are detected 2023-04-11 00:10:45 +08:00
fullwall
155ffe522e Add missing NMSBridge default impl 2023-04-08 14:43:03 +08:00
fullwall
ef34ed2837 Fix a scoreboard issue when renaming NPCs 2023-04-08 14:24:16 +08:00
fullwall
4f9506ce7a Add /npc painting 2023-04-08 02:35:55 +08:00
fullwall
163499f219 Add shift click max buy/sell to the shop trait 2023-04-06 02:35:08 +08:00
fullwall
d6ffa085a0 Add guided waypoint msg 2023-04-03 22:40:04 +08:00
fullwall
a82e39fbbc Fix guided waypoint provider 2023-04-03 01:32:14 +08:00
fullwall
e0a66ff67b Fix /npc follow <NPC ID> 2023-03-31 00:11:29 +08:00
fullwall
f88c2771a8 Use armor stands for holograms 2023-03-30 23:13:38 +08:00
fullwall
efff2ff9ab Add /npc enderdragon --destroywalls 2023-03-29 20:01:07 +08:00
fullwall
e8a5a1ceb4 Fix mineskin API calls and hologram name height 2023-03-29 18:32:47 +08:00
fullwall
f29780874d Add /npc skin --file 2023-03-29 01:28:08 +08:00