fix: actually fix zeroing shifts

mcbrawls · Dec 15, 2024 · 324d4c2 · 324d4c2
1 parent b9443c0
commit 324d4c2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/kotlin/net/mcbrawls/packin/font/shift/FontShiftHandler.kt b/src/main/kotlin/net/mcbrawls/packin/font/shift/FontShiftHandler.kt
@@ -13,10 +13,6 @@ interface FontShiftHandler {
     val shiftVectors: Set<Vector2f>
 
     operator fun get(shift: Vector2f = Vector2f()): Identifier {
-        if (shift.x == 0.0f && shift.y == 0.0f) {
-            return fontId
-        }
-
         val closest = getClosest(shift)
         return FontProvider.createShiftedFontId(fontId, closest)
     }

diff --git a/src/main/kotlin/net/mcbrawls/packin/font/shift/VerticalFontShiftHandler.kt b/src/main/kotlin/net/mcbrawls/packin/font/shift/VerticalFontShiftHandler.kt
@@ -16,7 +16,7 @@ class VerticalFontShiftHandler(
 
     val shifts: SortedSet<Float> = ranges.flatMap(ShiftRange::collectShifts).toSortedSet()
 
-    override val shiftVectors: Set<Vector2f> = shifts.map { Vector2f(0.0f, it) }.toSet()
+    override val shiftVectors: Set<Vector2f> = shifts.map { Vector2f(0.0f, it) }.toSet() + Vector2f()
 
     operator fun get(shift: Float): Identifier {
         return this[Vector2f(0.0f, shift)]

diff --git a/src/main/kotlin/net/mcbrawls/packin/resource/provider/FontProvider.kt b/src/main/kotlin/net/mcbrawls/packin/resource/provider/FontProvider.kt
@@ -94,6 +94,10 @@ class FontProvider(
 
     companion object {
         fun createShiftedFontId(fontId: Identifier, shift: Vector2f): Identifier {
+            if (shift.x == 0.0f && shift.y == 0.0f) {
+                return fontId
+            }
+
             val shiftString = "${shift.x}_${shift.y}"
             return fontId.withPath { "${it}_shift_$shiftString" }
         }