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
956 Commits 6 Branches 0 Tags 106 MiB
5a3f616fe1
Commit Graph

890 Commits

Author SHA1 Message Date
fullwall
8c35992ac7 Add /npc tpto command 2013-02-17 10:58:27 +08:00
fullwall
5fa8d94de9 Possible fix for CITIZENS-443 2013-02-15 17:27:45 +08:00
fullwall
a86968bcd9 Possible fix for CITIZENS-443 2013-02-13 22:25:59 +08:00
fullwall
de445ff1b2 Fix CITIZENS-436 (can't pathfind between worlds) 2013-02-11 11:45:28 +08:00
fullwall
da03a3cd26 Fix CITIZENS-425 2013-02-10 22:34:56 +08:00
fullwall
1cb9c7b057 Fix EnderDragon NPC movement 2013-02-10 22:26:58 +08:00
fullwall
be4a9fba85 Move update call down 2013-02-06 21:19:47 +08:00
fullwall
f25c806aa3 Better playerlist emulation 2013-02-06 21:17:44 +08:00
fullwall
5184ded750 Implement new NPCRegistry creation methods 2013-02-06 19:43:28 +08:00
fullwall
c3ca4656f8 Implement new events 2013-02-06 16:04:26 +08:00
fullwall
43c02b72a1 Move @Requirements to API, move command.command to commands 2013-02-06 15:17:21 +08:00
fullwall
0fb3757c8d Remove deprecated Command API and getHandle method 2013-02-06 14:26:49 +08:00
fullwall
5b6f55ec50 A* jumping fix 2013-02-05 16:32:06 +08:00
fullwall
02cc53d2a2 Don't cancel pathfinding when despawned 2013-02-04 10:14:50 +08:00
fullwall
d354f51052 Load settings earlier (Fix CITIZENS-402, CITIZENS-417) 2013-02-02 22:27:12 +08:00
fullwall
30a0316bd8 Fix CITIZENS-403 2013-01-30 22:51:41 +08:00
fullwall
c3344f243a Fix CITIZENS-402 2013-01-30 22:46:30 +08:00
fullwall
fed0f1d576 Avoid using blocking sources of randomness 2013-01-30 22:37:05 +08:00
fullwall
b428167210 Promote Message and CommandAPI to CitizensAPI, deprecate Citizens2 command API 2013-01-25 21:48:28 +08:00
fullwall
1dc12ccf9b Promote Translator to API, move to Colorizer 2013-01-23 22:35:29 +08:00
fullwall
f58bac5cd0 Refactor 2013-01-23 15:31:22 +08:00
fullwall
c44e60ae01 Fix EventListen processing bug 2013-01-19 23:26:19 +08:00
fullwall
c09a3b9db4 Fix build 2013-01-19 20:42:03 +08:00
fullwall
5116acd7c9 Update compatible version to 1.4.7 2013-01-18 11:00:37 +08:00
fullwall
7b5f304933 1.4.7 compat 2013-01-17 20:46:56 +08:00
fullwall
64103414f4 Use combined Set instead of just traitnames 2013-01-14 22:57:07 +08:00
fullwall
b3f151da09 Some javadocs, fix type coercion when checking for enabled 2013-01-10 22:40:46 +08:00
fullwall
1c59e2c30a Bump up the step value for player NPCs to 1 2013-01-07 20:56:36 +08:00
fullwall
8c3e50a25c Switch to new methods in TraitInfo 2013-01-05 23:48:47 +08:00
fullwall
73b962cb20 Fix entity controller not removing properly on spawn fail 2013-01-04 16:20:13 +08:00
fullwall
f1917117e6 More spawn/despawn debug 2013-01-04 15:18:12 +08:00
fullwall
dc4fb0a33e Format and potential fix for incorrect chunk unload logic 2013-01-04 14:57:21 +08:00
fullwall
c053fa9871 C:/Program Files/Git/npc copy bugfix 2013-01-01 11:10:02 +08:00
Jeremy Schroeder
5b3a24411c Fix to '/npc anchor --save name -c' 2012-12-30 12:13:58 -05:00
fullwall
094d2a2084 New metrics for total goals 2012-12-30 22:26:07 +08:00
fullwall
a0db109984 Better despawning 2012-12-30 20:25:49 +08:00
fullwall
b7bb0d8202 Respect (de)spawn return values 2012-12-29 23:00:15 +08:00
Jeremy Schroeder
d6c6b3864f Add -c flag to '/npc anchor --save anchor_name' to save location of the cursor. 2012-12-27 22:28:39 -05:00
Jeremy Schroeder
b8878eda5d Merge Speech branch into master for testing. Please backup your current saves and config before using this build. 2012-12-26 15:49:53 -05:00
fullwall
81d00792d1 Fix mistranslations 2012-12-21 17:26:26 +08:00
AgentKid
32e8a79344 Updated to MC 1.4.6. Preliminary barely-tested version. Do not use! 2012-12-20 18:18:12 -05:00
fullwall
e07be3cf36 Add Storage type plotters, update version to 2.0.6-SNAPSHOT 2012-12-19 22:26:46 +08:00
fullwall
fc0bbc7866 Fix CITIZENS-335 2012-12-18 20:38:39 +08:00
fullwall
6cc965f108 Further null checks 2012-12-18 19:28:16 +08:00
fullwall
12c70a0609 Check for empty names 2012-12-18 19:27:00 +08:00
fullwall
1dd695a14f Fix build 2012-12-17 23:19:06 +08:00
fullwall
910f806763 Remove some usage of NMS, talk-item for text trait should default to the setting always and not save if unmodified 2012-12-14 22:07:25 +08:00
fullwall
6ee3c65614 Support generic equipping 2012-12-11 10:17:09 +08:00
fullwall
af81d49565 Update src/main/java/net/citizensnpcs/Citizens.java 2012-12-10 22:17:52 +08:00
fullwall
710780a3ff Update src/main/java/net/citizensnpcs/Citizens.java 2012-12-10 22:08:43 +08:00
fullwall
2e3df17bcf Change this back 2012-12-10 19:01:09 +08:00
fullwall
6d6dec8e7a Fix @Requirements 2012-12-10 18:59:33 +08:00
fullwall
891e2fa96d Compile fix 2012-12-10 13:30:58 +08:00
fullwall
f19e8181f1 Less hacks 2012-12-10 13:30:02 +08:00
fullwall
4858bf2958 Add /npc zombiemod (-bv) 2012-12-10 11:13:51 +08:00
Jeremy Schroeder
929256c61a Make location readable with /npc command. Update POM. 
Bad merge with POM?
 2012-12-09 18:46:37 -05:00
fullwall
b2c3d80571 Fix usage of getClass instead of annotationType 2012-12-09 20:05:55 +08:00
fullwall
338662936f Add an effect 2012-12-09 00:39:07 +08:00
fullwall
e998d2a78c Move Entity creation logic into EntityController, add /npc type, reduce Location object churn 2012-12-08 20:08:58 +08:00
fullwall
4473b2e57e Fix bug with annotation processor 2012-12-08 14:28:06 +08:00
fullwall
40a74a4630 Remove/consolidate some NMS usage 2012-12-07 23:04:31 +08:00
fullwall
bc870189aa Test 2012-12-07 15:18:57 +08:00
fullwall
7cce2aec8e Test 2012-12-07 15:14:51 +08:00
fullwall
9b15542548 Switch Requirements to CommandAnnotationProcessor 2012-12-07 15:08:26 +08:00
fullwall
b7cf0109da More compat for args 2012-12-07 14:29:48 +08:00
fullwall
7d676a2302 Update for CB changes 2012-12-06 23:59:17 +08:00
fullwall
f1a1138538 Merge branch 'master' of https://github.com/CitizensDev/Citizens2 2012-12-05 16:18:42 +08:00
fullwall
9fbfaa546d Update src/main/java/net/citizensnpcs/npc/CitizensNPC.java 2012-12-03 23:37:06 +08:00
fullwall
b72711e9ac Nullcheck 2012-12-02 22:39:01 +08:00
fullwall
6f8c4a7e58 Slower, but more correct 2012-12-02 18:22:25 +08:00
fullwall
51bfe23f98 Fix matcher bug 2012-12-02 18:09:22 +08:00
fullwall
e6023c2e81 Remove some start messages, better colour matching 2012-12-02 17:55:10 +08:00
fullwall
d2b55f466f Add specific permissions to /npc controllable 2012-12-02 16:36:40 +08:00
fullwall
4019ee7bad Make XORShiftRNG more testable, fix SlimeSize constructor 2012-11-29 14:53:42 +08:00
fullwall
9878500f18 Pull methods up 2012-11-29 13:59:33 +08:00
fullwall
d4dad1b05d Support BlockCommandSender 2012-11-28 16:28:55 +08:00
fullwall
9f779f57d0 Add BUILD_NUMBER to pom for local builds 2012-11-28 15:22:49 +08:00
fullwall
05ea37f2e9 Peformance improvements 2012-11-28 14:23:32 +08:00
fullwall
d0e59def6b Fix mistranslation of poses 2012-11-28 12:08:09 +08:00
fullwall
153026b8bd Add a setting to use the new pathfinder (temporary, will be removed) 2012-11-27 22:09:42 +08:00
fullwall
ae199ad98a Location-safe 2012-11-21 20:22:59 +08:00
fullwall
d28c35fd60 EventListen calls with DespawnReason 2012-11-21 20:10:21 +08:00
fullwall
33b4a7d188 Remove old files 2012-11-20 23:55:21 +08:00
fullwall
3c5f17022f Use new Bukkt API for Skeleton types 2012-11-20 23:55:09 +08:00
fullwall
c8c5ef1eb0 Check 2012-11-19 13:08:11 +08:00
fullwall
8a1765873b Add a keep-chunks-loaded setting, fix Player NPC movement code 2012-11-19 09:42:20 +08:00
fullwall
7701bb97c9 Refactor a little to prepare CommandManager for API 2012-11-17 13:14:53 +08:00
fullwall
32f91d39cd Fix issue with /npc tp, implement NPCDeathEvent 2012-11-17 12:54:58 +08:00
fullwall
0d56317bc0 Optimise StringHelper#parseColors, fix an NPE 2012-11-16 23:42:52 +08:00
fullwall
6e9593c4c3 Update more names for 1.4.4 2012-11-16 15:47:51 +08:00
Jeremy Schroeder
53877a4798 Update for 1.4.4 2012-11-14 11:30:45 -05:00
Jeremy Schroeder
a8e9817c63 Add registerCommandClass for loading external command classes. 2012-11-13 21:08:26 -05:00
fullwall
08b463ac6b Support decimals in the --xyz syntax for /npc moveto 2012-11-14 09:16:53 +08:00
fullwall
79dcdb9df8 Fix CITIZENS-295 2012-11-13 13:54:37 +08:00
fullwall
fc5379825c Delegate citizens.npc.text to citizens.npc.edit.text, move citizens.npc.remove.all permission to citizens.admin.remove.all (CITIZENS-276, CITIZENS-293) 2012-11-11 15:24:02 +08:00
Jeremy Schroeder
8e13728f25 Whoops. 2012-11-07 22:25:15 -05:00
Jeremy Schroeder
0021b57f44 Add a few methods for setting lookclose/gravity directly. 2012-11-07 22:23:02 -05:00
fullwall
3faa57ee70 Fix NPE when metrics has been opted out of 2012-11-07 10:09:13 +08:00
fullwall
a6950dd9d8 Call with right this 2012-11-06 18:29:14 +08:00
fullwall
f63ef768b4 Restrict Pose object to inside Poses, metrics version should only report the major version 2012-11-06 13:42:32 +08:00
fullwall
6406e1c2e3 Remove usage of location.getChunk() 2012-11-04 16:16:06 +08:00
fullwall
01ae2eca46 Improve text 2012-11-04 13:31:22 +08:00
fullwall
8fea42eba4 Check chunk loaded as well, may fix the yaw issue with players 2012-11-04 10:34:57 +08:00
fullwall
871259dcff Add LinearWaypointsCompleteEvent 2012-11-02 17:32:11 +08:00
fullwall
6f1eb32445 Fixed the stair/slab issue for real - missed the rename of W->X, readded this change 2012-11-01 22:05:25 +08:00
fullwall
9024c3a8d2 Send a message on waypoint clear 2012-11-01 14:46:18 +08:00
fullwall
1cebe9271a Add clear to waypoint editor 2012-11-01 14:01:17 +08:00
fullwall
6290ea977f Fix for equipment 2012-11-01 09:17:13 +08:00
fullwall
79160706bb Changes to equipment 2012-10-31 23:54:01 +08:00
fullwall
ead7db1990 Update null equipment 2012-10-31 23:35:17 +08:00
fullwall
cc8d9c10a8 Changes to Behaviour 2012-10-31 21:52:50 +08:00
fullwall
18d9853f00 Add powermock as a testing dependency 2012-10-31 15:43:49 +08:00
fullwall
5ce050ec86 Better world safety 2012-10-31 15:03:13 +08:00
fullwall
0c2a689793 Test 2012-10-31 14:46:24 +08:00
fullwall
43e218be05 Work around entity equipping 2012-10-31 14:13:38 +08:00
fullwall
eec27c07e4 Move setImplementation call 2012-10-31 12:15:16 +08:00
fullwall
ae6a666bc6 Delay trigger delays other triggers 2012-10-31 12:03:38 +08:00
fullwall
567b2d5e25 Add PlayerAnimation waypoint trigger 2012-10-31 11:51:12 +08:00
fullwall
59a6bd7770 Owner check in Controllable 2012-10-31 10:10:48 +08:00
fullwall
18d9d412c8 Move translator creation to the translate methods 2012-10-31 10:08:34 +08:00
fullwall
9a6bdaa170 Moving the spawn call was ill-advised 2012-10-30 22:47:44 +08:00
fullwall
5f6014d87d Sanity check 2012-10-30 22:40:15 +08:00
fullwall
670711f109 Test 2012-10-30 22:28:19 +08:00
fullwall
67da06d14b Odd. 2012-10-30 22:26:21 +08:00
fullwall
5c6ea45eef Change this back 2012-10-30 22:17:28 +08:00
fullwall
9cd6f510e1 Derp - animate ARM_SWING not HURT 2012-10-30 22:11:12 +08:00
fullwall
f86954ff78 Add build number to version 2012-10-30 21:50:14 +08:00
fullwall
046ab7dd38 Reuse code 2012-10-30 21:31:15 +08:00
fullwall
c5504379e4 Fix 2012-10-30 21:23:36 +08:00
fullwall
579385cb0d Rename methods 2012-10-30 21:14:10 +08:00
fullwall
c873904dfc Explicitly stop metrics, fix stair/slab climbing 2012-10-30 21:11:06 +08:00
fullwall
fdbd6f7afb I have 0.47 problems but stairs work now 2012-10-30 17:49:54 +08:00
fullwall
4ebb4c98b3 Use motY = 0.5 instead of calling bf() 2012-10-30 14:58:35 +08:00
fullwall
3f4a601bb8 Update version 2012-10-30 11:33:55 +08:00
fullwall
2c3d999a00 Reuse code, match more entity types 2012-10-30 11:02:25 +08:00
fullwall
a80bc89044 Fix entity.l being called and use bukkit equivalent, update EntitySense, knockback enchantments get applied 2012-10-30 10:53:05 +08:00
fullwall
71d4752c58 Fix location missing bug... and bats 2012-10-30 08:59:52 +08:00
fullwall
e43a233ade NPC stairclimbing: still not working 2012-10-29 22:45:03 +08:00
fullwall
5f15f0146d Sort 2012-10-29 21:36:27 +08:00
fullwall
b4373ccaa9 Fix walking over slabs 2012-10-29 21:35:38 +08:00
fullwall
f1f5b74f6b Add some escape sequences 2012-10-29 20:54:28 +08:00
fullwall
e9e2c057dc Fix NPC bats, add /npc skeletontype, /npc create now allows creation at another player 2012-10-29 17:26:42 +08:00
aPunch
6ab712f893 Add ability to place skulls on NPCs. 2012-10-28 17:52:31 -05:00
fullwall
df78fbef01 Fix rayTrace call to this.l 2012-10-28 13:18:38 +08:00
fullwall
b83bd96847 Use the persistent field instead of overriding bh 2012-10-28 12:54:18 +08:00
fullwall
61caf6d9ef Update for 1.4 2012-10-28 12:37:37 +08:00
fullwall
85c0a67759 Add ChatTrigger, add PlayerAnimation utility class 2012-10-27 19:43:53 +08:00
fullwall
e898918d6d Trigger conversation is active while the editor is active 2012-10-26 22:00:48 +08:00
fullwall
641b19aa99 Stop the conversation when the editor stops 2012-10-26 21:55:41 +08:00
fullwall
3bdf59c533 Implement WaypointTriggers 2012-10-26 21:49:30 +08:00
fullwall
dd5dd1878c Assuming this works 2012-10-26 17:52:01 +08:00
fullwall
3ff0b651c1 Player NPC swimming 2012-10-26 16:35:23 +08:00
fullwall
0ba4270a40 Use setting more consistently 2012-10-26 16:07:06 +08:00
fullwall
bb36e8ea27 Stuff 2012-10-26 15:28:48 +08:00
fullwall
798c713394 Double quote everything, remove trait data 2012-10-26 14:26:57 +08:00
fullwall
dc8ff67001 . 2012-10-26 13:47:33 +08:00
fullwall
66f3ce1a0e Add pathfinding range message, sort 2012-10-26 12:26:54 +08:00
fullwall
8abfa3b96e Simplify multi-way selection prompt 2012-10-26 12:11:30 +08:00
fullwall
addf9c4a2b Move playerlist handling to CitizensHumanNPC, add /npc playerlist command, make ChunkCoord unique per-world 2012-10-26 11:35:04 +08:00
fullwall
5c6509046e Fix an issue with Gravity 2012-10-24 00:19:31 +08:00
fullwall
14931b32a9 Add an extra trySwim call 2012-10-23 15:18:51 +08:00
fullwall
66c2773616 Trim arguments, waypoint command 2012-10-23 15:14:54 +08:00
fullwall
3c9379d455 Allow NPCs to be created from console 2012-10-22 20:33:07 +08:00
fullwall
d817ef3815 Delete file 2012-10-22 14:54:15 +08:00
fullwall
c81e2c1035 Update website 2012-10-22 14:54:01 +08:00
fullwall
5cbc8b7c15 Add /npc gamemode command 2012-10-21 21:40:45 +08:00
fullwall
02e2232cd4 Fix missing param in translation 2012-10-21 20:34:21 +08:00
fullwall
f6f69c32a4 Remove double quotes 2012-10-21 17:04:49 +08:00
fullwall
b3351f5285 Update translation 2012-10-20 20:08:35 +08:00
fullwall
55659b48d9 Update german translation 2012-10-19 21:08:56 +08:00
fullwall
ccd81bac56 Duplicate some code in Messaging.tr temporarily 2012-10-19 16:37:22 +08:00
fullwall
2459726fac Don't require ownership for /npc select 2012-10-18 18:15:04 +08:00
fullwall
b3121305f9 Avoid - character in saving lookclose 2012-10-16 20:09:23 +08:00
fullwall
b096dcfd8b Fix spout compat 2012-10-16 17:50:57 +08:00
fullwall
4696f27825 Fix controllable NPE 2012-10-16 17:25:18 +08:00
fullwall
02d54f43fb Don't try to translate while still initialising 2012-10-16 15:48:43 +08:00
fullwall
5e3c351c8d Add dutch translation - thanks sjoerdtim 2012-10-15 21:29:31 +08:00
fullwall
a70a308b47 Allow -g flag for setting the controllable to ground, -r flag for clearing 2012-10-15 21:04:15 +08:00
fullwall
5884059528 Derp, fix order 2012-10-15 20:55:54 +08:00
fullwall
8bb958e2d3 Fix * flags 2012-10-15 20:51:48 +08:00
fullwall
5d2c81da84 Fix arg length for /trc 2012-10-15 20:39:57 +08:00
fullwall
c71f226abd Fix bugs 2012-10-15 20:31:22 +08:00
fullwall
c3630c1da3 Implement AttackStrategy 2012-10-15 18:14:27 +08:00
fullwall
db403bbcf0 Add some waypoint triggers 2012-10-15 17:13:34 +08:00
fullwall
c9f054b615 Update 2012-10-15 16:55:38 +08:00
fullwall
996dd07f2c Allow any entity type to be controlled as a flyable npc 2012-10-15 16:55:13 +08:00
fullwall
ea190794da Implement onCopy 2012-10-15 15:17:20 +08:00
fullwall
f642cc2d2c Waypoints use PersistenceLoader now 2012-10-15 14:44:20 +08:00
fullwall
f04bad6d92 Add gravity and slime size traits 2012-10-15 13:45:00 +08:00
fullwall
1bab619840 Forgot to remove this 2012-10-15 13:18:34 +08:00
fullwall
ed627fd0c3 Add selection param 2012-10-15 11:31:40 +08:00
fullwall
daf36ec549 Better economy handling 2012-10-15 10:37:40 +08:00
fullwall
0c81d3dbf5 Peaceful monsters will now brutalise players 2012-10-15 10:02:59 +08:00
fullwall
63bf0b2221 Derp 2012-10-13 12:37:18 +08:00
Jeremy Schroeder
59218ae28c Add Anchors, saveable 'locations' for your NPCs. Usage: /npc anchor (--save [name]|--assume [name]|--remove [name]) (-a) 
Also renamed /npc pose --load to /npc pose --assume
 2012-10-12 21:24:42 -04:00
fullwall
983ef2f1fd Fix locale loading when setting is empty 2012-10-12 22:39:18 +08:00
fullwall
c0f61381b7 Implement fix better 2012-10-12 21:40:38 +08:00
fullwall
042a0b5ba6 Fix 2012-10-12 19:35:11 +08:00
fullwall
7aa56a5ffb Fix /npc select with only 1 argument 2012-10-12 14:25:56 +08:00
fullwall
f8ccd0b4fd Experimental change: implement Bukkit interfaces for NPCs 2012-10-12 12:16:44 +08:00