Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-30 23:39:47 +01:00
Code Issues Projects Releases Wiki Activity
759 Commits 6 Branches 0 Tags 104 MiB
b8878eda5d
Commit Graph

524 Commits

Author SHA1 Message Date
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
fullwall
eb64a43bf3 Work around some plugins not extending from CraftEntity 2012-10-12 11:52:48 +08:00
fullwall
4c335887a8 Better flyable NPCs 2012-10-10 21:45:34 +08:00
fullwall
08d2001d37 test 2012-10-10 14:26:41 +08:00
fullwall
f6d0db7bdf Test 2012-10-08 22:07:29 +08:00
fullwall
f83498e5cb Revert "Move highlight logic to StringHelper" 
This reverts commit 1acad881eb.
 2012-10-08 22:05:19 +08:00
fullwall
1acad881eb Move highlight logic to StringHelper 2012-10-08 21:51:29 +08:00
fullwall
0b034e54ec Use Persistence API 2012-10-08 15:11:49 +08:00
fullwall
d442da91fb Call onRemove 2012-10-08 12:37:45 +08:00
fullwall
091ce13cca Fix NPE 2012-10-08 11:30:28 +08:00
fullwall
491f077b4b Add specific help for some commands, default locale is empty to focus on system locale 2012-10-08 10:44:14 +08:00
fullwall
5b380cf96e Translate the last of the strings 2012-10-08 10:16:19 +08:00
fullwall
03bcb9f4cf Make parent folders before saving 2012-10-05 20:15:06 +08:00
fullwall
236b6e52c3 Fix locale selection, unpack resource translations automatically 2012-10-04 18:58:27 +08:00
fullwall
58ee3dfbc2 Test 2012-10-04 18:28:23 +08:00
fullwall
f98d53745e Add messages_de.properties 2012-10-04 18:16:51 +08:00
fullwall
6c7dd30c3b Allow for locale specialisation for possible player-specific translations 2012-10-04 17:28:42 +08:00
fullwall
ae31334a72 Use american spelling 2012-10-04 15:00:41 +08:00
fullwall
72b714c3f6 Nearly all strings translated 2012-10-04 14:58:35 +08:00
fullwall
03cbb6baf9 Translate a few more strings 2012-09-30 23:23:27 +08:00
fullwall
803ce5e483 Remove old file 2012-09-30 23:13:59 +08:00
fullwall
64512b282d Fix wander waypoint provider, stack overflow bug 2012-09-30 23:13:49 +08:00
fullwall
733364443d Translate yet more strings 2012-09-30 22:56:57 +08:00
fullwall
5c0f642842 Implements traits() in requirements 2012-09-30 22:13:19 +08:00
fullwall
ee7ee3c8c8 Add /waypoint provider 2012-09-30 19:36:48 +08:00
fullwall
a8c9531f31 Update metrics, add WaypointCommands, fix templates (which work, mostly) 2012-09-30 19:03:12 +08:00
fullwall
90b79b8d70 More work on i18n - changed Messages to string constants instead of enums, new strings must be translated into the messages_en.properties file 2012-09-30 17:55:51 +08:00
fullwall
f6cc346b26 Implement template#apply (templates may or may not work) 2012-09-30 00:08:47 +08:00
fullwall
5d3239a5b9 Make a start on templates 2012-09-29 23:54:05 +08:00
fullwall
ccacff92ec Changes 2012-09-29 23:07:48 +08:00
Jeremy Schroeder
244f9873f0 Remove old files 2012-09-28 13:36:14 -04:00
Jeremy Schroeder
b9ce5d2f9b Change Positions to Poses. Use /npc pose 2012-09-28 13:29:35 -04:00
Jeremy Schroeder
669da4fc95 Fix small bugs/update to /npc position. Add /npc position --remove [name]. 2012-09-28 12:02:05 -04:00
Jeremy Schroeder
3748ee098f Beef up /npc position. Add --save and --load for storing/recalling positions. Example: /npc positions --save position_1 -a ... continue to use -a for making the NPC assume that position. Using /npc position alone will list positions. Using -a alone will neither save nor load, just assume. 2012-09-28 10:25:00 -04:00
fullwall
a938fd3f07 Allow markers to be right clicked to update editing slot 2012-09-28 18:10:17 +08:00
fullwall
5d80957236 Changes to /npc position 2012-09-28 18:03:17 +08:00
fullwall
da723d47e8 Merge branch 'master' of github.com:CitizensDev/Citizens2 2012-09-28 17:56:47 +08:00
fullwall
6053800129 Fix some bugs with waypoints, add waypoint markers 2012-09-28 17:56:16 +08:00
Jeremy Schroeder
e7daa38eef Add '/npc position -a' to have the NPC's head assume the position of the Player's head. 2012-09-27 18:03:04 -04:00
Jeremy Schroeder
2d78bdaad0 Add 2012-09-27 17:59:32 -04:00
fullwall
cf09688a79 Fix some navigation bugs (thanks jrbudda) 2012-09-24 16:40:13 +08:00
fullwall
491f566e2a Revert "Implement new selector" 
This reverts commit 959b8b774f.
 2012-09-23 13:07:30 +08:00
