2.7b release

LazyWizard · Dec 10, 2021 · a80a2f1 · a80a2f1
1 parent 1a1d12b
commit a80a2f1
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 23 deletions.
diff --git a/...ries/org_jetbrains_annotations_22_0_0.xml → ...ries/org_jetbrains_annotations_23_0_0.xml b/...ries/org_jetbrains_annotations_22_0_0.xml → ...ries/org_jetbrains_annotations_23_0_0.xml
diff --git a/LazyLib.iml b/LazyLib.iml
@@ -14,7 +14,7 @@
     <orderEntry type="library" name="Starsector API" level="application" />
     <orderEntry type="library" name="Console Commands" level="application" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="org.jetbrains:annotations:22.0.0" level="project" />
+    <orderEntry type="library" name="org.jetbrains:annotations:23.0.0" level="project" />
     <orderEntry type="library" name="org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2" level="application" />
   </component>
 </module>
diff --git a/docstubs/org/lazywizard/lazylib/ui/LazyFont.java b/docstubs/org/lazywizard/lazylib/ui/LazyFont.java
@@ -434,7 +434,7 @@ public DrawableString createText()
     //<editor-fold desc="LazyChar" defaultstate="collapsed">
 
     /**
-     * Keeps track of the metadata for each supported character in a font. This is used internally to render and wrap
+     * Keeps track of the metadata for each supported character in a font. This is used internally to wrap and render
      * text, and it is unlikely that end users will ever need to use this class or any of its methods in their code.
      * <p>
      * In the rare case that these methods are needed, their names should match the bitmap font file format found <a
@@ -582,9 +582,7 @@ public enum TextAnchor
 
     /**
      * Represents the alignment of text within a {@link DrawableString}'s render area. Text can be left-aligned (the
-     * default), centered, or right-aligned. Anything other than left-aligned requires the {@link DrawableString}'s
-     * maximum width to be set, either through its construction in {@link #createText()} or by calling {@link
-     * DrawableString#setMaxWidth(float)}.
+     * default), centered, or right-aligned.
      *
      * @since 2.7
      */
@@ -595,15 +593,11 @@ public enum TextAlignment
          */
         LEFT,
         /**
-         * Text will be drawn centered within the text area. <b>Note:</b> the {@link DrawableString} <i>must</i> have
-         * its maximum width set (either through its construction in {@link #createText()} or by calling {@link
-         * DrawableString#setMaxWidth(float)}) for this to work properly.
+         * Text will be drawn centered within the text area.
          */
         CENTER,
         /**
-         * Text will align with the right of the text area. <b>Note:</b> the {@link DrawableString} <i>must</i> have
-         * its maximum width set (either through its construction in {@link #createText()} or by calling {@link
-         * DrawableString#setMaxWidth(float)}) for this to work properly.
+         * Text will align with the right of the text area.
          */
         RIGHT
     }

diff --git a/ext/LazyLib-Extensions.iml b/ext/LazyLib-Extensions.iml
@@ -10,6 +10,6 @@
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="Starsector API" level="application" />
     <orderEntry type="module" module-name="LazyLib" />
-    <orderEntry type="library" name="org.jetbrains:annotations:22.0.0" level="project" />
+    <orderEntry type="library" name="org.jetbrains:annotations:23.0.0" level="project" />
   </component>
 </module>
diff --git a/mod/changelog.txt b/mod/changelog.txt
@@ -1,3 +1,12 @@
+ 2.7b (December 10, 2021)
+==========================
+Updated to be compatible with Starsector 0.95.1a
+Updated bundled libraries:
+ - jetbrains-annotations: v22.0.0 -> 23.0.0
+Changes to LazyFont.DrawableString:
+ - Center/right-aligned text no longer requires maxWidth to be set
+ - setRenderDebugBounds() now shows anchor and max size
+
  2.7 (October 22, 2021)
 ========================
 Fixed links to online Starsector API in javadoc.zip

diff --git a/mod/lazylib.version b/mod/lazylib.version
@@ -7,6 +7,6 @@
     {
         "major":2,
         "minor":7,
-        "patch":0
+        "patch":b
     }
 }
diff --git a/mod/mod_info.json b/mod/mod_info.json
@@ -3,9 +3,9 @@
     "name": "LazyLib",
     "author": "LazyWizard",
     "utility": "true",
-    "version": "2.7",
+    "version": "2.7b",
     "description": "A collection of classes to aid modding. Not a mod in itself, but required by certain other mods.",
-    "gameVersion": "0.95a-RC15",
+    "gameVersion": "0.95.1a-RC3",
     "jars": ["jars/LazyLib.jar","jars/LazyLib-Kotlin.jar","jars/lib/Kotlin-Runtime.jar"],
     "modPlugin": "org.lazywizard.lazylib.LazyLib"
 }
diff --git a/src/org/lazywizard/lazylib/combat/entities/EntityBase.java b/src/org/lazywizard/lazylib/combat/entities/EntityBase.java
@@ -225,4 +225,12 @@ public Map<String, Object> getCustomData()
     {
         return null;
     }
+
+    /**
+     * <small><i>NONFUNCTIONAL/PLACEHOLDER</i></small>
+     */
+    @Override
+    public void setHitpoints(float hitpoints)
+    {
+    }
 }
diff --git a/src/org/lazywizard/lazylib/ui/LazyFont.kt b/src/org/lazywizard/lazylib/ui/LazyFont.kt
@@ -595,6 +595,7 @@ class LazyFont private constructor(
                 }
 
                 // Calculate alignment adjustment for the text on this line
+                // TODO: Update Javadoc to mention how maxWidth is handled with non-left alignment
                 xOffset = when (alignment) {
                     TextAlignment.LEFT -> 0f
                     TextAlignment.CENTER -> (maxWidthForOffset - calcWidth(line, fontSize)) / 2f
@@ -728,7 +729,7 @@ class LazyFont private constructor(
                 glVertex2f(0f, -height)
                 glEnd()
 
-                // Draw maxWidth/maxHeight
+                // Draw maxWidth/maxHeight if at least one has been set
                 if (maxWidth != Float.MAX_VALUE || maxHeight != Float.MAX_VALUE) {
                     val displayedMaxWidth =
                         if (maxWidth == Float.MAX_VALUE) width
@@ -746,7 +747,7 @@ class LazyFont private constructor(
                     glEnd()
                 }
 
-                // Draw anchor
+                // Draw anchor (origin of rendering)
                 glColor(Color.RED)
                 glBegin(GL_LINES)
                 glVertex2f(-offset.x - 3f, -offset.y - 3f)

diff --git a/tests/LazyLib-Tests.iml b/tests/LazyLib-Tests.iml
@@ -12,7 +12,7 @@
     <orderEntry type="library" name="Console Commands" level="application" />
     <orderEntry type="module" module-name="LazyLib" />
     <orderEntry type="module" module-name="LazyLib-Extensions" />
-    <orderEntry type="library" name="org.jetbrains:annotations:22.0.0" level="project" />
+    <orderEntry type="library" name="org.jetbrains:annotations:23.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="junit:junit:4.13.2" level="application" />
   </component>
 </module>