Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-05 18:30:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix /npc text incorrect formatting

Browse Source
This commit is contained in:
fullwall 2022-10-15 19:32:25 +08:00
parent 856b40b890
commit b3aa62a060
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/net/citizensnpcs/trait/text/Text.java
View File

@ -109,9 +109,9 @@ public class Text extends Trait implements Runnable, Listener, ConversationAband
String getPageText(int page) { String getPageText(int page) {
Paginator paginator = new Paginator().header("Current Texts"); Paginator paginator = new Paginator().header("Current Texts");
for (int i = 0; i < text.size(); i++) for (int i = 0; i < text.size(); i++) {
paginator.addLine("<a>" + i + " <7>- <e>" + text.get(i)); paginator.addLine("<a>" + i + " <7>- <e>" + text.get(i));
}
return paginator.getPageText(page); return paginator.getPageText(page);
} }
@ -199,6 +199,7 @@ public class Text extends Trait implements Runnable, Listener, ConversationAband
} }
cooldowns.remove(player.getUniqueId()); cooldowns.remove(player.getUniqueId());
} }
sendText(player); sendText(player);
int secondsDelta = delay != -1 ? delay int secondsDelta = delay != -1 ? delay

2
main/src/main/resources/messages_en.properties
View File

@ -340,7 +340,7 @@ citizens.editors.text.range-set=[[Range]] set to [[{0}]].
citizens.editors.text.delay-set=[[Delay]] set to [[{0}]] seconds. citizens.editors.text.delay-set=[[Delay]] set to [[{0}]] seconds.
citizens.editors.text.realistic-looking-set=[[Realistic looking]] set to [[{0}]]. citizens.editors.text.realistic-looking-set=[[Realistic looking]] set to [[{0}]].
citizens.editors.text.speech-bubbles-set=[[Speech bubbles]] set to [[{0}]]. citizens.editors.text.speech-bubbles-set=[[Speech bubbles]] set to [[{0}]].
citizens.editors.text.start-prompt=<click:suggest_command:add ><yellow>Add text</click> | <click:suggest_command:item ><hover:show_text:Set the talk item in hand pattern (set to <yellow>default</yellow> to clear)><yellow>item</hover></click> | <click:suggest_command:range ><hover:show_text:Set the talking range in blocks><yellow>range</hover></click> | <click:suggest_command:delay ><hover:show_text:Set the talking delay in seconds>delay</hover></click><br><click:run_command:/npc text close><hover:show_text:Toggle sending messages when players get close>{0}talk close</hover></click> | <click:run_command:/npc text random><hover:show_text:Toggle random talking>{1}random</hover></click> | <click:run_command:/npc text speech bubbles><hover:show_text:Toggle showing text as holograms instead of chat messages>{2}speech bubbles</hover></click> | <click:run_command:/npc text realistic looking><hover:show_text:Toggle requiring line of sight before speaking>{3}realistic</hover></click> citizens.editors.text.start-prompt=<click:suggest_command:add ><yellow>Add text</click> | <click:suggest_command:item ><hover:show_text:'Set the talk item in hand pattern (set to <yellow>default</yellow> to clear)'><yellow>item</hover></click> | <click:suggest_command:range ><hover:show_text:Set the talking range in blocks><yellow>range</hover></click> | <click:suggest_command:delay ><hover:show_text:Set the talking delay in seconds><yellow>delay</hover></click><br><click:run_command:/npc text close><hover:show_text:Toggle sending messages when players get close>{0}talk close</hover></click> | <click:run_command:/npc text random><hover:show_text:Toggle random talking>{1}random</hover></click> | <click:run_command:/npc text speech bubbles><hover:show_text:Toggle showing text as holograms instead of chat messages>{2}speech bubbles</hover></click> | <click:run_command:/npc text realistic looking><hover:show_text:Toggle requiring line of sight before speaking>{3}realistic</hover></click>
citizens.editors.text.talk-item-set=[[Talk item pattern]] set to [[{0}]]. citizens.editors.text.talk-item-set=[[Talk item pattern]] set to [[{0}]].
citizens.editors.text.text-list-header=Current text: citizens.editors.text.text-list-header=Current text:
citizens.editors.waypoints.wander.editing-regions-stop=Exited the region editor. citizens.editors.waypoints.wander.editing-regions-stop=Exited the region editor.