Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-26 02:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Show more then 9 lines of motd on login

Browse Source
This commit is contained in:
snowleo 2011-11-24 05:57:01 +01:00
parent af456a73dd
commit 32e43bf167
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -172,7 +172,7 @@ public class EssentialsPlayerListener extends PlayerListener
{ {
final IText input = new TextInput(user, "motd", true, ess); final IText input = new TextInput(user, "motd", true, ess);
final IText output = new KeywordReplacer(input, user, ess); final IText output = new KeywordReplacer(input, user, ess);
final TextPager pager = new TextPager(output, false); final TextPager pager = new TextPager(output, true);
pager.showPage("1", null, user); pager.showPage("1", null, user);
} }
catch (IOException ex) catch (IOException ex)

39
Essentials/src/com/earth2me/essentials/textreader/TextPager.java
View File

@ -10,17 +10,17 @@ import org.bukkit.command.CommandSender;
public class TextPager public class TextPager
{ {
private final transient IText text; private final transient IText text;
private final transient boolean showHeader; private final transient boolean onePage;
public TextPager(final IText text) public TextPager(final IText text)
{ {
this(text, true); this(text, false);
} }
public TextPager(final IText text, final boolean showHeader) public TextPager(final IText text, final boolean onePage)
{ {
this.text = text; this.text = text;
this.showHeader = showHeader; this.onePage = onePage;
} }
public void showPage(final String pageStr, final String chapterPageStr, final CommandSender sender) public void showPage(final String pageStr, final String chapterPageStr, final CommandSender sender)
@ -40,17 +40,18 @@ public class TextPager
{ {
page = 1; page = 1;
} }
if (page < 1) { if (page < 1)
{
page = 1; page = 1;
} }
int start = (page - 1) * 9; int start = onePage ? 0 : (page - 1) * 9;
if (showHeader) if (!onePage)
{ {
int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0); int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
sender.sendMessage(_("infoPages", page, pages)); sender.sendMessage(_("infoPages", page, pages));
} }
for (int i = start; i < lines.size() && i < start + 9; i++) for (int i = start; i < lines.size() && i < start + (onePage ? 20 : 9); i++)
{ {
sender.sendMessage(lines.get(i)); sender.sendMessage(lines.get(i));
} }
@ -61,7 +62,7 @@ public class TextPager
{ {
if (lines.get(0).startsWith("#")) if (lines.get(0).startsWith("#"))
{ {
if (!showHeader) if (onePage)
{ {
return; return;
} }
@ -91,8 +92,12 @@ public class TextPager
{ {
page = 1; page = 1;
} }
if (page < 1)
{
page = 1;
}
int start = (page - 1) * 9; int start = onePage ? 0 : (page - 1) * 9;
int end; int end;
for (end = 0; end < lines.size(); end++) for (end = 0; end < lines.size(); end++)
{ {
@ -103,12 +108,12 @@ public class TextPager
} }
} }
if (showHeader) if (!onePage)
{ {
int pages = end / 9 + (end % 9 > 0 ? 1 : 0); int pages = end / 9 + (end % 9 > 0 ? 1 : 0);
sender.sendMessage(_("infoPages", page, pages)); sender.sendMessage(_("infoPages", page, pages));
} }
for (int i = start; i < end && i < start + 9; i++) for (int i = start; i < end && i < start + (onePage ? 20 : 9); i++)
{ {
sender.sendMessage(lines.get(i)); sender.sendMessage(lines.get(i));
} }
@ -127,6 +132,10 @@ public class TextPager
{ {
chapterpage = 0; chapterpage = 0;
} }
if (chapterpage < 0)
{
chapterpage = 0;
}
} }
if (!bookmarks.containsKey(pageStr.toLowerCase(Locale.ENGLISH))) if (!bookmarks.containsKey(pageStr.toLowerCase(Locale.ENGLISH)))
@ -144,15 +153,15 @@ public class TextPager
break; break;
} }
} }
final int start = chapterstart + chapterpage * 9; final int start = chapterstart + (onePage ? 0 : chapterpage * 9);
if (showHeader) if (!onePage)
{ {
final int page = chapterpage + 1; final int page = chapterpage + 1;
final int pages = (chapterend - chapterstart) / 9 + ((chapterend - chapterstart) % 9 > 0 ? 1 : 0); final int pages = (chapterend - chapterstart) / 9 + ((chapterend - chapterstart) % 9 > 0 ? 1 : 0);
sender.sendMessage(_("infoChapterPages", pageStr, page, pages)); sender.sendMessage(_("infoChapterPages", pageStr, page, pages));
} }
for (int i = start; i < chapterend && i < start + 9; i++) for (int i = start; i < chapterend && i < start + (onePage ? 20 : 9); i++)
{ {
sender.sendMessage(lines.get(i)); sender.sendMessage(lines.get(i));
} }