Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-25 03:55:30 +01:00
Code Issues Projects Releases Wiki Activity
3,403 Commits 6 Branches 0 Tags 106 MiB
2c25291676
Commit Graph

1452 Commits

Author SHA1 Message Date
fullwall
245d76a78c Add /npc wolf --variant and /npc armadillo 2024-04-24 06:04:02 +08:00
fullwall
70c40dcb22 Initial 1.20.5 update. TODO: refactor NBT to remove JNBT and work with trees instead 2024-04-24 05:34:31 +08:00
fullwall
5533961066 EXPERIMENTAL: trial not updating scoreboard every tick 2024-04-22 17:40:12 +08:00
fullwall
b09a8bae56 Null check hologram entity 2024-04-22 16:14:54 +08:00
fullwall
77d34b53e6 Fix inconsistency in canNavigate where flyable/living status was not respected 2024-04-21 23:24:37 +08:00
fullwall
59531a9bc8 Add /npc fox --pouncing/faceplanted/interested 2024-04-20 14:14:01 +08:00
fullwall
6368cb379e Fix to hologram, add /npc itemframe 2024-04-19 15:48:33 +08:00
fullwall
1b32596c37 Allow colors in money item shop editor 2024-04-15 22:30:53 +08:00
fullwall
d3c0205d9e Bugfix TextDisplayVehicleRenderer 2024-04-15 20:21:26 +08:00
fullwall
ccce76d9f0 Add some interaction debug for holograms 2024-04-15 15:47:59 +08:00
fullwall
b0ba7b2062 Further bugfixes for item holograms 2024-04-15 13:08:02 +08:00
fullwall
fe5a088f7a Correct item hologram offset as well 2024-04-15 12:17:01 +08:00
fullwall
1e368e71a5 Fix two bugs with new hologram trait impl 2024-04-15 11:14:24 +08:00
fullwall
9fb4b11ce7 Add back getNameEntity internal method to fix denizen compat 2024-04-15 01:56:10 +08:00
fullwall
3d44a09756 Armorstand renderer should incorporate entity height 2024-04-15 01:48:17 +08:00
fullwall
cd7f3366ab Rework hologram rendering (WIP: text displays not yet functional) 2024-04-15 01:42:09 +08:00
fullwall
fcd2908723 Try parsing commands early in /npc rename to avoid index out of bounds 2024-04-06 12:41:56 +08:00
fullwall
9729e356a5 Add /npc wither --invulnerableticks command 2024-03-31 23:10:01 +08:00
fullwall
8cf37b0ecc Give item holograms the same tracking range as the base hologram 2024-03-27 16:18:11 +08:00
fullwall
321088784c Check player world in lookclose 2024-03-25 00:39:47 +08:00
fullwall
8f538721cc Modify items in ItemAction 2024-03-24 00:53:47 +08:00
fullwall
8696a5709e Use new API 2024-03-23 23:46:09 +08:00
fullwall
45fff0f420 Fix incorrectly inverted canSee check breaking getNearbyPlayers 2024-03-23 20:47:11 +08:00
fullwall
4090a625e9 Remove debug message 2024-03-23 20:38:31 +08:00
fullwall
c1b7a99bd8 Push InventoryMultiplexer type down to allow for inventory refreshing 2024-03-18 23:36:42 +08:00
fullwall
70ac5c9193 Make /npc shop delete (name) output a message, send head yaw packet to just the viewer rather than cached nearby players, bump translations 2024-03-16 23:10:12 +08:00
fullwall
a9b85961a9 Null check entity in death event 2024-03-12 23:48:13 +08:00
fullwall
3c314c1d3e Add a helper method to NPCShopAction to save the inventory properly 2024-03-11 22:44:40 +08:00
fullwall
c683b752a5 Rewrite itemaction to use the provided item array 2024-03-11 20:37:30 +08:00
fullwall
40a60fbc8f Remove push override as Paper broke source compatibility 2024-03-10 11:52:38 +08:00
fullwall
6642923b49 Fix /npc passive flipped message 2024-03-08 12:16:31 +08:00
fullwall
e757344d41 Another attempt to avoid charging costs inappropriately 2024-03-07 01:59:47 +08:00
fullwall
b6e6a66eb3 Update translations 2024-03-05 10:17:23 +08:00
fullwall
8672b4b997 Revert previous change. Fix commandtrait charging for a cost of 0 2024-03-05 10:00:42 +08:00
fullwall
8be9da5f04 Trial manually calling aiStep for players with /npc ai turned on 2024-03-05 09:47:24 +08:00
fullwall
903ba91b4c Delete old template code 2024-03-04 20:46:36 +08:00
fullwall
249fa6675d Added missing spawned check 2024-03-04 02:33:31 +08:00
fullwall
143e642802 Add missing NMS commit 2024-03-03 23:15:50 +08:00
fullwall
ed117eac96 Try to detect sneaking state onAttach for SneakTrait 2024-03-03 23:14:11 +08:00
fullwall
b6f5184192 Further command trait cleanup of /npc command clearerrors and added /npc command forgetplayer 2024-03-03 18:49:45 +08:00
fullwall
473135c7fb Rework individual command cost to be a value flag rather than an argument, reduce public-facing command ID exposure 2024-03-03 18:20:09 +08:00
fullwall
40c6b4b85e Add toggle trait command back 2024-03-03 14:57:51 +08:00
fullwall
0491f5ed20 Remove using_templates metric 2024-03-03 01:39:21 +08:00
fullwall
92066dde7b Fix non-english locales, multiplex shop inventories for better trader UI experience 2024-03-03 01:27:23 +08:00
fullwall
716bc4730b Fix JSON 2024-03-02 22:37:24 +08:00
fullwall
2c501409ab Add untranslated help keys 2024-03-02 22:36:07 +08:00
fullwall
52bb50fd8c Add missing description messages, and prompt users to join Discord to contribute to translations 2024-03-02 22:29:05 +08:00
fullwall
b629eab8be Translation bump 2024-03-02 22:09:07 +08:00
fullwall
88bfd3baa1 Update translations 2024-03-01 22:31:10 +08:00
fullwall
992acc5c56 Null check death message 2024-03-01 19:20:29 +08:00
fullwall
81bc83d15a Utilise new API 2024-03-01 01:03:30 +08:00
fullwall
3a5b13c170 Cleanup, change packet tracker removal method (needs checking for geyser debug message) 2024-02-29 13:10:44 +08:00
fullwall
3869e310a2 Trial protocollib change suggested in #3097 2024-02-28 01:57:23 +08:00
fullwall
5a33c5cdbf Add korean translation kindly contributed by mangchi57 2024-02-28 01:04:32 +08:00
fullwall
3c8429aa6d Nullcheck getShopType() 2024-02-25 01:07:30 +08:00
fullwall
a8f37635f8 Make trader view work, with limitations 2024-02-19 05:50:16 +08:00
fullwall
8864d89791 Preliminary trader view support for /npc shop 2024-02-19 05:41:48 +08:00
fullwall
f498391c1f Replace $/{ in shop placeholders 2024-02-18 21:06:02 +08:00
fullwall
19f08c4607 Attempt to replace the entity tracker without sending packets for initial spawn. EXPERIMENTAL: needs testing. Also add /npc armorstand --headpose 2024-02-18 00:44:38 +08:00
fullwall
4d1b3ee357 Remove STORAGE_TYPE setting, fix a few setting comments 2024-02-11 01:13:49 +08:00
fullwall
e60bb33508 Add new metric 2024-02-11 00:57:37 +08:00
fullwall
d557be5f35 Use new pathfinder should be loaded 2024-02-10 23:58:04 +08:00
fullwall
66708ac314 Add /npc command cycle 2024-02-05 00:05:51 +08:00
fullwall
deded77f34 Add a setNavigationType NMS method 2024-01-29 22:24:43 +08:00
fullwall
a5fea96114 Cancel follow navigation if parameters are changed 2024-01-29 20:20:26 +08:00
fullwall
95d678312b Add a 1 second delay for failed chair spawns 2024-01-29 02:07:51 +08:00
fullwall
44e68147ab Fix hand recording 2024-01-26 23:43:50 +08:00
fullwall
c3791d162f Fix for commands with multiple preconditions 2024-01-26 19:48:53 +08:00
fullwall
dbd9cdf1f1 Fix hand tracking 2024-01-26 18:55:11 +08:00
fullwall
af728ec4b1 Set hologram tracking range to the same as the npc's 2024-01-21 15:47:00 +08:00
fullwall
647215e8dd Fixes to per-player name holograms 2024-01-18 17:22:22 +08:00
fullwall
4529f7dc39 Use new method 2024-01-18 15:37:37 +08:00
fullwall
1f1b0debbe Despawn NPCs on chunk borders 2024-01-13 22:48:27 +08:00
fullwall
107e3b3296 More robust backwards compat 2024-01-13 14:05:57 +08:00
fullwall
cd25930373 Fix canSee(Entity) not existing on old minecraft versions 2024-01-13 14:02:12 +08:00
fullwall
8ca8c14f89 Reset packetrotationsession yaw to physical yaw on removal 2024-01-07 17:06:55 +08:00
fullwall
1416557ce3 Fix protocollib detection for /npc mirror 2024-01-02 23:31:02 +08:00
fullwall
007c92f797 Consolidate body yaw implementations 2023-12-22 15:59:20 +08:00
fullwall
d005c228ff Move PlayerShearEntityEvent handling to EventListen to cover for snowman 2023-12-22 04:15:00 +08:00
fullwall
4e4112d531 Bump adventure dependency 2023-12-22 02:21:18 +08:00
fullwall
ea2df83ca5 Avoid NPE for rotationtrait removal 2023-12-14 21:06:50 +08:00
fullwall
ccf4f6b085 Fix guided waypoint provider 2023-12-11 23:39:34 +08:00
fullwall
06b0e2d800 Don't set body yaw with head yaw 2023-12-11 23:17:34 +08:00
fullwall
7d2b50be40 Missed messages file 2023-12-03 16:08:44 +08:00
fullwall
c81aa299fb Add /npc snowman -f to form snow 2023-12-03 12:33:46 +08:00
fullwall
e4fba63408 Fix template#getTemplates() 2023-12-03 01:16:34 +08:00
fullwall
49036e1967 Support FollowTrait on 1.8.8 2023-12-02 14:55:37 +08:00
fullwall
a1e4255771 Redecompile 1.20.2 minecraft pathfinder 2023-12-01 23:43:58 +08:00
fullwall
7a676e3420 Default sneaking in sneaktrait to true 2023-12-01 22:42:43 +08:00
fullwall
578b8d38c1 Remove metadata clearing code 2023-11-29 22:53:42 +08:00
fullwall
86b76e81fd Trial COW fix 2023-11-28 23:12:14 +08:00
fullwall
ffedf7c81f Add a component parse step to shop title 2023-11-26 02:28:45 +08:00
fullwall
7073bebc17 Move hologram metadata check to CitizensNPC 2023-11-25 04:20:43 +08:00
fullwall
258ac20a21 Adjust packet rotation 2023-11-21 23:30:11 +08:00
fullwall
3f47f5df90 Bump phtree version 2023-11-18 00:50:35 +08:00
fullwall
8693de6b5f Avoid copying 2023-11-17 01:59:18 +08:00
fullwall
145d6ce616 Trial a iteration performance tradeoff for PlayerUpdateTask 2023-11-17 01:33:46 +08:00
fullwall
3221019dda Update french and hebrew translations, thanks to Mulot and penguin for providing translations 2023-11-16 23:38:00 +08:00
fullwall
81cce42a93 Implement new event 2023-11-15 22:39:09 +08:00
fullwall
ad0f5caac5 Fix playeranimation on outdated minecraft versions 2023-11-07 23:43:48 +08:00
fullwall
15ee73f944 Add using templates metric 2023-11-05 21:04:01 +08:00
fullwall
07fb13c284 Add /npc hologram viewrange, add /npc playerfilter --applywithin, work towards auto-hologram-sneak 2023-11-05 20:58:37 +08:00
fullwall
de885501cd Allow next page and previous page items to be set 2023-11-05 17:41:18 +08:00
fullwall
998484718f Only certain items require repeated use animations 2023-11-05 15:35:48 +08:00
fullwall
840ab30108 Don't cancel NPC - NPC mount events, NMS#mount uses optional boolean flag to force mount. /npc blockbreaker adds to NPC inventory by default 2023-11-05 02:03:57 +08:00
fullwall
a42812c4c4 Add /npc skin -s 2023-11-04 12:47:07 +08:00
fullwall
33955027ff Check destination world matches NPC world in guided AI goal 2023-11-03 01:50:21 +08:00
fullwall
4705cff283 Convert translations to json files 2023-11-03 01:45:12 +08:00
fullwall
8e4b9ce60d Record language rather than locale string 2023-11-01 23:58:49 +08:00
fullwall
24e7df6a18 Add delay to hologram linking 2023-11-01 22:29:47 +08:00
fullwall
1a8246bb88 Implement JumpPowerSupplier metadata 2023-11-01 01:49:01 +08:00
fullwall
2736f4ab53 Add sitting height offset correction check 2023-11-01 01:24:23 +08:00
fullwall
483b6565cd Adjust hologram mount strategy 2023-11-01 00:58:28 +08:00
fullwall
401e34a4a3 Refactor PlayerAnimation to accept a collection of players rather than radius. Rework NPCLinkToPlayerEvent handling 2023-10-30 22:49:02 +08:00
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