Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-29 22:23:59 +01:00
Code Issues Projects Releases Wiki Activity
3,067 Commits 6 Branches 0 Tags 106 MiB
9d9b3c4349
Commit Graph

1181 Commits

Author SHA1 Message Date
fullwall
48a30c56ff Allow /npc follow to work with entities rather than just players 2023-03-18 23:28:33 +08:00
fullwall
14e90b11b3 Fix hologram trait on older minecraft version 2023-03-18 02:00:56 +08:00
fullwall
aef7d42327 Add new remapping 2023-03-18 01:36:53 +08:00
fullwall
46633409c3 Adjust command costs so that they are only charged after checking that the command can be used, adjust itemcost algorithm 2023-03-16 22:01:04 +08:00
fullwall
b35c815629 Fix no such method error on severely outdated minecraft versions, add InteractionController 2023-03-15 18:44:30 +08:00
fullwall
299f781308 Initial 1.19.4 update. Of note: sniffers are known to not be working 2023-03-15 03:37:05 +08:00
fullwall
e6f8a47f36 Add config comments, remove subplugins, remove NPCEnderTeleportEvent 2023-03-15 01:41:24 +08:00
fullwall
6a19f19aa9 Allow /npc select to work with blocks 2023-03-14 20:55:33 +08:00
fullwall
6d03d3ce62 Add PAPI nearest npc id placeholder 2023-03-14 20:40:02 +08:00
fullwall
2d8ea825a2 Fix time conversion code 2023-03-14 14:31:07 +08:00
fullwall
b9f10a2e0c Fix Java 8 compat 2023-03-13 21:46:52 +08:00
fullwall
f8c8b8af6e One more... 2023-03-13 02:44:21 +08:00
fullwall
4053795588 Fix a few more invalid ticks 2023-03-13 02:41:43 +08:00
fullwall
bd8d5a7f74 Fix NumberFormatException in latest builds 2023-03-13 02:26:13 +08:00
fullwall
af519a3af4 Remove debug 2023-03-13 02:11:48 +08:00
fullwall
74a861142b Add durations to settings, allow falling distance to be set for all mobs 2023-03-12 22:30:19 +08:00
fullwall
a29e7cb8e7 Fix compile error 2023-03-08 01:14:19 +08:00
fullwall
b02a3d8766 Implement player filtering, replace all entity trackers, compatibility update for async entity tracking 2023-03-07 23:58:03 +08:00
fullwall
ebcc9c1e8e Distribute license in jar 2023-03-06 00:48:31 +08:00
fullwall
248e9de2e6 Fix NPCs constantly trying to swim, relicense to LGPL 2023-03-06 00:28:44 +08:00
fullwall
cb6f8be7fc Add /npc packet 2023-03-02 23:08:03 +08:00
fullwall
c22916bb70 Use new method 2023-03-01 23:05:25 +08:00
fullwall
ef9220b5fd When-player-within rather than when_player_within 2023-03-01 00:21:08 +08:00
fullwall
fc66909ae0 isNavigating() considers paused status 2023-02-27 22:05:19 +08:00
fullwall
8235ed160f PICKUP_ITEMS now defaults to false rather than isProtected 2023-02-26 15:51:59 +08:00
fullwall
960e1036b4 Minor formatting change 2023-02-23 23:58:23 +08:00
fullwall
63f1013d46 Try fix controllable / sit trait issues 2023-02-23 23:52:27 +08:00
fullwall
5087ffb4bf Must be spawned for /npc equip 2023-02-22 23:17:16 +08:00
fullwall
d76841c319 Try harder to pause wander goal during editor 2023-02-22 01:03:41 +08:00
fullwall
585df3f696 Add simple /npc pausepathfinding command 2023-02-21 23:59:33 +08:00
fullwall
e140883287 Fix minor typo 2023-02-21 23:06:11 +08:00
fullwall
d35dcb8ae7 Trial teleporting players directly without calling PlayerTeleportEvent 2023-02-21 22:56:50 +08:00
fullwall
679873c7d4 Added a name update delay 2023-02-20 23:34:12 +08:00
fullwall
420005c6aa Add isPushable implementations for 1.17-1.19 2023-02-19 00:55:16 +08:00
fullwall
6f754d2594 Add basic /wp remove command 2023-02-18 15:24:09 +08:00
fullwall
c31624fba3 Ensure boss bar progress between 0 and 1 2023-02-18 01:23:42 +08:00
fullwall
27991c94f0 Fix commandaction grant not respecting op/server 2023-02-16 00:27:04 +08:00
fullwall
a09a54d4da Use teleportcause 2023-02-15 07:19:20 +08:00
fullwall
22e1821f24 Cancel item despawns for item NPCs 2023-02-15 06:02:00 +08:00
fullwall
dc384e42f8 Add some debug to shops saving 2023-02-15 05:36:51 +08:00
fullwall
e9c989bc55 Add /npc panda -n -r for rolling and sneezing 2023-02-14 23:26:21 +08:00
fullwall
9bf3194710 Add per-line margin to hologram lines for items 2023-02-14 23:19:45 +08:00
fullwall
f64e28f2e8 Simplify boundingbox api 2023-02-14 00:30:03 +08:00
fullwall
871c7c0259 More code refactoring 2023-02-13 22:20:13 +08:00
fullwall
3ae6c29493 Fix npcselector getBlockData error 2023-02-13 20:34:00 +08:00
fullwall
8f43ca70e5 Fix bug in item parsing for holograms, allow arbitrary bounding boxes for BoundingBoxTrait, attempt to unify common code across NMS implementations 2023-02-13 20:32:20 +08:00
fullwall
b0a2c51883 Fix /npc mirror with uuid change 2023-02-11 22:52:53 +08:00
fullwall
142931a86d Simplify skinupdatetracker 2023-02-11 10:47:31 +08:00
fullwall
dddabd13b8 Actually not an off by one 2023-02-10 23:44:54 +08:00
fullwall
0f6842991b Fix off by one command nUsed 2023-02-10 23:42:57 +08:00
fullwall
41ca21a131 Check world first in skin trackers 2023-02-10 21:13:32 +08:00
fullwall
fe4434de91 Don't clear uuid version 2023-02-09 21:09:53 +08:00
fullwall
7244834e34 Make NPCs more likely to swim, add speed setting in water 2023-02-08 22:07:15 +08:00
fullwall
bbfbc767dc Reorder npc update() 2023-02-08 21:06:10 +08:00
fullwall
8ba9d2ceb6 Reorder update() method 2023-02-06 23:28:00 +08:00
fullwall
504a38317c Add --distance argument 2023-02-06 00:43:42 +08:00
fullwall
a61befbdcc Add basic /npc home command 2023-02-06 00:40:01 +08:00
fullwall
ba04e4b05f Fix phantom bugs 2023-02-05 15:25:29 +08:00
fullwall
2a64529bb1 Further tweaks to using item animations 2023-02-03 00:24:02 +08:00
fullwall
f759c81763 Check NPC spawned 2023-02-02 18:48:27 +08:00
fullwall
b21af8dd6e Trial delaying scoreboard removal on death 2023-02-01 23:15:28 +08:00
fullwall
3b00f7718b Refactoring, add debug for shop trait onRemove(), add at argument for PlayerAnimation waypoint trigger 2023-01-31 22:50:25 +08:00
fullwall
c258ad1b9a Send entity teleport packet instead of look only for packet sessions, remove from tablist 2023-01-29 22:15:32 +08:00
fullwall
e828782be6 Snowman performance change 2023-01-27 01:54:13 +08:00
fullwall
126d4f9519 Fix /npc text talk delay message 2023-01-19 21:42:22 +08:00
fullwall
52955febf1 Add null check for A* finder, clone itemstacks in drop trait 2023-01-19 18:11:42 +08:00
fullwall
72c136e97a Add /npc aggressive 2023-01-16 23:54:21 +08:00
fullwall
367cbd330f Replace NPC names in Placeholders rather than Chat trait 2023-01-16 23:39:59 +08:00
fullwall
8ad3a14b7c Check papi/plib enabled 2023-01-07 23:08:37 +08:00
fullwall
eed9170519 Add op/server toggles to shop 2023-01-06 23:34:47 +08:00
fullwall
12f507f89c Try not hooking into viaversion for protocol version 2023-01-06 07:45:13 +08:00
fullwall
aee977ebb3 Fix some 1.8.8 shop compat 2023-01-06 00:41:47 +08:00
fullwall
ffac34f734 Fix player ticking 2023-01-05 22:51:42 +08:00
fullwall
98c5c48c23 Implement new API 2023-01-05 20:05:15 +08:00
fullwall
d9e7ec4ca3 More 1.8.8 compatibility 2023-01-04 23:17:45 +08:00
fullwall
ffef42efb7 Packet NPCs now properly spawn, fix NPE in new pathfinder, fix 1.8.8 compatibility with /npc shop 2023-01-04 23:02:33 +08:00
fullwall
e21681fa26 Add /npc hitbox, WIP packet NPCs 2023-01-03 20:55:27 +08:00
fullwall
6165f4cb12 Null checks in scoreboard trait 2023-01-02 13:20:29 +08:00
fullwall
aa59e15002 Fix legacy skull texture loading 2023-01-02 12:54:19 +08:00
fullwall
fda3c9d5c9 Make default text cooldown range higher 2023-01-02 11:57:27 +08:00
fullwall
433121979c Add a random text delay default setting of 20-40ticks 2023-01-02 08:37:27 +08:00
fullwall
402095c946 Don't reload locationlookup 2023-01-02 00:49:39 +08:00
fullwall
b38a66dbfb Add /npc lookclose --headonly 2023-01-02 00:24:11 +08:00
fullwall
83040ed525 Add basic cost/result placeholders. 2023-01-01 23:28:21 +08:00
fullwall
fa5cdb9211 Cancel location lookup taskg 2023-01-01 21:33:25 +08:00
fullwall
36feecdc2b Fix sneak animation 2023-01-01 20:44:17 +08:00
fullwall
c706b17848 Refresh locationLookup on /citizens reload 2023-01-01 20:01:44 +08:00
fullwall
9103823ebb Fix per-player lookclose 2023-01-01 18:43:41 +08:00
fullwall
b4280103c1 Simplify PlayerUpdateTask 2023-01-01 18:15:10 +08:00
fullwall
b8e79b20cf Implement API, check for invalid Player references, remove Text min/max-cooldown settings and fix Text delay/right click cancellations, make SitTrait work with npc#teleport 2023-01-01 15:26:35 +08:00
fullwall
a669a8a256 Workaround protocollib not supported listed boolean, fix dolphins moving while on ground, add /npc bossbar --range, add /npc create --nameplate --temporaryticks 2022-12-29 23:26:02 +08:00
fullwall
cdb75dbc96 Add warning for npc select within commands 2022-12-27 19:57:48 +08:00
fullwall
027e4d27a9 Simplify command block logic 2022-12-27 19:24:42 +08:00
fullwall
ef49f0762e Set all connected command block sender selected 2022-12-27 19:20:18 +08:00
fullwall
b8a608ec5c Add /npc lookclose --targetnpcs 2022-12-27 14:22:27 +08:00
fullwall
4590193673 Upgrade skull saving 2022-12-27 13:07:12 +08:00
fullwall
550c72a234 getHand() removal 2022-12-26 20:07:16 +08:00
fullwall
36671daeae Check parsed name length 2022-12-26 00:20:21 +08:00
fullwall
27603afdf4 Add /npc mirror for skins 2022-12-25 01:37:54 +08:00
fullwall
886d83eeb4 Use new API 2022-12-24 21:43:08 +08:00
fullwall
8c10fe8b18 Use per player metadata API 2022-12-24 19:53:59 +08:00
fullwall
0e2dd23096 Use names consistently 2022-12-24 13:36:24 +08:00
fullwall
4c958b5e7c Fix custom name components in 1.8.8-1.12.2, 2022-12-22 23:17:28 +08:00
fullwall
45d7a072a1 Catch IllegalArgumentException from ProtocolLib 2022-12-21 18:43:54 +08:00
fullwall
1a102e7d1c Clear previousGlowingCOlor on despawn 2022-12-21 06:47:04 +08:00
fullwall
aa61f6b88c Catch exception from protocollib 2022-12-20 21:27:01 +08:00
fullwall
e7e2efd518 Allow /npc shop to be performed without an NPC selected 2022-12-19 01:44:16 +08:00
fullwall
f5dcdb8a1d Move settings around 2022-12-19 00:48:50 +08:00
fullwall
8d202aa988 Implement metadata 2022-12-19 00:36:53 +08:00
fullwall
e90096eebe Add /npc spellcast 2022-12-18 23:21:08 +08:00
fullwall
3ee17c6dae Fix /npc camel and /npc llama 2022-12-18 22:18:12 +08:00
fullwall
44e988b7d7 Remove debugging code 2022-12-18 15:43:40 +08:00
fullwall
f9def3fe6a Don't send per-player rotation packets as often 2022-12-18 15:39:48 +08:00
fullwall
6ced30fa20 Remove some unused messages 2022-12-18 13:55:31 +08:00
fullwall
5a82133200 Switch to use new method 2022-12-18 13:50:19 +08:00
fullwall
c6e7ce65f5 Add /npc camel, minor code cleanup 2022-12-18 13:25:08 +08:00
fullwall
249074c7bc Fix /npc text pages, add via version backcompat 2022-12-17 11:22:14 +08:00
fullwall
8f29e6ff73 Plugins seem to mess with netty versioning so just always create metadata 2022-12-14 23:31:25 +08:00
fullwall
505b61df17 Send page /npc t ext 2022-12-12 23:51:19 +08:00
fullwall
b78312b8f0 Fix two typos 2022-12-12 07:28:12 +08:00
fullwall
ab0c706da5 Add perplayer lookclose, rework templates, add message to send on click to shop trait, remove profiler call in player navigation which broke compatibility with certain plugins 2022-12-11 21:28:39 +08:00
fullwall
5254f65945 Add camel to horse types 2022-12-10 15:56:55 +08:00
fullwall
dffccdd2d4 Only send entity metadata if dirty 2022-12-10 14:59:27 +08:00
fullwall
2034ca6bf0 Add CommandAction 2022-12-10 13:42:07 +08:00
fullwall
57d27f39ee 1.8.8 compat 2022-12-10 13:23:53 +08:00
fullwall
139158cb48 Initial update to 1.19.3 2022-12-08 23:21:09 +08:00
fullwall
2681e05307 Clone items in ItemAction 2022-12-06 23:56:22 +08:00
fullwall
d34fd48533 Make lookAtFunction use packets for yaw, tweak API further 2022-12-06 23:50:11 +08:00
fullwall
6533cdccf8 Remove shop on trait remove 2022-12-06 22:54:27 +08:00
fullwall
97c2417c49 Create ShopsTrait properly 2022-12-05 22:32:51 +08:00
fullwall
a74e40eb1d Default to using channel metadata 2022-12-04 03:24:57 +08:00
fullwall
06230800b9 Move minecraft placeholder cache to AbstractNPC 2022-12-04 01:38:36 +08:00
fullwall
9da5ac7a37 Minimise netty version 2022-12-04 01:00:50 +08:00
fullwall
fef03ea6da Use new lookup api 2022-12-04 00:59:16 +08:00
fullwall
6fec436f55 Remove some global state from shops 2022-12-03 21:32:58 +08:00
fullwall
c935caa140 Remove some dead code 2022-12-03 21:02:59 +08:00
fullwall
ac387b2de4 Add item args to /npc create and /npc item, remove Nameable reference 2022-12-03 20:50:06 +08:00
fullwall
ede598cc9b Fix some issues with ShopTrait item costs/results and add NBT filter API. Adjust /npc item to be more flexible. 2022-12-03 18:21:46 +08:00
fullwall
c68a7ad82f Null check shop name and make default shop name 2022-12-03 00:20:04 +08:00
fullwall
b00ef080c0 Adjust ChannelMetadata Netty version 2022-12-01 22:39:26 +08:00
fullwall
8a65d4a5a0 Add way to set custom name directly 2022-11-30 06:13:55 +08:00
fullwall
d8a4c73f58 Make /npc shop open on right click with named shops too 2022-11-30 05:35:31 +08:00
fullwall
b8050199f1 Add per-player rotation API 2022-11-28 23:10:50 +08:00
fullwall
f93266135b Cast to player in MoneyAction 2022-11-27 00:32:05 +08:00
fullwall
b28d689cbd Add onRemove for cleanup code 2022-11-23 19:13:17 +08:00
fullwall
5408e7059c Fix colors in /npc horse 2022-11-23 19:03:24 +08:00
fullwall
0e97f2f23f Import deps for javadoc purposes 2022-11-17 18:52:32 +08:00
fullwall
bfbc2415a5 Enforce collidability even if not explicitly set 2022-11-16 21:58:05 +08:00
fullwall
9d0028541e Set sleep status every tick for now (only necessary on 1.14 and below) 2022-11-15 21:30:23 +08:00
fullwall
d9c55b97b0 Implement cancellable variant 2022-11-14 23:53:14 +08:00
fullwall
868c7a463d Check for outdated versions of minecraft in SleepTrait 2022-11-14 18:02:52 +08:00
fullwall
12faab3b53 Fix NPE in /npc lookclose 2022-11-14 00:14:28 +08:00
fullwall
adc4e0cbb0 Have to use basic logger until libraries loaded 2022-11-13 19:32:02 +08:00
fullwall
a3780e4c4f Adjust lookclose 2022-11-13 16:02:17 +08:00
fullwall
7d2a222143 Trial using runtime maven dependencies to reduce jar size 2022-11-13 12:50:45 +08:00
fullwall
06b1568e07 Clear sleeping status on despawn, add some messages in /npc hurt for non-damageable entities 2022-11-12 21:51:15 +08:00
fullwall
c02391ccc3 Subtle behaviour change to make players remove themselves from tablist on death 2022-11-12 16:17:06 +08:00
fullwall
102630a5e0 Pass wander pause through to wander goal, fix SleepTrait 2022-11-12 12:51:40 +08:00
fullwall
ce1f306b08 Make /npc pickupitems persistent 2022-11-11 22:41:34 +08:00
fullwall
35245a580b Fix /npc pickupitems message and for players, null casing for /npc panimate START_SLEEPING 2022-11-10 21:31:32 +08:00
fullwall
73689cf9c2 Widen navigating definition 2022-11-07 23:30:39 +08:00
fullwall
cda8aceb5d Minor changes 2022-11-06 23:19:08 +08:00
fullwall
c03160e73e Streamline default vocal chord in preparation for speech API simplification 2022-10-29 22:47:46 +08:00
fullwall
372d209be1 More sane highlight colour handling, be flexible with name length if placeholder immediately replaces 2022-10-26 16:59:11 +08:00
fullwall
891b480bea Add requireUndamaged to item cost 2022-10-26 15:44:03 +08:00
fullwall
a91f0cd2ee Fix /npc text remove clickable not working, make /npc shop item action work on material alone for now 2022-10-26 12:33:23 +08:00
fullwall
ebe1d27986 More robust way of checking EntityTransformEvent existence 2022-10-26 01:25:30 +08:00
fullwall
f8cdbc4515 Add SleepTrait 2022-10-25 17:07:11 +08:00
fullwall
353699fe80 Add arglength checking for /npc command clearerror 2022-10-25 15:58:57 +08:00
fullwall
bbf7ca2f98 Add /npc command clearerror 2022-10-24 22:01:40 +08:00
fullwall
f6d7ebe809 Add STOP_ELYTRA PlayerAnimation, add a right click option to /npc shop to avoid having to make a command for it 2022-10-22 10:42:44 +08:00
fullwall
84e59407e4 Switch to entities unload event for new paper chunkloading system 2022-10-19 01:47:07 +08:00
fullwall
b88dbf2e50 Convert command describe to minimessage 2022-10-17 16:56:52 +08:00
fullwall
d04ea81225 WIP fix for NPCs not despawning properly 2022-10-17 01:17:32 +08:00
fullwall
2b19473832 Rework HologramTrait implementation 2022-10-16 10:41:34 +08:00
fullwall
dee442e935 Adjust /npc text to consider delay in right click as well 2022-10-15 20:40:05 +08:00
fullwall
5a5bc1349d Update /npc text editor to minimessage 2022-10-15 20:37:27 +08:00
fullwall
b3aa62a060 Fix /npc text incorrect formatting 2022-10-15 19:32:25 +08:00
fullwall
856b40b890 Add /npc speak --range 2022-10-15 16:59:09 +08:00
fullwall
1213c5462c Remove <reset> from text 2022-10-13 11:08:16 +08:00
fullwall
b686323cd7 Add reset to NPC text 2022-10-09 19:59:15 +08:00
fullwall
91feca62c7 Add /npc jump and /npc wander 2022-10-08 11:11:40 +08:00
fullwall
eb5adf9667 Convert messages to use minimessage 2022-10-05 22:27:09 +08:00
fullwall
fc83c28085 Consolidate sit implementation, persist sit location to avoid sinking over successive restarts 2022-10-04 23:42:23 +08:00
fullwall
f11f79fe21 Merge branch 'master' of github.com:CitizensDev/Citizens2 2022-10-04 22:18:20 +08:00
fullwall
d11fd91d4a STOP_USE_ITEM not supported 2022-10-04 22:18:05 +08:00
Peridot
2a4f222c3e
Don't use google commons in Util#requiresNettyChannelMetadata (#2907) 
* Improve Util#requiresNettyChannelMetadata

