Update to 1.16.5, fix lectern screen crash, add license

Author: waffle-stomper

.gitignore

@@ -1,5 +1,5 @@
 # local nonsense
-Run Server.*
+*.log
 *.ods
 *.xcf
 Issues
@@ -36,6 +36,5 @@ run
 forge*changelog.txt
 changelog.txt
 CREDITS.txt
-LICENSE.txt
 README.txt
 

LICENSE.txt

@@ -13,9 +13,9 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '2.2.5'
+version = '2.2.6'
 group = 'wafflestomper' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = '1.16.1-Ghostwriter'
+archivesBaseName = '1.16.5-Ghostwriter'
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
@@ -26,7 +26,7 @@ minecraft {
     // stable_#            Stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: '20200820-1.16.1'
+    mappings channel: 'snapshot', version: '20201028-1.16.3'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -90,7 +90,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.1-32.0.108'
+    minecraft 'net.minecraftforge:forge:1.16.5-36.0.42'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"

build.gradle

@@ -107,7 +107,7 @@ public static Pages splitIntoPages(String inStr, int maxLinesPerPage) {
 		List<String> lines = new ArrayList<>();
 		List<ITextComponent> stylizedLines = new ArrayList<>();
 		MutableInt pageStartPos = new MutableInt(0);
-		CharacterManager charactermanager = Minecraft.getInstance().fontRenderer.func_238420_b_();
+		CharacterManager charactermanager = Minecraft.getInstance().fontRenderer.getCharacterManager();
 		charactermanager.func_238353_a_(inStr, SharedConstants.BOOK_TEXT_WIDTH, Style.EMPTY, true,
 				(style, start, end) -> {
 					lineStartIndices.add(start - pageStartPos.getValue());
@@ -159,8 +159,7 @@ public static Pages splitIntoPages(String strIn, int maxLinesPerPage, String pag
 	 */
 	public static String deJSONify(String jsonIn) {
 		try {
-			// func_240643_a_() is fromJson()
-			ITextComponent i = ITextComponent.Serializer.func_240643_a_(jsonIn);
+			ITextComponent i = ITextComponent.Serializer.getComponentFromJson(jsonIn);
 			if (i != null) {
 				return (i.getString());
 			}

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

@@ -51,7 +51,7 @@ private void setup(final FMLClientSetupEvent event) {
 	@SubscribeEvent
 	public void tick(TickEvent event) {
 		if (MC.currentScreen == null) return;
-		if (!lecternArmed || MC.currentScreen.getClass().equals(LecternScreen.class)) return;
+		if (!lecternArmed || !MC.currentScreen.getClass().equals(LecternScreen.class)) return;
 
 		lecternArmed = false;
 		LOG.debug("Lectern screen detected!");

src/main/java/wafflestomper/ghostwriter/Ghostwriter.java

@@ -122,7 +122,7 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
 			String textTitle = this.bookTitle;
 			textTitle += (this.updateCount / 6 % 2 == 0 ? TextFormatting.BLACK : TextFormatting.GRAY) + "_";
 			int bookLeftSide = (this.width - 192) / 2;
-			int titleWidth = this.getTextWidth(textTitle);
+			int titleWidth = this.font.getStringWidth(textTitle);
 			int titleMinX = bookLeftSide + 36 + (114 - titleWidth) / 2;
 			int titleMaxX = titleMinX + titleWidth;
 			// color for the fill() method is MSB->LSB: alpha, r, g, b, (each 8 bits)

src/main/java/wafflestomper/ghostwriter/GhostwriterEditBookScreen.java

@@ -224,10 +224,10 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
 			int allowedSize = DISPLAY_PATH_WIDTH - this.font.getStringWidth("...");
 			String reversed = new StringBuilder(displayPath).reverse().toString();
 			// func_238361_b_() is trimStringToWidth()
-			reversed = this.font.func_238420_b_().func_238361_b_(reversed, allowedSize, Style.EMPTY);
+			reversed = this.font.getCharacterManager().func_238361_b_(reversed, allowedSize, Style.EMPTY);
 			displayPath = "..." + new StringBuilder(reversed).reverse().toString();
 		}
-		this.drawCenteredString(matrixStack, this.font, displayPath, this.width / 2, 20, 0xDDDDDD);
+		drawCenteredString(matrixStack, this.font, displayPath, this.width / 2, 20, 0xDDDDDD);
 
 		this.filenameField.render(matrixStack, mouseX, mouseY, partialTicks);
 

src/main/java/wafflestomper/ghostwriter/GhostwriterFileBrowserScreen.java

@@ -15,7 +15,15 @@ public class SelectableFilenameField extends TextFieldWidget {
 
 	public SelectableFilenameField(FontRenderer fontRenderer, int x, int y, int width, int height, ITextComponent text) {
 		super(fontRenderer, x, y, width, height, text);
-		this.CHARACTER_MANAGER = fontRenderer.func_238420_b_();
+		this.CHARACTER_MANAGER = fontRenderer.getCharacterManager();
+	}
+	
+	
+	/**
+	 * 1.16.5 patch because Widget.getHeight() was removed
+	 */
+	public int getHeight(){
+		return this.height;
 	}
 
 

src/main/java/wafflestomper/ghostwriter/SelectableFilenameField.java

@@ -1,41 +1,38 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-
 # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
+modLoader="javafml"
 
 # A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[28,)"
+loaderVersion="[36,)"  # 36 = 1.16.5
+
+# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
+license="GNU GPL v3"
 
 # A URL to refer people to when problems occur with this mod
-issueTrackerURL="http://my.issue.tracker/" #optional
+issueTrackerURL="https://github.com/waffle-stomper/Ghostwriter/issues"
 
 # A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-    modId="ghostwriter" #mandatory
+[[mods]]
+    modId="ghostwriter"
     version="${file.jarVersion}"
     displayName="Ghostwriter" 
     updateJSONURL="https://raw.githubusercontent.com/waffle-stomper/Ghostwriter/master/update.json"
     displayURL="https://github.com/waffle-stomper/Ghostwriter" 
     logoFile="icon.png"
-    credits="maester_flaminius, SortByNode, and all of the other wonderful people I've met through Minecraft"
-    authors="waffle_stomper and maester_flaminius" #optional
+    credits="maester_flaminius, SortByNode, Lodish, and all of the other wonderful people I've met through Minecraft"
+    authors="waffle_stomper and maester_flaminius"
     description='''
     Utility for dealing with books (backup, restore, copy, paste, etc.).
     '''
 
 [[dependencies.ghostwriter]]
     modId="forge"
     mandatory=true
-    versionRange="[32.0.108,)"
+    versionRange="[36,)"  # 36 = 1.16.5
     ordering="NONE"
     side="CLIENT"
 [[dependencies.ghostwriter]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.16.1]"
+    versionRange="[1.16.5,1.17]"
     ordering="NONE"
     side="CLIENT"

src/main/resources/META-INF/mods.toml

@@ -1,6 +1,7 @@
 {
   "homepage": "https://github.com/waffle-stomper/Ghostwriter/releases",
   "promos":{
+    "1.16.5-recommended": "2.2.6",
     "1.16.1-recommended": "2.2.5",
     "1.15.2-recommended": "2.0.6",
     "1.15.1-recommended": "2.0.5",
@@ -12,6 +13,9 @@
     "1.11-recommended": "1.8.7",
     "1.10-recommended": "1.8.5"
   },
+  "1.16.5": {
+    "2.2.6": "Beta 1.16.5 release"
+  },
   "1.16.1":{
     "2.2.5": "Fix index out of range error when removing book pages\nEsc in signed preview now returns to edit screen\nMore internal changes to improve maintainability",
     "2.2.4": "Add optional protection to filename extension in file browser\nRemove 16 character title limit when loading bookworm books\nRefactor constants\nRemove some single use functions\nPressing escape in file browser now reverts back to the book, rather than exiting completely\nMassive internal code shuffle to make the project easier to maintain",