2.4g release

.gitignore

@@ -1 +1,5 @@
-out/
+out/
+tests/
+.scannerwork/
+*.lnk
+/docs/javadoc.zip

LazyLib.iml

@@ -13,8 +13,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Starsector API" level="application" />
     <orderEntry type="library" name="Console Commands" level="application" />
-    <orderEntry type="library" name="org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0" level="application" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="org.jetbrains:annotations:18.0.0" level="project" />
+    <orderEntry type="library" name="org.jetbrains:annotations:20.1.0" level="project" />
+    <orderEntry type="library" name="org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2" level="application" />
   </component>
 </module>

docs/deprecated-list.html

@@ -72,6 +72,30 @@
 <div class="header">
 <h1 title="Deprecated API" class="title">Deprecated API</h1>
 <h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#method">Deprecated Methods</a></li>
+</ul>
+</div>
+<div class="contentContainer"><a name="method">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
+<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="org/lazywizard/lazylib/ui/LazyFont.html#drawText-java.lang.String-float-float-float-float-float-">org.lazywizard.lazylib.ui.LazyFont.drawText(String, float, float, float, float, float)</a>
+<div class="block"><span class="deprecationComment">Use <a href="org/lazywizard/lazylib/ui/LazyFont.html#createText-java.lang.String-java.awt.Color-float-float-float-"><code>LazyFont.createText(String, Color, float, float, float)</code></a> instead! This will be removed soon.</span></div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">

docs/index-files/index-3.html

@@ -117,8 +117,9 @@ <h2 class="title">D</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="../org/lazywizard/lazylib/ui/LazyFont.html#drawText-java.lang.String-float-float-float-float-float-">drawText(String, float, float, float, float, float)</a></span> - Method in class <a href="../org/lazywizard/lazylib/ui/LazyFont.html" title="class in org.lazywizard.lazylib.ui">LazyFont</a></dt>
 <dd>
-<div class="block">Renders a block of text, used to manually create display lists - <b>not recommended for general
- usage</b>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="../org/lazywizard/lazylib/ui/LazyFont.html#createText-java.lang.String-java.awt.Color-float-float-float-"><code>LazyFont.createText(String, Color, float, float, float)</code></a> instead! This will be removed soon.</span></div>
+</div>
 </dd>
 <dt><a href="../org/lazywizard/lazylib/opengl/DrawUtils.html" title="class in org.lazywizard.lazylib.opengl"><span class="typeNameLink">DrawUtils</span></a> - Class in <a href="../org/lazywizard/lazylib/opengl/package-summary.html">org.lazywizard.lazylib.opengl</a></dt>
 <dd>

docs/org/lazywizard/lazylib/ui/LazyFont.html

@@ -17,8 +17,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9,"i14":10,"i15":10,"i16":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":42,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9,"i14":10,"i15":10,"i16":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -245,7 +245,7 @@ <h3>Nested Class Summary</h3>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -312,8 +312,9 @@ <h3>Method Summary</h3>
         float&nbsp;fontSize,
         float&nbsp;maxWidth,
         float&nbsp;maxHeight)</code>
-<div class="block">Renders a block of text, used to manually create display lists - <b>not recommended for general
- usage</b>.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
+<div class="block"><span class="deprecationComment">Use <a href="../../../../org/lazywizard/lazylib/ui/LazyFont.html#createText-java.lang.String-java.awt.Color-float-float-float-"><code>createText(String, Color, float, float, float)</code></a> instead! This will be removed soon.</span></div>
+</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
@@ -625,13 +626,17 @@ <h4>getChar</h4>
 <li class="blockList">
 <h4>drawText</h4>
 <pre>@NotNull
+ <a href="https://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
 public&nbsp;@NotNull <a href="http://legacy.lwjgl.org/javadoc/org/lwjgl/util/vector/Vector2f.html?is-external=true" title="class or interface in org.lwjgl.util.vector">Vector2f</a>&nbsp;drawText(<a href="https://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;text,
-                                            float&nbsp;x,
-                                            float&nbsp;y,
-                                            float&nbsp;fontSize,
-                                            float&nbsp;maxWidth,
-                                            float&nbsp;maxHeight)</pre>
-<div class="block">Renders a block of text, used to manually create display lists - <b>not recommended for general
+                                                          float&nbsp;x,
+                                                          float&nbsp;y,
+                                                          float&nbsp;fontSize,
+                                                          float&nbsp;maxWidth,
+                                                          float&nbsp;maxHeight)</pre>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use <a href="../../../../org/lazywizard/lazylib/ui/LazyFont.html#createText-java.lang.String-java.awt.Color-float-float-float-"><code>createText(String, Color, float, float, float)</code></a> instead! This will be removed soon.</span></div>
+<div class="block"><b>DEPRECATED AND SLATED FOR REMOVAL - DO NOT USE!</b>
+ <br>
+ Renders a block of text, used to manually create display lists - <b>not recommended for general
  usage</b>. Use <a href="../../../../org/lazywizard/lazylib/ui/LazyFont.html#createText-java.lang.String-java.awt.Color-float-float-float-"><code>createText(String, Color, float, float, float)</code></a> instead.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>

