Stop inserting line breaks at the end of every GHB line

Hopefully this will let GHB files age more gracefully if Mojang decide to change the book width again

Closes #32

Author: waffle-stomper

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '2.2.0'
+version = '2.2.1'
 group = 'wafflestomper' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = '1.16.1-Ghostwriter'
 

src/main/java/wafflestomper/ghostwriter/BookUtilities.java

@@ -283,8 +283,14 @@ public static List<String> splitStringIntoLines(String str){
 		//Split string at newline characters
 		String[] lines = str.split("\\n");
 		List<String> out = new ArrayList<>();
-		for (String line : lines){
-			out.addAll(Arrays.asList(wrapFormattedStringToWidth(line, BOOK_TEXT_WIDTH).split("" + SPLIT_CHAR)));
+		for (int i=0; i<lines.length; i++){
+			String line = lines[i];
+			// Add newline characters back in
+			if (i < lines.length - 1){
+				line += "\n";
+			}
+			String splitLine = wrapFormattedStringToWidth(line, BOOK_TEXT_WIDTH);
+			out.addAll(Arrays.asList(splitLine.split("" + SPLIT_CHAR)));
 		}
 		//return Arrays.asList(wrapFormattedStringToWidth(str, BOOK_TEXT_WIDTH).split("" + SPLIT_CHAR));
 		return out;

src/main/java/wafflestomper/ghostwriter/FileHandler.java

@@ -342,7 +342,7 @@ public boolean saveBookToGHBFile(String title, String author, List<String> pages
 			List<String> currPage = BookUtilities.splitStringIntoLines(pageAsString);
 			// Replace newline characters with double hashes and add the double hashes to the end of each line
 			for (String line : currPage){
-				toWrite.add(line.replaceAll("\\n", "##") + "##");
+				toWrite.add(line.replaceAll("\\n", "##"));
 			}
 			// Add page breaks with line numbers
 			if (i < pages.size()-1){

update.json

@@ -1,7 +1,7 @@
 {
   "homepage": "https://github.com/waffle-stomper/Ghostwriter/releases",
   "promos":{
-    "1.16.1-recommended": "2.2.0",
+    "1.16.1-recommended": "2.2.1",
     "1.15.2-recommended": "2.0.6",
     "1.15.1-recommended": "2.0.5",
     "1.14.4-recommended": "2.0.4",
@@ -13,6 +13,7 @@
     "1.10-recommended": "1.8.5"
   },
   "1.16.1":{
+    "2.2.1": "Add warnings about excessive characters and lines on a page\nStop inserting GHB line breaks at the end of every line when saving\nDecrease expected page width to 114 pixels to match vanilla",
     "2.2.0": "Hide unused buttons when signing\nAdd extra background for contrast when entering long titles",
     "2.1.9": "Format buttons can now be used when setting the title\nAdded pasting from the clipboard into the title",
     "2.1.8": "Allow titles longer than 15 characters\nThanks Maester Lodish",