Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-17 08:05:17 +01:00
Code Issues Projects Releases Wiki Activity
2,772 Commits 6 Branches 0 Tags 106 MiB
83040ed525
Commit Graph

948 Commits

Author SHA1 Message Date
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
fullwall
f358f6fb2e Work towards lookclose rotation speed changing 2022-04-19 15:20:59 +08:00
fullwall
733064c18d Add /npc remove --world 2022-04-19 11:54:05 +08:00
fullwall
f4e3786514 Fix bug and add a method to simplify name showing 2022-04-17 14:51:05 +08:00
fullwall
da76924041 HologramTrait should have nameplate visible 2022-04-17 13:37:29 +08:00
fullwall
166aa3d739 Add /trc options to the base /npc lookclose command 2022-04-16 22:49:20 +08:00
fullwall
b0f1290b58 Change EAT_FOOD to LEAVE_BED in 1.18/17 2022-04-13 11:14:37 +08:00
fullwall
2a5b62aae0 Remove bossbar on despawn 2022-04-09 11:41:12 +08:00
fullwall
af08a77b8e Add customisation of initial no damage ticks 2022-04-06 12:39:58 +08:00
fullwall
41b1ef57c9 Fix spawned debug message 2022-04-03 11:48:42 +08:00
fullwall
2c8b1864d8 Null check enderdragon bossbar again, set blank hologram names to hover 2022-03-23 20:57:18 +08:00
fullwall
cd12fefe73 Trial fix to paper delaying non-player mob spawns 2022-03-16 17:13:05 +08:00
fullwall
577dc72101 Don't register MobType class 2022-03-15 10:11:36 +08:00
fullwall
4bf4dc0651 Add more info to debug messages to help with debugging 2022-03-14 04:25:42 +08:00
fullwall
b5f179628a Cap load factors consistently 2022-03-13 18:21:15 +08:00
fullwall
3a5e43b779 Cap skin packet tracker max entries 2022-03-13 18:19:32 +08:00
fullwall
9acf264db3 Unclear why right clicks are cancelled in saddle trait 2022-03-12 18:48:18 +08:00
fullwall
4a612392ed Null check bounding boxes 2022-03-12 14:27:37 +08:00
fullwall
4397aa4ae8 Barrier for /npc equip 2022-03-12 02:50:50 +08:00
fullwall
a16226ccaf Allow /npc equip to work with Striders, fix a bug with /npc look 2022-03-12 00:17:46 +08:00
fullwall
d00678b208 Null check registry on disable 2022-03-10 03:17:27 +08:00
fullwall
51cecf9cff Reify shoptrait 2022-03-04 22:14:28 +08:00
fullwall
ae36f4bd9f Add custom holder support to CustomEntityRegistry 2022-03-04 20:23:59 +08:00
fullwall
0a91768369 Update for 1.18.2 2022-03-01 20:54:08 +08:00
fullwall
dfb63084b2 Run source format 2022-02-28 17:01:59 +08:00
fullwall
89e06a3e67 Add null checks 2022-02-21 17:36:57 +08:00
fullwall
897c511757 Fix dragon yaw and make it same as rider yaw. Refactor out redundant calculation of yaw 2022-02-20 22:34:29 +08:00
fullwall
97d4c3b117 Make nonliving entities look at entities too, fix /npc lookclose with shulkers spamming noises 2022-02-20 21:56:51 +08:00
fullwall
626b6d6b42 Allow NPCs to push other entities 2022-02-20 21:21:50 +08:00
fullwall
65c7e7c28c Also make guided waypoints reset when chagned 2022-02-20 11:19:05 +08:00
fullwall
b56a1f85e1 When changes to the API waypoints list are made they should be reflected in the waypoints goal 2022-02-20 11:13:46 +08:00
fullwall
ecbab327ed Fix some bugs 2022-02-20 10:04:09 +08:00
fullwall
b1b5704145 Cancel move destination on navigation stop 2022-02-20 01:31:13 +08:00
fullwall
be019c0e83 Refactor blockbreaker, add /npc blockbreak 2022-02-20 01:05:38 +08:00
fullwall
87d27c09dc Don't reset custom name (TBC if 1.8.8 is affected) 2022-02-19 20:27:41 +08:00
fullwall
6fd6d12092 Update held item status every tick 2022-02-19 19:00:09 +08:00
fullwall
b12ae2ee66 Improve underwater pathfinding, cleanup 2022-02-19 18:26:37 +08:00
fullwall
b26dfb3d0f Implement new PathStrategy method, improve swimming navigation 2022-02-19 16:36:31 +08:00
fullwall
208b1c9ca2 Add extra info to /npc command 2022-02-19 14:36:45 +08:00
fullwall
aacff7b45a Add rudimentary /npc undo, some misc cleanup 2022-02-19 13:35:16 +08:00
fullwall
984ce6d9e7 Improve underwater mobs staying in place 2022-02-16 17:36:03 +08:00
fullwall
bf56a6dcb2 Add glowing for non-player characters, stop 1.8.8 noDamageTicks from going down too fast 2022-02-15 01:35:07 +08:00
fullwall
a29fb3059a Add /npc useitem 2022-02-15 00:57:22 +08:00
fullwall
88ab30840b Add debug to chunk load tracking, clarify charging logic in commands 2022-02-15 00:40:24 +08:00
fullwall
5bf9fdc6c9 Make NavigatorParameters#run run consistently 2022-02-13 21:39:22 +08:00
fullwall
676590f5fe Fix /npc command gcooldown 2022-02-13 17:33:44 +08:00
fullwall
3ca65765a3 Fix first time players 2022-02-11 18:46:11 +08:00
fullwall
c60085eade Waypoint markers should be spawned at the actual location now 2022-02-07 19:03:21 +08:00
fullwall
bef0f16f3b Cancel current move destination when navigator paused 2022-02-02 21:40:19 +08:00
fullwall
5c3878d2f8 Implement destinationTeleportMargin. Tweak pathfinding in an attempt to fix minecraft navigation issues with players. Expect changes. 2022-01-29 14:56:29 +08:00
fullwall
cbfd57e9c0 Fix logic error for offlineplayers 2022-01-28 18:01:54 +08:00
fullwall
927d27e09c List profession/rabbit type values using the pretty formatter 2022-01-27 10:48:52 +08:00
fullwall
7683516d62 Avoid setting NPC.COLLIDABLE_METADATA on Player NPCs 2022-01-20 17:10:52 +08:00
fullwall
b5a2c30476 Enhance /npc metadata 2022-01-17 15:45:04 +08:00
fullwall
1ee92a07ea Implement cross-world teleporting for NPCs 2022-01-16 14:05:23 +08:00
fullwall
c702e19828 Implement metadata on examiner side, relax distance margin for minecraft movement 2022-01-15 21:00:18 +08:00
fullwall
23c4779404 Set exp level for /npc command expcost rather than exp % 2022-01-12 02:01:30 +08:00
fullwall
83022b05ab Delete old code 2022-01-06 19:25:35 +08:00
fullwall
e4ca2f2922 addWaypoint method for LWP 2022-01-06 19:25:01 +08:00
fullwall
bf3bf6f776 Add /npc llama -c/b 2022-01-02 01:33:19 +08:00
fullwall
5fffa23e94 Add packet update delay setting 2022-01-02 01:22:35 +08:00
fullwall
85cf761933 Further micro-optimisation 2021-12-29 00:42:20 +08:00
fullwall
19ee0e2c19 Use metadata and track players if on the playerlist which should make mobs spawn nearby 2021-12-28 20:13:25 +08:00
fullwall
750f8e2e4c Implement helper methods and allow hologram lines to be items 2021-12-27 23:59:21 +08:00
Fredthedoggy
13f7961556
SkinTrait should only update if the Placeholder changes (#2703) 
* Make SkinTrait only update when required

* Add back skinName check
 2021-12-12 22:44:36 +08:00
fullwall
81404b4d41 Initial update to 1.18.1 2021-12-11 11:15:00 +08:00
fullwall
d1a1e7d3c2 Add placeholderAPI to pom for javadoc 2021-12-05 11:37:15 +08:00
fullwall
22fe84831e Initial 1.18 update 2021-12-01 22:56:22 +08:00
fullwall
6b30d06705 Set collidable scoreboard option and always test for placeholders in skin names 2021-11-29 20:56:13 +08:00
fullwall
3da3cc2ae8 Fix /npc villager --profession error message, more sane boundingbox calculation 2021-11-27 12:19:19 +08:00
fullwall
caff1e9ba4 As a safety measure limit maxY <0.6D 2021-11-21 22:14:01 +08:00
fullwall
61c6863d5f Trial collision box checking for pathfinding to assist with half blocks - needs testing especially with doors 2021-11-21 22:12:17 +08:00
fullwall
3d1d2ef222 Add missing flags for /npc endercrystal 2021-11-20 23:46:09 +08:00
fullwall
968f3fd68b Add /npc command hideerrors 2021-11-19 23:32:28 +08:00
fullwall
78824a341e Update existing hologram npcs in setLine 2021-11-19 23:18:24 +08:00
fullwall
b55407c696 Send npc command selector text using Citizens messaging 2021-11-18 22:47:09 +08:00
fullwall
7c8b136e1d Add /npc command expcost 2021-11-01 20:56:54 +08:00
fullwall
57adea419a Null check missing world 2021-10-30 15:53:49 +08:00
fullwall
21e924f04c equalsIgnoreCase in /npc owner 2021-10-20 18:40:49 +08:00
fullwall
25f341ef63 /npc owner [name] supported again 2021-10-13 17:56:22 +08:00
fullwall
4ecf09050a Drop owner string from Owner trait 2021-10-12 20:42:57 +08:00
fullwall
780899cbad Make /npc chunkload persistent by default 2021-10-10 23:19:43 +08:00
fullwall
18423134fa Trial fix for duplicate UUID spawned 2021-09-27 01:36:23 +08:00
fullwall
3d3de6576d Use onPreSpawn event to avoid 'FOUC' in armorstands. Fix invulnerable ticks being reduced too quickly. 2021-09-23 14:12:44 +08:00
fullwall
620cda6542 Check hologram height on spawn properly 2021-09-21 17:24:13 +08:00
fullwall
49559e26bc HologramTrait now alters hologram height if name visibility is toggled 2021-09-21 16:12:15 +08:00
fullwall
db825cce72 Add rough impl of SneakTrait 2021-09-20 20:59:54 +08:00
fullwall
004c46ab76 Extra plugin disabled check 2021-09-18 15:35:13 +08:00
fullwall
cffb0519e0 Add backcompat code 2021-09-17 20:32:41 +08:00
fullwall
cdb7cbba4a Fix chunk tickets being removed when Citizens is disabled, return correct NPC entity in HologramTrait 2021-09-17 19:04:52 +08:00
fullwall
7952600382 Add simple chunk ticketing system for pathfinding 2021-09-09 18:21:00 +08:00
fullwall
9f856f0565 Check currentLoc status 2021-09-05 14:59:19 +08:00
fullwall
11c48c4e09 Check isSpawned in HologramTrait#onSpawn 2021-08-27 17:30:27 +08:00
fullwall
14a6004adf Cap skinupdatetracker map size 2021-08-20 21:22:46 +08:00
fullwall
732716215e Make hologram trait update more frequently 2021-08-15 15:25:09 +08:00
fullwall
ef1baf5679 Add setMountedOn to MountTrait 2021-08-15 14:40:11 +08:00
fullwall
1ef3e6b56b Save to disk on dependent plugin disable 2021-07-25 08:52:03 +08:00
fullwall
9904e034fd Make plugin disable hack more conservative 2021-07-21 18:51:04 +08:00
fullwall
cfa4b5fc59 Delete unused files 2021-07-19 23:03:04 +08:00
fullwall
d4c557d5b2 Improve /npc text editor, implement speech bubbles, allow armor stands to pathfind using the A* finder, allow /npc bossbar to work on all entities 2021-07-19 23:02:41 +08:00
fullwall
55cf0c4ccd Preemptive event deregistration 2021-07-18 19:30:45 +08:00
fullwall
0ff3ee72e9 Move costs to after other precondition check 2021-07-16 23:23:57 +08:00
fullwall
bc3df49775 Work on plugin disable hack 2021-07-16 17:25:04 +08:00
fullwall
d5434b845e Adjust hologramtrait 2021-07-16 17:23:36 +08:00
fullwall
dfc48ec475 Make plugin disable hack more compatible 2021-07-15 19:41:03 +08:00
fullwall
c3a70e27ed Add workaround for spigot disable issue 2021-07-14 21:23:55 +08:00
fullwall
53e2b50ce8 Fix bugs including 1.17.1 player movement, flying yaw and stats incompatibility on 1.17.1 2021-07-10 00:47:05 +08:00
fullwall
3e1132034e Update to 1.17.1 2021-07-07 22:12:15 +08:00
fullwall
ba51211020 Merge branch 'master' of github.com:CitizensDev/Citizens2 into master 2021-07-05 23:39:24 +08:00
fullwall
3a50ad5d85 Add /npc axolotl 2021-07-05 23:39:15 +08:00
SiderealArt
597648276a
Add Traditional Chinese translation (#2585) 2021-07-05 23:39:00 +08:00
SirBlobman
15583711b6
Update pom.xml (#2591) 
This will remove warnings relating to `maven-default-http-blocker` and JitPack attempting to resolve SNAPSHOT dependencies.
 2021-07-05 23:29:03 +08:00
fullwall
ef4d746aee Add debug for hologram trait 2021-07-04 13:07:15 +08:00
fullwall
5306a68b6a Fix target location for mc navigator 2021-06-29 00:10:24 +08:00
fullwall
9c8d26e73b Use new waterlogged methods 2021-06-25 17:01:18 +08:00
fullwall
d2f0d7ec20 Cleanup of old command code 2021-06-13 14:53:19 +08:00
fullwall
b1990138d8 Add getFirst<Getter|Setter> API 2021-06-13 13:41:36 +08:00
fullwall
f2d4c38843 Preliminary update to 1.17 - known bugs include every entity glowing 2021-06-13 03:20:18 +08:00
fullwall
2d5e418cf8 Expose hologram entities 2021-06-03 20:36:45 +08:00
fullwall
85c1f8f732 Fix horse mounted navigation 2021-05-30 00:23:13 +08:00
fullwall
22fd1da0c8 Add option to avoid talk-close to NPCs 2021-05-18 14:49:17 +08:00
fullwall
0ddfcbd0fa Add WIP falling movement examiner 2021-05-13 15:41:49 +08:00
Mich3l3k
cf6cbaf4a3
Translate to polish (#2539) 
* Translate to polish

I will finish translate soon (do not accept this yet, I will convert this to UTF-8 after end this).
Have a nice day!

* upgrade messages_pl.propierties again

next translated messages...

* and again...

* Finish poland translate for citizens

Everything works, i translated ~~80-90% messages, this 10-20% are messages which I didnt translate because I didnt want do a mistake
Youre Welcome
 2021-05-11 13:05:06 +08:00
Alex "mcmonkey" Goodwin
4dc123bb4b
Refactor scoreboard handling to use instant scoreboard application at spawn (#2544) 
Full description in PR https://github.com/CitizensDev/Citizens2/pull/2544
 2021-05-08 02:02:17 +08:00