From d0d8ade4b6809081eae6ec374047d2c8afd5b217 Mon Sep 17 00:00:00 2001 From: FuckYou Date: Wed, 16 Nov 2016 11:17:28 +0400 Subject: [PATCH] Minor update - Added JOE and localization support --- .idea/libraries/JOE.xml | 11 +++++++++++ TAL.iml | 1 + libs/JOE.jar | Bin 0 -> 13028 bytes src/Launcher/Main.java | 6 ++++++ src/assets/lang/default.txt | 2 ++ 5 files changed, 20 insertions(+) create mode 100644 .idea/libraries/JOE.xml create mode 100644 libs/JOE.jar diff --git a/.idea/libraries/JOE.xml b/.idea/libraries/JOE.xml new file mode 100644 index 0000000..148b25d --- /dev/null +++ b/.idea/libraries/JOE.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/TAL.iml b/TAL.iml index f6ccf03..3948b33 100644 --- a/TAL.iml +++ b/TAL.iml @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/libs/JOE.jar b/libs/JOE.jar new file mode 100644 index 0000000000000000000000000000000000000000..4d4c19ed84869df2f5d23b51b851d02bcb4b86ac GIT binary patch literal 13028 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 YP4ahiaENyV_+Ov>U+OXjQ{`u literal 0 HcmV?d00001 diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index 2e1a30a..99f5cdf 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -17,6 +17,7 @@ package Launcher; import Launcher.net.Updater; import com.tofvesson.async.Async; +import com.tofvesson.joe.Localization; import com.tofvesson.reflection.SafeReflection; import javafx.animation.KeyFrame; import javafx.animation.Timeline; @@ -39,10 +40,12 @@ import javafx.util.Duration; import java.io.File; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /* Do not go further. you risk your life. Read guideline above. Anyone reading past this point is no longer under our responsibility. +Beware the crocodiles on line 100! */ public class Main extends Application { @@ -202,6 +205,9 @@ public class Main extends Application { } public static void main(String[] args) throws Exception{ + Localization l = new Localization(new File(Main.class.getResource("/assets/lang").getFile())); // Create a localization with aggressive loading + System.out.println(Arrays.toString(l.getLanguageNames())); + System.out.println("Success: "+l.get("du_label")); Main.args = args; if (args.length > 0) { File f = new File(args[0]); diff --git a/src/assets/lang/default.txt b/src/assets/lang/default.txt index e486751..d84f458 100644 --- a/src/assets/lang/default.txt +++ b/src/assets/lang/default.txt @@ -1,2 +1,4 @@ Language: Default +du_label:Launching... +du_updater:Updating... \ No newline at end of file