fullwall
959b8b774f Implement new selector 2012-09-22 16:31:53 +08:00
fullwall
547df2487f Change Navigation world when the entity changes world 2012-09-22 16:09:40 +08:00
fullwall
22ace31fbe Fix payment 2012-09-22 13:03:52 +08:00
fullwall
6ce2b9c2d2 Enable subplugins earlier 2012-09-20 08:52:44 +08:00
fullwall
a7e926b44a Fix format specifiers in waypoint editor 2012-09-17 23:06:52 +08:00
fullwall
b90a0f6b45 Allow npcs to be created unspawned with the -u flag 2012-09-17 21:49:28 +08:00
fullwall
f2608e3c8d Fix CITIZENS-186 2012-09-17 18:20:15 +08:00
fullwall
f0de2fbfe5 Fix CITIZENS-190, add more translations 2012-09-17 18:16:27 +08:00
fullwall
fb66286117 Fix CITIZENS-191 2012-09-17 17:54:56 +08:00
fullwall
93d1c35305 Fix jrbuddas reported bugs 2012-09-17 17:18:17 +08:00
fullwall
6b2b11b90d More work on translations 2012-09-16 19:20:01 +08:00
fullwall
0baac5d002 Begin work on translation 2012-09-16 16:47:41 +08:00
fullwall
0c32720fb3 Fix up trait command requirements, add /trait add|remove 2012-09-16 14:35:04 +08:00
fullwall
1394ec9c9a Implement new trait methods 2012-09-16 12:29:08 +08:00
fullwall
d3ae5bcd61 Add setting for removing NPCs from player list (testing it out), --trait is applied after spawn 2012-09-16 12:04:14 +08:00
fullwall
e2b0af6ac1 Changes 2012-09-14 16:20:22 +08:00
fullwall
d7c5c60377 Possible fix for spawning bugs... TODO implement better 2012-09-14 15:21:07 +08:00
fullwall
8823a4b77f Changes 2012-09-14 14:53:25 +08:00
fullwall
3adaa8a04f Update pathfinding range more often 2012-09-13 21:11:17 +08:00
fullwall
57a491fb8b Some basic refactoring 2012-09-13 21:02:55 +08:00
fullwall
1b96cdf34b Fix for subplugins 2012-09-13 20:39:52 +08:00
fullwall
9b1a53fcab Workaround for metadata issue 2012-09-12 21:18:47 +08:00
fullwall
136161c18e Revert "Removed NPC metadata for checking that an entity is an NPC; Bukkit will not be fixing this per BUKKIT-2501" 
This reverts commit 91d4ba0151.
 2012-09-12 20:32:31 +08:00
