summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-01-13 22:18:08 +0000
committerKHobbits <rob@khobbits.co.uk>2013-01-13 22:18:08 +0000
commitffe2a283d2461139ab43d067fae1f249759ff6d5 (patch)
tree668bfc99d327c2ff35289abf6a0bc74e102f35e2
parentbd22aec38a64580b48b3a016954e55fb17482efd (diff)
downloadEssentials-ffe2a283d2461139ab43d067fae1f249759ff6d5.tar
Essentials-ffe2a283d2461139ab43d067fae1f249759ff6d5.tar.gz
Essentials-ffe2a283d2461139ab43d067fae1f249759ff6d5.tar.lz
Essentials-ffe2a283d2461139ab43d067fae1f249759ff6d5.tar.xz
Essentials-ffe2a283d2461139ab43d067fae1f249759ff6d5.zip
Cleanup of book meta.
-rw-r--r--Essentials/src/com/earth2me/essentials/textreader/BookInput.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/textreader/BookPager.java16
2 files changed, 3 insertions, 15 deletions
diff --git a/Essentials/src/com/earth2me/essentials/textreader/BookInput.java b/Essentials/src/com/earth2me/essentials/textreader/BookInput.java
index 26ee1dad5..d8df79ec2 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/BookInput.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/BookInput.java
@@ -17,7 +17,7 @@ public class BookInput implements IText
public BookInput(final String filename, final boolean createFile, final IEssentials ess) throws IOException
{
- File file = null;
+ File file = null;
if (file == null || !file.exists())
{
file = new File(ess.getDataFolder(), filename + ".txt");
diff --git a/Essentials/src/com/earth2me/essentials/textreader/BookPager.java b/Essentials/src/com/earth2me/essentials/textreader/BookPager.java
index 0cd2c630e..1a2d80e9e 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/BookPager.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/BookPager.java
@@ -1,12 +1,9 @@
package com.earth2me.essentials.textreader;
-import static com.earth2me.essentials.I18n._;
-import com.earth2me.essentials.Util;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.logging.Logger;
public class BookPager
@@ -22,10 +19,9 @@ public class BookPager
{
List<String> lines = text.getLines();
List<String> chapters = text.getChapters();
+ List<String> pageLines = new ArrayList<String>();
Map<String, Integer> bookmarks = text.getBookmarks();
- int chapterpage = 0;
-
//This checks to see if we have the chapter in the index
if (!bookmarks.containsKey(pageStr.toLowerCase(Locale.ENGLISH)))
{
@@ -44,8 +40,6 @@ public class BookPager
}
}
- List<String> pageLines = new ArrayList<String>();
-
for (int lineNo = chapterstart; lineNo < chapterend; lineNo += 1)
{
String pageLine = "\u00a70" + lines.get(lineNo);
@@ -72,7 +66,7 @@ public class BookPager
if (letter == '\u00a7')
{
Character nextLetter = pageLine.charAt(pointer + 1);
- if (nextLetter == 'l')
+ if (nextLetter == 'l' || nextLetter == 'L')
{
weight = 1.25;
}
@@ -100,23 +94,17 @@ public class BookPager
}
List<String> pages = new ArrayList<String>();
-
for (int count = 0; count < pageLines.size(); count += 12)
{
-
StringBuilder newPage = new StringBuilder();
-
for (int i = count; i < count + 12 && i < pageLines.size(); i++)
{
newPage.append("\n").append(pageLines.get(i));
- //Logger.getLogger("Minecraft").info("adding line " + pageLines.get(i) + " to book");
}
- //Logger.getLogger("Minecraft").info("adding page to book");
pages.add(newPage.toString());
}
return pages;
-
}
}