Fix crash with e2eu

kappa-maintainer · Aug 17, 2024 · f1efc03 · f1efc03
1 parent 0d0f581
commit f1efc03
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ apply plugin: "io.github.goooler.shadow"
 apply plugin: 'org.spongepowered.mixin'
 
 
-version "1.3.4-beta"
+version "1.3.5-beta"
 group "gkappa.wrapfix"
 archivesBaseName = "WrapFix"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
diff --git a/src/main/java/gkappa/wrapfix/WrapFix.java b/src/main/java/gkappa/wrapfix/WrapFix.java
@@ -11,7 +11,7 @@
 public class WrapFix {
     public static final String MODID = "wrapfix";
     public static final String NAME = "WrapFix";
-    public static final String VERSION = "1.3.4-beta";
+    public static final String VERSION = "1.3.5-beta";
 
     public static final BreakIterator BREAK_ITERATOR = BreakIterator.getLineInstance();
     public static Logger logger;

diff --git a/src/main/java/gkappa/wrapfix/mixin/MixinFontRenderer.java b/src/main/java/gkappa/wrapfix/mixin/MixinFontRenderer.java
@@ -60,6 +60,7 @@ private void wrapStringToWidthICU4J(String str, int wrapWidth, CallbackInfoRetur
                     list.add(line.toString());
                     fed = i + 1;
                     line.delete(0, line.length()).append(format);
+                    prevFormat = format.length();
                     lineWidth = 0;
                     widths[0] = lineWidth;
                     formats[0] = format.toString();

diff --git a/src/main/java/gkappa/wrapfix/mixin/MixinRenderUtils.java b/src/main/java/gkappa/wrapfix/mixin/MixinRenderUtils.java
@@ -49,6 +49,7 @@ private static void splitString(String str, int wrapWidth, FontRenderer font, Ca
                     list.add(line.toString());
                     fed = i + 1;
                     line.delete(0, line.length()).append(format);
+                    prevFormat = format.length();
                     lineWidth = 0;
                     widths[0] = lineWidth;
                     formats[0] = format.toString();

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "wrapfix",
   "name": "WrapFix",
   "description": "Fix line wrapping",
-  "version": "1.3.4-beta",
+  "version": "1.3.5-beta",
   "mcversion": "1.12.2",
   "url": "",
   "updateUrl": "",