fullwall
91d4ba0151 Removed NPC metadata for checking that an entity is an NPC; Bukkit will not be fixing this per BUKKIT-2501 2012-09-12 17:06:21 +08:00
fullwall
0052596444 Fix NPE 2012-09-11 15:54:27 +08:00
fullwall
5b9cf50b8e Test fix for pathing 2012-09-10 22:40:25 +08:00
fullwall
d08c1dc623 Check if navigator is navigating in waypoints 2012-09-10 20:20:01 +08:00
fullwall
1986b6203e Fix to Age, cancel navigation target if npc despawns 2012-09-10 19:16:37 +08:00
fullwall
5bc0f427e6 Update list without iterator 2012-09-10 17:58:12 +08:00
fullwall
d83a0ceaf6 Remove debug code in /npc 2012-09-10 17:41:44 +08:00
fullwall
6565424031 Add /npc vulnerable command 2012-09-09 21:39:53 +08:00
fullwall
338a853b79 Fix some issues with Navigator as reported by jrbudda 2012-09-09 18:47:25 +08:00
fullwall
f62e536473 Allow selected NPC redefinition in all cases 2012-09-09 18:02:39 +08:00
fullwall
1a8d4fe7f8 Support alternative format for /npc moveto 2012-09-09 17:59:38 +08:00
fullwall
6ed52a79ca Typo 2012-09-09 17:52:36 +08:00
fullwall
01ec75e254 Better usability for commands which require an NPC to be selected 2012-09-09 17:52:00 +08:00
fullwall
7d214ffce9 Small change, not sure if it will fix anything 2012-09-09 17:35:26 +08:00
fullwall
7abdca47a5 Implement new method 2012-09-09 10:36:50 +08:00
fullwall
8f1b6d7c33 Save immediately on shutdown 2012-09-08 23:30:18 +08:00
fullwall
2b08e7dbeb Filter out commands when the player does not own the NPC 2012-09-07 20:52:33 +08:00
fullwall
2a33588a85 Fix 2012-09-07 20:28:09 +08:00
fullwall
b69b6091b6 Fixes, flyable NPCs 2012-09-07 20:12:32 +08:00
fullwall
124642eb55 Uncomment motion handling for human npcs 2012-09-07 18:28:29 +08:00
fullwall
be84708f90 Update push event handling 2012-09-07 18:25:54 +08:00
fullwall
073ee8a65f Change StuckAction implementation 2012-09-07 16:38:18 +08:00
fullwall
3d9ae92a8f Change 2012-09-07 16:15:51 +08:00
fullwall
4073ceea54 2.0.1 2012-09-06 17:35:10 +08:00
fullwall
a8f4852a9c Set compatibility string to 1.3.x 2012-09-05 18:52:12 +08:00
fullwall
43efbe18d2 Refactor CancelReason event firing, NPCs should teleport if no path can be found 2012-09-04 21:11:45 +08:00
fullwall
76e954f2f2 Don't overwrite saves file if it failed to load 2012-09-04 19:59:46 +08:00
fullwall
f75b33dfce Changes to navigator 2012-09-03 22:12:38 +08:00
fullwall
fae265b22b Make local params actually local 2012-09-03 16:04:34 +08:00
fullwall
fcf8bf1f88 Fix stationary ticks 2012-09-03 16:01:45 +08:00
fullwall
7377093c6a Explicitly shutdown the navigator 2012-09-03 15:58:21 +08:00
fullwall
9d33257deb Scheduler update may have broken yaw updating on spawn 2012-09-03 15:42:54 +08:00
fullwall
d43ee95408 Allow null in CitizensNPCRegistry#getNPC(Entity) 2012-09-03 15:40:40 +08:00
fullwall
634dd441cb Throw IOException 2012-09-02 11:12:29 +08:00
fullwall
3bb91d0fd1 Made intent clearer 2012-09-02 10:48:29 +08:00
fullwall
6d0086d54e Add easy way to control whether to protect NPCs 2012-09-01 23:28:56 +08:00
fullwall
a0573c8997 Make /npc speed modify the speed as a percentage 2012-09-01 23:17:07 +08:00
fullwall
50c18d22dd Fix some bugs, implement new navigation customisation 2012-09-01 23:09:42 +08:00
fullwall
8cae31cc88 Bugfixes 2012-09-01 18:05:22 +08:00
fullwall
ab3e917f37 Better output for /npc copy 2012-09-01 15:10:16 +08:00
fullwall
47c5775a95 Fix? 2012-09-01 14:26:54 +08:00
fullwall
1b3d81f019 Don't use ignoreCancelled on entitytarget/damage 2012-08-31 22:19:04 +08:00
fullwall
54a2527534 Implement NPC limits 2012-08-29 21:37:00 +08:00
fullwall
c96e0b9245 Nicer output for --trait 2012-08-28 19:38:11 +08:00
fullwall
fca99af3ba Fix pathfinding range 2012-08-27 23:18:12 +08:00
fullwall
2312b66297 Update for 1.3.2, reuse instances when loading 2012-08-26 21:04:07 +08:00
fullwall
28356f54a0 Implement changes 2012-08-25 10:40:36 +08:00
fullwall
98e8b3e991 Enable player swimming 2012-08-19 12:59:32 +08:00
fullwall
080e652124 Bugfix 2012-08-19 12:51:45 +08:00
fullwall
07edf17dae Bugfix 2012-08-18 15:13:33 +08:00
fullwall
17366cba20 Bugfix 2012-08-17 22:05:30 +08:00
fullwall
72aeffe3fe Null checks when searching for Vault 2012-08-17 15:12:54 +08:00
fullwall
2a6870da14 Remove pointless abstraction in WaypointGoal, made it a bit faster when only one waypoint 2012-08-16 23:15:10 +08:00
fullwall
ae20494f92 Implement NPCDamageByBlockEvent 2012-08-16 00:13:46 +08:00
fullwall
e393f2d38b Add message for NPCPayListener 2012-08-16 00:08:36 +08:00
fullwall
2fceea7d23 Vault support 2012-08-16 00:06:13 +08:00
fullwall
6c93fad879 Check for null in getBukkitEntity() fix issue in Text 2012-08-12 14:39:44 +08:00
fullwall
e0638f2df7 Bugfixes, speed updates during pathfinding 2012-08-07 22:04:52 +08:00
fullwall
e51a671862 Trait commands act as toggle 2012-08-06 17:26:17 +08:00
fullwall
eacf70202d Fix traits/lookclose, use less memory in MCTargetStrategy, improve Behaviour (ie. scripts don't need to implement hashCode() any more) 2012-08-06 17:22:04 +08:00
fullwall
358cf996b1 Move trait commands, /npc copy 2012-08-05 21:07:42 +08:00
fullwall
52e393b44b Experimental change to use less memory for sockets - may break player NPCs 2012-08-05 14:21:34 +08:00
fullwall
90e5b4b2d9 Forgot this 2012-08-05 14:16:11 +08:00
fullwall
6a322f7f25 Support spaces in names for /npc rename 2012-08-05 14:15:04 +08:00
fullwall
378077edd6 Update for new YamlStorage constructor 2012-08-05 13:19:16 +08:00
fullwall
e4ccfc10fe Change settings node 2012-08-04 23:19:22 +08:00
fullwall
d673f563d0 Derp 2012-08-04 22:08:47 +08:00
fullwall
b081ecd5ac Use collision vector from event 2012-08-04 13:39:04 +08:00
fullwall
288bcf5e9f CommandConfigurable interface, range/realistic looking settings added to LookClose and Text 2012-08-04 12:48:07 +08:00
fullwall
461d102107 C:/Program Files/Git/npc speed [speed] and speed/range saving 2012-08-03 22:30:11 +08:00
fullwall
1d076ace14 Move reflection into its own file 2012-08-03 21:18:10 +08:00
fullwall
5126a5c9ad Fix player movement, block villager trading 2012-08-02 22:51:10 +08:00
fullwall
b9b6004e65 Update for 1.3 2012-08-02 21:44:59 +08:00
fullwall
3c3c6cc5f1 Use custom spawn reason 2012-07-28 16:22:03 +08:00
fullwall
8bb4964e1d Fix some issues with pathing/controllable 2012-07-28 16:15:12 +08:00
fullwall
11325cbbfa Implement NPCPush/CollisionEvent 2012-07-28 15:02:57 +08:00
fullwall
585de19c25 Implement pathfinding range methods in Navigator, make default range setting of 25F 2012-07-28 11:04:59 +08:00
fullwall
bb812f699e Implement NPCCollisionEvent, made EntityType matching more sane 2012-07-28 00:01:52 +08:00
fullwall
4294758937 Add isPaused() and setPaused(boolean) to WaypointProvider 2012-07-27 22:48:06 +08:00
fullwall
54c80aaa08 Fix waypoints (an issue with the Goal, not pathing) and make entity type use the bukkit naming scheme 2012-07-26 19:01:50 +08:00
fullwall
4cf071bf4b Add isPushable() and setPushable(), cleanup 2012-07-24 14:47:10 +08:00
fullwall
7158aa6bfb Fix equipment editing 2012-07-24 14:21:59 +08:00
fullwall
6f30ed3496 Fix pig pathing speed 2012-07-22 15:44:40 +08:00
fullwall
ec3182cc01 Add -r flag to /npc trat 2012-07-22 14:47:44 +08:00
fullwall
f8afd032a8 Better threading - stop memory leak 2012-07-22 14:18:24 +08:00
fullwall
64c630784d Remove debugging, don't use metrics for internal traits 2012-07-21 23:28:19 +08:00
fullwall
91424d425c Fix some bugs 2012-07-21 23:19:54 +08:00
fullwall
6a991d7c2c Don't use internal classes from other packages. Fixes CITIZENS-112 2012-07-21 14:11:32 +08:00
fullwall
e258fc5e3a Git fail. WARNING: API BREAKAGES 2012-07-19 23:10:30 +08:00
fullwall
405946528a Revert "Simplification part 1 - remove characters" 
This reverts commit 43f7cbc4a5.
 2012-07-09 21:35:57 +08:00
fullwall
20cc3d2279 Revert "Add files" 
This reverts commit 598bd56323.
 2012-07-09 21:35:45 +08:00
fullwall
598bd56323 Add files 2012-07-09 16:51:38 +08:00
fullwall
43f7cbc4a5 Simplification part 1 - remove characters 2012-07-09 16:46:53 +08:00
fullwall
e3d553e0d7 Hackfix a stack overflow problem. 2012-06-11 16:11:54 +08:00
fullwall
de5edc19ad Update master 2012-06-10 16:09:53 +08:00
fullwall
8198e82aaf Update master 2012-06-10 16:09:01 +08:00
fullwall
5247967cbb Update master 2012-06-10 16:08:16 +08:00
fullwall
dfdce9e4b6 Update master 2012-06-10 16:06:45 +08:00
fullwall
e28e06ea2a Update master 2012-06-10 16:05:42 +08:00
fullwall
5912709b7d Update master 2012-06-10 16:04:34 +08:00
fullwall
5c7ac6926b Normalise editing slot. 2012-05-30 16:39:35 +08:00
fullwall
c0baa1b446 This is why you don't use the github web interface 2012-05-27 16:48:58 +08:00
fullwall
36e8d3ca88 Update src/main/java/net/citizensnpcs/Settings.java 2012-05-27 16:35:04 +08:00
fullwall
0302da1513 . 2012-05-27 16:32:11 +08:00
fullwall
10543438bd . 2012-05-27 16:31:08 +08:00
fullwall
06ba12c22e Fix an issue in Settings. 2012-05-27 16:30:27 +08:00
DMarby
1ae9bf3a47 Corrected Metrics Plotter. 2012-05-26 23:26:46 +03:00
fullwall
bbd38fd5c2 Metrics.... 2012-05-26 22:31:01 +08:00
fullwall
32445afec6 Fix a multiworld issue in LookClose 2012-05-25 23:02:20 +08:00
fullwall
c5e95eb667 Delete metrics, clean up 2012-05-23 18:57:01 +08:00
fullwall
22602c225a Fix an issue with setDestination not working immediately after spawn 2012-05-23 16:51:33 +08:00
fullwall
08e5f8223d Just use instanceofs 2012-05-18 00:06:31 +08:00
fullwall
841f378750 Tempfix all the things 2012-05-17 23:55:25 +08:00
fullwall
0262ffd018 Don't add pig traits at spawn. 2012-05-17 23:49:09 +08:00
fullwall
4698e70f77 Temporary hack to fix age throwing errors, don't give every NPC age on create 2012-05-17 23:31:09 +08:00
fullwall
434bc6168b Remove explicit @ServerCommand, remove unnecessary instanceof in CitizensNPCRegistry 2012-05-17 23:14:30 +08:00
fullwall
22ced5b02b BREAKING: rename methods 2012-05-17 21:34:03 +08:00
fullwall
41ddb6851b Fix typo 2012-05-14 19:45:16 +08:00
fullwall
4cd729ae20 Remove constructor parameter, add method in Util 2012-05-13 19:41:21 +08:00
fullwall
f3f8fceb6c Use new constructor 2012-05-12 15:18:04 +08:00
fullwall
f8cec0710f Fix bugs with controllables, waypoints, add waypoint editing slot, call damage event 2012-05-12 15:13:58 +08:00
fullwall
99f6f28e24 Fixed an issue with waypoints 2012-05-12 10:01:27 +08:00
fullwall
5bf0e6b0fe Bugfixes, console can select NPCs for use with commands 2012-05-11 23:13:10 +08:00
fullwall
16fb69950a Changes to arm animations, noDamageTicks is decremented again 2012-05-10 20:51:11 +08:00
fullwall
14ae59d090 Merge branch 'master' of http://www.github.com/CitizensDev/Citizens2 2012-05-08 21:38:52 +08:00
fullwall
406dfea4d1 Changes 2012-05-08 21:38:28 +08:00
David Marby
dc3544263d Now shows amount of NPCs instead of amount of servers 2012-05-07 21:44:54 +02:00