docs/overview-tree.html

@@ -145,9 +145,9 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle"><a href="https://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements <a href="https://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, <a href="https://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle"><a href="org/lazywizard/lazylib/combat/entities/SimpleEntity.SimpleEntityType.html" title="enum in org.lazywizard.lazylib.combat.entities"><span class="typeNameLink">SimpleEntity.SimpleEntityType</span></a></li>
-<li type="circle"><a href="org/lazywizard/lazylib/combat/DefenseType.html" title="enum in org.lazywizard.lazylib.combat"><span class="typeNameLink">DefenseType</span></a></li>
 <li type="circle"><a href="org/lazywizard/lazylib/campaign/CampaignUtils.IncludeRep.html" title="enum in org.lazywizard.lazylib.campaign"><span class="typeNameLink">CampaignUtils.IncludeRep</span></a></li>
+<li type="circle"><a href="org/lazywizard/lazylib/combat/DefenseType.html" title="enum in org.lazywizard.lazylib.combat"><span class="typeNameLink">DefenseType</span></a></li>
+<li type="circle"><a href="org/lazywizard/lazylib/combat/entities/SimpleEntity.SimpleEntityType.html" title="enum in org.lazywizard.lazylib.combat.entities"><span class="typeNameLink">SimpleEntity.SimpleEntityType</span></a></li>
 </ul>
 </li>
 </ul>

docstubs/org/lazywizard/lazylib/ui/LazyFont.java

@@ -269,6 +269,8 @@ public LazyFont.LazyChar getChar(char character)
     }
 
     /**
+     * <b>DEPRECATED AND SLATED FOR REMOVAL - DO NOT USE!</b>
+     * <br>
      * Renders a block of text, used to manually create display lists - <b>not recommended for general
      * usage</b>. Use {@link LazyFont#createText(String, Color, float, float, float)} instead.
      *
@@ -285,8 +287,10 @@ public LazyFont.LazyChar getChar(char character)
      * @see LazyFont#createText(String, Color, float, float, float) for when you need to draw the same
      *         block of text multiple times (99% of use cases).
      * @since 2.3
+     * @deprecated Use {@link #createText(String, Color, float, float, float)} instead! This will be removed soon.
      */
     @NotNull
+    @Deprecated
     public Vector2f drawText(String text, float x, float y, float fontSize, float maxWidth, float maxHeight)
     {
         return null;

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:18.0.0" level="project" />
+    <orderEntry type="library" name="org.jetbrains:annotations:20.1.0" level="project" />
   </component>
 </module>

ext/src/org/lazywizard/lazylib/ext/combat/CombatExtensions.kt

@@ -37,7 +37,6 @@ fun CombatEntityAPI.getNearbyEnemies(range: Float): List<ShipAPI> = AIUtils.getN
 fun CombatEntityAPI.getEnemiesOnMap(): List<ShipAPI> = AIUtils.getEnemiesOnMap(this)
 
 fun ShipAPI.canUseSystemThisFrame(): Boolean = AIUtils.canUseSystemThisFrame(this)
-fun ShipAPI.getFleetMember(): FleetMemberAPI? = CombatUtils.getFleetMember(this)
 fun ShipAPI.isVisibleToSide(side: Int): Boolean = CombatUtils.isVisibleToSide(this, side)
 
 fun CombatEntityAPI.applyForce(direction: Vector2f, force: Float) = CombatUtils.applyForce(this, direction, force)

mod/changelog.txt

@@ -1,7 +1,23 @@
+ 2.4g (January 18, 2021)
+=========================
+Updated bundled libraries:
+ - kotlin-stdlib: v1.3.61 -> v1.4.21
+ - kotlinx-coroutines: v1.2.0 -> v1.4.2
+ - jetbrains-annotations: v13.0 -> v20.1.0
+ - removed kotlinx-atomicfu (this was an erroneous dependency added by
+   an earlier version of kotlinx-coroutines and wasn't used for anything)
+Changes to LazyFont:
+ - Rewrote DrawableString to use vertex buffers instead of display lists.
+   This should fix a bug that caused text corruption and visual glitches
+   when DrawableStrings were rendered in the campaign layer
+Deprecated in LazyFont:
+ - Deprecated drawText(String text, float x, float y, float fontSize,
+   float maxWidth, float maxHeight), use createText() instead
+
  2.4f (January 31, 2020)
 =========================
 Updated bundled Kotlin runtime library to v1.3.61
-Javadoc is now available online at https://lazywizard.github.io/
+Javadoc is now available online at https://lazywizard.github.io/lazylib
 Moved .version file hosting to GitHub
 
  2.4e (April 21, 2019)

mod/lazylib.version

@@ -7,6 +7,6 @@
     {
         "major":2,
         "minor":4,
-        "patch":f
+        "patch":g
     }
 }