Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-13 22:25:44 +01:00
Code Issues Projects Releases Wiki Activity
2,931 Commits 6 Branches 0 Tags 106 MiB
64bec7eb40
Commit Graph

1071 Commits

Author SHA1 Message Date
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
fullwall
a70ca4fe8b Update pom.xml 2022-09-08 03:21:27 +08:00
fullwall
f2021cd60e Use @Arg in NPCCommands 2022-09-08 03:01:39 +08:00
fullwall
a316a87711 Implement new flag command API, fix hologram line display 2022-09-07 02:11:07 +08:00
fullwall
61b71cb2d2 Add temporary hologram lines 2022-09-04 00:22:20 +08:00
fullwall
6270985989 Make text edit check argument length, move some code into ProfileFetchThread 2022-09-03 15:39:08 +08:00
fullwall
479e350f12 Compare center 2022-08-22 22:51:33 +08:00
fullwall
6b2440d8c3 Change logging 2022-08-22 22:30:51 +08:00
fullwall
0a0f4a8c63 Add debugging command 2022-08-22 22:10:48 +08:00
fullwall
a1da32d1d6 Change default delay setting 2022-08-21 21:34:53 +08:00
fullwall
30b2f5a8e2 Placeholders for speech bubbles, /npc command errormsg 2022-08-21 16:15:40 +08:00
fullwall
9592de5716 Sets.difference is not working in 1.8.8 2022-08-17 23:33:29 +08:00
fullwall
8bee4c8b80 Fixes to hologramtrait 2022-08-12 13:48:54 +08:00
fullwall
0645934c1e Clamp yaw properly for smoothrotationtrait 2022-08-09 23:07:48 +08:00
fullwall
4bb3ee8845 Bump to 1.19.2 2022-08-06 10:20:03 +08:00
fullwall
7bbe87be0b Move EntitiesLoadEvent to a separate file 2022-08-05 12:01:07 +08:00
fullwall
0afeb4792d Use EntitiesLoadEvent instead of ChunkLoadEvent, other minor fixes 2022-08-04 11:48:48 +08:00
fullwall
3409b06b93 Fix zombievillager error in 1.8 2022-08-02 23:06:56 +08:00
fullwall
967fea021e Use placeholders in /npc shop 2022-07-29 09:15:15 +08:00
fullwall
8b488ddc61 Fix spaces in server names 2022-07-29 02:03:16 +08:00
fullwall
7f993e2c1d Cleanup and use new method 2022-07-28 23:34:03 +08:00
fullwall
748af9f9bd Implement new methods 2022-07-28 15:43:24 +08:00
fullwall
e9d197eab0 Simplify navigator interface 2022-07-28 15:36:16 +08:00
fullwall
7b3c0c8126 Add /npc allay 2022-07-28 06:36:51 +08:00
fullwall
2aa6b860c4 1.19.1 update 2022-07-28 05:03:30 +08:00
fullwall
70d7cfa6f2 Work on npc shop; now possible to buy and sell 2022-07-27 17:05:52 +08:00
fullwall
1f9931fdff Use setClickHandler 2022-07-27 03:40:46 +08:00
fullwall
d888d13955 Switch back to sending scoreboards on change only 2022-07-27 03:27:49 +08:00
fullwall
2b88eb7aaa All NPCs should send scoreboard teams on player join 2022-07-27 01:29:10 +08:00
fullwall
048f0877c8 Temporarily update scoreboard every time 2022-07-27 00:19:47 +08:00
fullwall
9cf7779ff4 Work on /npc shop, QoL tweaks, fix scoreboard team removal 2022-07-26 23:50:28 +08:00
fullwall
5dbc578fd2 Integrate team creation directly into ScoreboardTrait 2022-07-25 23:14:00 +08:00
fullwall
71bc177298 Try scanning the online players less 2022-07-25 15:53:34 +08:00
fullwall
acca94d911 Aggressively send scoreboard teams 2022-07-25 15:40:39 +08:00
fullwall
ac92bafa71 Null check command charged 2022-07-25 00:23:44 +08:00
fullwall
d5db707d58 Update /npc metadata remove message 2022-07-23 02:01:57 +08:00
fullwall
a90c319563 Don't try to swim if gravity disabled 2022-07-22 21:15:24 +08:00
fullwall
d7ce79fe85 Update maven pom plugin version and trial a microoptimisation for players 2022-07-22 15:22:55 +08:00
fullwall
b89073d4c1 Attempt to fix title updating 2022-07-22 00:43:40 +08:00
fullwall
8c004fc122 Work on /npc shop 2022-07-21 23:13:51 +08:00
fullwall
805cd35f90 Wrong ChatColor import 2022-07-17 23:01:59 +08:00
fullwall
e783423f84 Fix a minor bug with /npc shop 2022-07-17 23:01:00 +08:00
fullwall
9c9199d2a1 Make llamatrait 1.12 compatible, work on /npc shop 2022-07-17 22:29:11 +08:00
fullwall
34aea6553c Manually prevent clientside prediction for allay pickups, prevent item pickups on protected mobs 2022-07-17 02:47:36 +08:00
fullwall
674a621cf3 Fix itemcost, don't execute commands if cost not reached 2022-07-17 02:28:17 +08:00
Mitsu
bbf5ca9ebb
Update messages_fr.properties (#2831) 
I have added a French translation that I made for my server
 2022-07-17 02:11:42 +08:00
fullwall
a81d8db87d Null check bossbar style 2022-07-17 02:10:38 +08:00
fullwall
58b53174c8 Fix itemframes, add /npc debug command, don't lowercase skin names early in skintrait 2022-07-15 10:21:44 +08:00
fullwall
f462fe9218 Add null check 2022-07-13 20:10:42 +08:00
fullwall
4dfac9c62d Remove team unregistering to ScoreboardTrait, add scoreboard-teams send ticks to assist with a possible scoreboard conflict 2022-07-13 20:09:21 +08:00
fullwall
3fcf8931f7 Consolidate versioned trait commands 2022-07-10 01:53:34 +08:00
fullwall
aaca31740b QoL changes to /npc list /npc command 2022-07-10 01:17:26 +08:00
fullwall
665e19d472 Check for online players in /npc remove --owner 2022-07-08 22:15:48 +08:00
fullwall
98c2d3492a Add /npc piglin --dancing 2022-07-07 23:34:15 +08:00
fullwall
35dd4078dd Fix double updating bee/bat/ghast AI 2022-07-05 19:13:31 +08:00
fullwall
dfbdfaed09 Add entity spawn wait ticks settings for debugging purposes 2022-07-03 14:39:45 +08:00
fullwall
55f8a1f75c Fix say in /npc command 2022-06-30 16:10:16 +08:00
fullwall
58da8489e4 Use new builder style WanderGoal 2022-06-29 18:14:47 +08:00
fullwall
d7617637b7 Fix SmoothRotationTrait rotating towards 0 on respawn 2022-06-26 23:28:38 +08:00
fullwall
c6a1aba5bd Fix smoothrotation calculations 2022-06-26 14:19:27 +08:00
fullwall
9ce4a9020f Rework /npc text 2022-06-26 13:57:51 +08:00
fullwall
e54e4434cc Speech bubbles persist 2022-06-26 11:47:40 +08:00
fullwall
5cd35fdcea Make --id check less specific 2022-06-25 18:15:19 +08:00
fullwall
8c4b72c5f8 Modify blockbreaker distance calculations 2022-06-25 17:01:02 +08:00
fullwall
659a5b17ad Match npc commands slightly more safely 2022-06-25 16:47:48 +08:00
fullwall
1cdeda5d5d Add 'say' option to /npc command and add the NPC id for /npc commands 2022-06-25 16:47:13 +08:00
fullwall
36cbef81a7 Fix dropstrait, allow player hurt/death sound to be set 2022-06-24 12:43:23 +08:00
fullwall
9906c44ff3 Cancel navigation once in range 2022-06-22 12:37:02 +08:00
fullwall
bf532728d1 Set destination even for non NPCs 2022-06-22 12:35:01 +08:00
fullwall
1ca256753b Target the blockbreaker block directly and adjust pathDistanceMargin to get close enough to it 2022-06-22 12:18:06 +08:00
fullwall
d0366bccde Measure block breaker distance from center block 2022-06-22 12:13:10 +08:00
fullwall
318596c715 Adjust minecraft pathfinder to look less frequently and pathfind closer to destination in players 2022-06-21 23:52:25 +08:00
fullwall
cd652db2f7 Use new methods 2022-06-19 12:05:18 +08:00
fullwall
6a15bc2d5a Implement sittrait 2022-06-14 21:39:20 +08:00
fullwall
4768a4f76a Add SitTrait for NPCs 2022-06-14 21:38:15 +08:00
fullwall
138aaacbcf Fix null check in age 2022-06-14 21:26:18 +08:00
fullwall
2e2a83779e Implement anvil GUI 2022-06-12 19:49:21 +08:00
fullwall
21f3a7755a Implement new API 2022-06-12 01:37:38 +08:00
fullwall
53d8e96c8d Fix tadpoles, /npc goat, don't build unnecessary modules 2022-06-11 15:17:17 +08:00
fullwall
aaf870372c Remove entity if world failed to add 2022-06-11 12:41:24 +08:00
fullwall
d98833ca66 Remove exception printing for now 2022-06-08 22:57:35 +08:00
fullwall
4c3224efad Remove eclipse compiler from poms 2022-06-08 14:07:33 +08:00
fullwall
2a6a69d8be Including mockito prevents testing deps from shading 2022-06-08 12:48:58 +08:00
fullwall
d94e83b74c Attempt to update to 1.19 2022-06-08 11:58:22 +08:00
fullwall
7f1bb5b2b7 Fix yaw/pitch calculations for face towards yaw/pitch 2022-06-05 15:43:46 +08:00
fullwall
70c4ab6da8 Fix npcdamageentity event default cancelled 2022-06-05 15:12:16 +08:00
fullwall
3ff64493cd Fixed commandtrait output 2022-06-02 20:15:45 +08:00
fullwall
a38baa48b5 Use single use behavior for /npc blockbreak 2022-05-31 22:47:00 +08:00
fullwall
1c459c3da2 Unify getCurrentDestination semantics 2022-05-26 22:07:26 +08:00
fullwall
487d587675 Apply nogravity immediately on spawn and on usage 2022-05-26 15:58:54 +08:00
fullwall
8a68b575a2 Reduce skin update distance 2022-05-22 17:39:47 +08:00
fullwall
6d1e848d89 Add debug when sending skins to players 2022-05-22 17:36:48 +08:00
fullwall
8292a952cd Fix /npc leashable 2022-05-08 21:57:15 +08:00
fullwall
8979fda81d Update to use new method 2022-05-06 21:45:49 +08:00
fullwall
47dbd881f5 Use new API 2022-05-06 21:25:12 +08:00
fullwall
c880ef8bc5 wp dt is now a toggle 2022-05-03 20:08:16 +08:00
fullwall
7092926784 Require at least one trait to remove 2022-05-01 19:48:30 +08:00
fullwall
e4cd18b6e4 Implement new breaker API 2022-04-30 05:58:47 +08:00
fullwall
97da84c192 Fix gcooldown not working when used in isolation 2022-04-30 02:39:26 +08:00
fullwall
234c99b2af Refactor rotation more 2022-04-25 22:29:26 +08:00
fullwall
8694603c85 Refactor PlayerControllerLook into RotationTrait 2022-04-25 02:22:39 +08:00
fullwall
324d94a21f Rename /npc pose --save to /npc pose --mirror and add /npc pose --save to save the current NPC pose 2022-04-24 19:22:55 +08:00
fullwall
3685d33980 Add /npc bossbar --track and fix equipment caching logic 2022-04-23 13:42:48 +08:00
fullwall
48798ff9b3 Abs diff 2022-04-21 15:27:46 +08:00
fullwall
e82eb76aba Update holograms if height changes 2022-04-21 15:25:57 +08:00
fullwall
96ba80edd8 Persist use new pathfinder if set manually 2022-04-20 11:55:15 +08:00
fullwall
46a6c64cf5 Convert skin name mismatch exception to debug instead 2022-04-19 21:55:41 +08:00
fullwall
2e886cf8ed Make version incompatible message suggest upgrading Minecraft 2022-04-19 18:16:48 +08:00
fullwall
0a6225a8a3 Fix /npc remove --world 2022-04-19 18:13:40 +08:00
fullwall
719f115f0c Add /npc panimate (does not persist animations as yet) 2022-04-19 15:50:52 +08:00
fullwall
e88a7b6278 Clean up Util 2022-04-19 15:33:52 +08:00