Update to 20w20b1.9.1

8 files changed, 31 insertions, 33 deletions

diff --git a/gradle.properties b/gradle.properties
index b1db372..3696bf2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=20w17a
-	yarn_mappings=20w17a+build.4
-	loader_version=0.8.2+build.194
+	minecraft_version=20w20b
+	yarn_mappings=20w20b+build.7
+	loader_version=0.8.3+build.196
 
 # Mod Properties
-	mod_version = 1.9.0
+	mod_version = 1.9.1
 	maven_group = io.github.cottonmc
 	archives_base_name = LibGui
 
 # Dependencies
-	fabric_version=0.6.2+build.327-1.16
-	jankson_version=2.0.1+j1.2.0
+	fabric_version=0.10.9+build.346-1.16
+	jankson_version=2.1.0+j1.2.0
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java
index 05f3b68..6b53eae 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonClientScreen.java
@@ -66,7 +66,7 @@ public class CottonClientScreen extends Screen implements TextHoverRendererScree
 		}
 		
 		if (getTitle() != null) {
-			textRenderer.method_27528(ScreenDrawing.matrices, getTitle(), left, top, description.getTitleColor());
+			textRenderer.draw(ScreenDrawing.matrices, getTitle(), left, top, description.getTitleColor());
 		}
 	}
 	
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
index 5dca5f1..aa58b26 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/CottonInventoryScreen.java
@@ -198,7 +198,7 @@ public class CottonInventoryScreen<T extends CottonCraftingController> extends H
 		}
 		
 		if (getTitle() != null) {
-			textRenderer.method_27528(ScreenDrawing.matrices, getTitle(), x, y, description.getTitleColor());
+			textRenderer.draw(ScreenDrawing.matrices, getTitle(), x, y, description.getTitleColor());
 		}
 	}
 	
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
index 199909f..1a485b5 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
@@ -315,13 +315,13 @@ public class ScreenDrawing {
 			}
 			break;
 		case CENTER: {
-				int wid = MinecraftClient.getInstance().textRenderer.getStringWidth(s);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(s);
 				int l = (width/2) - (wid/2);
 				MinecraftClient.getInstance().textRenderer.draw(matrices, s, x+l, y, color);
 			}
 			break;
 		case RIGHT: {
-				int wid = MinecraftClient.getInstance().textRenderer.getStringWidth(s);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(s);
 				int l = width - wid;
 				MinecraftClient.getInstance().textRenderer.draw(matrices, s, x+l, y, color);
 			}
@@ -343,19 +343,19 @@ public class ScreenDrawing {
 	public static void drawString(Text text, Alignment align, int x, int y, int width, int color) {
 		switch(align) {
 		case LEFT: {
-				MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x, y, color);
+				MinecraftClient.getInstance().textRenderer.draw(matrices, text, x, y, color);
 			}
 			break;
 		case CENTER: {
-				int wid = MinecraftClient.getInstance().textRenderer.method_27525(text);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(text);
 				int l = (width/2) - (wid/2);
-				MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x+l, y, color);
+				MinecraftClient.getInstance().textRenderer.draw(matrices, text, x+l, y, color);
 			}
 			break;
 		case RIGHT: {
-				int wid = MinecraftClient.getInstance().textRenderer.method_27525(text);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(text);
 				int l = width - wid;
-				MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x+l, y, color);
+				MinecraftClient.getInstance().textRenderer.draw(matrices, text, x+l, y, color);
 			}
 			break;
 		}
@@ -378,13 +378,13 @@ public class ScreenDrawing {
 			}
 			break;
 		case CENTER: {
-				int wid = MinecraftClient.getInstance().textRenderer.getStringWidth(s);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(s);
 				int l = (width/2) - (wid/2);
 				MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, s, x+l, y, color);
 			}
 			break;
 		case RIGHT: {
-				int wid = MinecraftClient.getInstance().textRenderer.getStringWidth(s);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(s);
 				int l = width - wid;
 				MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, s, x+l, y, color);
 			}
@@ -405,19 +405,19 @@ public class ScreenDrawing {
 	public static void drawStringWithShadow(Text text, Alignment align, int x, int y, int width, int color) {
 		switch(align) {
 		case LEFT: {
-				MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x, y, color);
+				MinecraftClient.getInstance().textRenderer.draw(matrices, text, x, y, color);
 			}
 			break;
 		case CENTER: {
-				int wid = MinecraftClient.getInstance().textRenderer.method_27525(text);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(text);
 				int l = (width/2) - (wid/2);
-				MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x+l, y, color);
+				MinecraftClient.getInstance().textRenderer.draw(matrices, text, x+l, y, color);
 			}
 			break;
 		case RIGHT: {
-				int wid = MinecraftClient.getInstance().textRenderer.method_27525(text);
+				int wid = MinecraftClient.getInstance().textRenderer.getWidth(text);
 				int l = width - wid;
-				MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x+l, y, color);
+				MinecraftClient.getInstance().textRenderer.draw(matrices, text, x+l, y, color);
 			}
 			break;
 		}
