finalising fonts

Former-commit-id: e85038e433c9e451761a25ce93fa976b847c9e1e
Former-commit-id: 0f59fe3a1b5a174ff63f5a79f11007f0e9d4a204

src/net/torvald/terrarum/StateFontTester.kt

@@ -1,6 +1,6 @@
 package net.torvald.terrarum
 
-import net.torvald.imagefont.GameFontWhite
+import net.torvald.imagefont.GameFontImpl
 import net.torvald.terrarum.langpack.Lang
 import org.newdawn.slick.*
 import org.newdawn.slick.state.BasicGameState
@@ -110,9 +110,10 @@ nopqrstuvwxyz
                 "sjaldgæft    ekki stjórnarskrárvarin",
                 "",
                 "Also supports:",
-                "키스의 고유조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다. 대한민국! 머한민국? (대구) {머구} 명작, 띵작. 유식 윾싀",
+                "‛Unicode’ „quotation marks“—dashes…‼",
+                "으웽~. 얘! 위에 이 애 우유의 양 외워와! 아오~ 왜요? 어여! 예...  웬 초콜릿? 제가 원했던 건 뻥튀기 쬐끔과 의류예요. 얘야, 왜 또 불평?  퀡퇣풿횂",
                 "とりなくこゑす ゆめさませ みよあけわたる ひんかしを そらいろはえて おきつへに ほふねむれゐぬ もやのうち",
-                "鳥啼く声す 夢覚ませ 見よ明け渡る 東を 空色栄えて 沖つ辺に 帆船群れゐぬ 靄の中 (using WenQuanYi)",
+                "鳥啼く声す 夢覚ませ 見よ明け渡る 東を 空色栄えて 沖つ辺に 帆船群れゐぬ 靄の中",
                 ""
         )
 

src/net/torvald/terrarum/Terrarum.kt

@@ -3,7 +3,7 @@ package net.torvald.terrarum
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
-import net.torvald.imagefont.GameFontWhite
+import net.torvald.imagefont.GameFontImpl
 import net.torvald.JsonFetcher
 import net.torvald.JsonWriter
 import net.torvald.imagefont.TinyAlphNum
@@ -94,7 +94,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
     override fun initStatesList(gc: GameContainer) {
         gc.input.enableKeyRepeat()
 
-        fontGame = GameFontWhite()
+        fontGame = GameFontImpl()
         fontSmallNumbers = TinyAlphNum()
 
         // search for real controller
@@ -130,14 +130,14 @@ constructor(gamename: String) : StateBasedGame(gamename) {
         //addState(StateTestingLightning())
         //addState(StateSplash())
         //addState(StateMonitorCheck())
-        addState(StateFontTester())
+        //addState(StateFontTester())
         //addState(StateNoiseTexGen())
         //addState(StateBlurTest())
         //addState(StateShaderTest())
         //addState(StateNoiseTester())
 
-        //ingame = StateInGame()
-        //addState(ingame)
+        ingame = StateInGame()
+        addState(ingame)
 
 
         // foolproof

src/net/torvald/terrarum/langpack/Lang.kt

@@ -1,12 +1,7 @@
 package net.torvald.terrarum.langpack
 
-import net.torvald.CSVFetcher
 import net.torvald.JsonFetcher
-import net.torvald.imagefont.GameFontWhite
 import net.torvald.terrarum.Terrarum
-import org.apache.commons.csv.CSVRecord
-import org.newdawn.slick.SlickException
-
 import java.io.*
 import java.util.*
 

src/net/torvald/terrarum/ui/MessageWindow.kt

@@ -1,6 +1,6 @@
 package net.torvald.terrarum.ui
 
-import net.torvald.imagefont.GameFontWhite
+import net.torvald.imagefont.GameFontImpl
 import com.jme3.math.FastMath
 import net.torvald.terrarum.blendDisable
 import net.torvald.terrarum.blendNormal
@@ -40,7 +40,7 @@ constructor(override var width: Int, isBlackVariant: Boolean) : UICanvas {
             segmentRight = Image("./assets/graphics/gui/message_black_right.tga")
             segmentBody = Image("./assets/graphics/gui/message_black_body.tga")
         }
-        uiFont = GameFontWhite()
+        uiFont = GameFontImpl()
         height = segmentLeft!!.height
         messageWindowRadius = segmentLeft!!.width
         messagesList = arrayOf("", "")