* Fix comment

* Don't use google commons in Util#requiresNettyChannelMetadata
 2022-10-03 09:12:39 +08:00
fullwall
838aa3019b Minor changes 2022-10-02 23:10:23 +08:00
Peridot
bfc7a540cf
Improve Util#requiresNettyChannelMetadata - support newer netty version (#2901) 
* Improve Util#requiresNettyChannelMetadata

* Fix comment
 2022-10-02 02:44:16 +08:00
md5nake
d29781e0b5
Make pathfinder max visited nodes configurable (#2902) 2022-10-02 02:44:06 +08:00
fullwall
20423c0375 Add some basic permissions checks 2022-09-15 02:35:42 +08:00
fullwall
d241cdb370 Update trait commands 2022-09-15 02:28:07 +08:00
fullwall
03e757d411 Fix wither arrow shield typo 2022-09-15 01:01:48 +08:00
fullwall
12b60fcdf2 Fix EntityTransformEvent on old versions of minecraft 2022-09-13 00:56:03 +08:00
fullwall
1977e146d0 Try to deploy parent pom 2022-09-10 10:08:33 +08:00
fullwall
d64cfda050 Update poms for new repo 2022-09-09 19:05:23 +08:00
fullwall
b6563dba8d Block entity transformations if protected 2022-09-09 18:13:01 +08:00
fullwall
eed8457b6d Make /npc list slightly more intuitive 2022-09-09 05:43:25 +08:00
fullwall
e65ac15b6c Add deploy phase 2022-09-09 03:44:45 +08:00
fullwall
1ccc2eae6d Adjust /npc wither charged -> invulnerable, add arrow-shield 2022-09-08 13:28:14 +08:00