@@ -444,7 +444,7 @@ public class ScreenDrawing {
 	 * @param color the text color
 	 */
 	public static void drawString(Text text, int x, int y, int color) {
-		MinecraftClient.getInstance().textRenderer.method_27528(matrices, text, x, y, color);
+		MinecraftClient.getInstance().textRenderer.draw(matrices, text, x, y, color);
 	}
 
 	/**
@@ -453,7 +453,7 @@ public class ScreenDrawing {
 	@Deprecated
 	public static void drawCenteredWithShadow(String s, int x, int y, int color) {
 		TextRenderer render = MinecraftClient.getInstance().textRenderer;
-		render.drawWithShadow(matrices, s, (float)(x - render.getStringWidth(s) / 2), (float)y, color);
+		render.drawWithShadow(matrices, s, (float)(x - render.getWidth(s) / 2), (float)y, color);
 	}
 
 	public static int colorAtOpacity(int opaque, float opacity) {
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WItem.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WItem.java
index d3d91b0..5dc3775 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WItem.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WItem.java
@@ -60,7 +60,7 @@ public class WItem extends WWidget {
 		MinecraftClient mc = MinecraftClient.getInstance();
 		ItemRenderer renderer = mc.getItemRenderer();
 		renderer.zOffset = 100f;
-		renderer.renderGuiItem(mc.player, items.get(current), getWidth() / 2 - 9, getHeight() / 2 - 9);
+		renderer.method_27951(mc.player, items.get(current), getWidth() / 2 - 9, getHeight() / 2 - 9);
 		renderer.zOffset = 0f;
 
 		RenderSystem.popMatrix();
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WLabel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WLabel.java
index 1ab42b1..1964675 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WLabel.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WLabel.java
@@ -103,7 +103,7 @@ public class WLabel extends WWidget {
 	@Nullable
 	private Text getTextAt(int x, int y) {
 		if (isWithinBounds(x, y)) {
-			return MinecraftClient.getInstance().textRenderer.method_27527().method_27489(text, x);
+			return MinecraftClient.getInstance().textRenderer.trimToWidth(text, x);
 		}
 		return null;
 	}
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WText.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WText.java
index 2052379..721c007 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WText.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WText.java
@@ -9,8 +9,6 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.Texts;
-import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 
 import javax.annotation.Nullable;
@@ -54,7 +52,7 @@ public class WText extends WWidget {
 	@Environment(EnvType.CLIENT)
 	private void wrapLines() {
 		TextRenderer font = MinecraftClient.getInstance().textRenderer;
-		wrappedLines = font.method_27527().method_27491(text, width, Style.field_24360, false);
+		wrappedLines = font.wrapLines(text, width);
 	}
 
 	@Environment(EnvType.CLIENT)
@@ -65,7 +63,7 @@ public class WText extends WWidget {
 
 		if (lineIndex >= 0 && lineIndex < wrappedLines.size()) {
 			Text line = wrappedLines.get(lineIndex);
-			return font.method_27527().method_27489(line, x);
+			return font.getTextHandler().trimToWidth(line, x);
 		}
 
 		return null;
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
index 75e7628..e25e8d3 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WTextField.java
@@ -321,7 +321,7 @@ public class WTextField extends WWidget {
 		int textColor = this.editable ? this.enabledColor : this.uneditableColor;
 		
 		//TODO: Scroll offset
-		String trimText = font.method_27523(this.text, this.width-OFFSET_X_TEXT);
+		String trimText = font.trimToWidth(this.text, this.width-OFFSET_X_TEXT);
 		
 		boolean selection = (select!=-1);
 		boolean focused = this.isFocused(); //this.isFocused() && this.focusedTicks / 6 % 2 == 0 && boolean_1; //Blinks the cursor
@@ -676,7 +676,7 @@ public class WTextField extends WWidget {
 		TextRenderer font = MinecraftClient.getInstance().textRenderer;
 		int lastAdvance = 0;
 		for(int i=0; i<s.length()-1; i++) {
-			int advance = font.getStringWidth(s.substring(0,i+1));
+			int advance = font.getWidth(s.substring(0,i+1));
 			int charAdvance = advance-lastAdvance;
 			if (x<advance + (charAdvance/2)) return i+1;
 			
@@ -697,7 +697,7 @@ public class WTextField extends WWidget {
 		if (pos==0) return 0;//-1;
 		
 		TextRenderer font = MinecraftClient.getInstance().textRenderer;
-		int ofs = font.getStringWidth(s.substring(0, pos))+1;		
+		int ofs = font.getWidth(s.substring(0, pos))+1;
 		return ofs; //(font.isRightToLeft()) ? -ofs : ofs;
 	}
 }