diff --git a/assets/mods/basegame/colourmap/pal16.tga b/assets/mods/basegame/colourmap/pal16.tga index a0ad751fd..754bad183 100644 --- a/assets/mods/basegame/colourmap/pal16.tga +++ b/assets/mods/basegame/colourmap/pal16.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a06bd9df0a5f12d3468ad5e7957eb8feb3c855a8092a22eab430e502e6169232 -size 82 +oid sha256:d2330e1bc3ba7575c50bd4c8d78d4c7d9f57f04648f32be1131a327cab8185fc +size 92 diff --git a/assets/mods/basegame/colourmap/pal16.txt b/assets/mods/basegame/colourmap/pal16.txt new file mode 100644 index 000000000..dc29e6af9 --- /dev/null +++ b/assets/mods/basegame/colourmap/pal16.txt @@ -0,0 +1,16 @@ +000 +CCC +666 +FFF +FE0 +E60 +E00 +E2A +427 +32F +3DF +5F0 +353 +742 +C85 +EBA \ No newline at end of file diff --git a/assets/mods/basegame/colourmap/pal64.tga b/assets/mods/basegame/colourmap/pal64.tga index e459452b5..7e6174bfc 100644 --- a/assets/mods/basegame/colourmap/pal64.tga +++ b/assets/mods/basegame/colourmap/pal64.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daab724435520d8fefbd7387ba5ba14cae8556b5a90ba1ade8634dfa57336107 -size 274 +oid sha256:380c9d034957e36c820d4109b1e33405c41283d3f9af7766e350ca3cdc44e256 +size 236 diff --git a/assets/mods/basegame/colourmap/pal64.txt b/assets/mods/basegame/colourmap/pal64.txt new file mode 100644 index 000000000..8e9fa1d50 --- /dev/null +++ b/assets/mods/basegame/colourmap/pal64.txt @@ -0,0 +1,64 @@ +000 +533 +600 +A36 +636 +73B +427 +44C +038 +47B +466 +353 +453 +763 +A63 +742 +333 +E55 +A00 +E2A +D2F +92F +548 +32F +36F +588 +390 +5F0 +684 +BA2 +E60 +854 +666 +EBA +E00 +E6A +E6F +848 +62F +66F +4AF +5BA +8FE +7F8 +9E0 +FE0 +EA0 +C85 +999 +CCC +FDE +EAF +A3B +96F +AAF +7AF +3DF +BFF +BFB +AF6 +FEB +FD7 +E96 +FFF \ No newline at end of file diff --git a/assets/mods/basegame/colourmap/pal64_ryb_based.tga b/assets/mods/basegame/colourmap/pal64_ryb_based.tga deleted file mode 100644 index c20ad0829..000000000 --- a/assets/mods/basegame/colourmap/pal64_ryb_based.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6380af3bbc7b53e9e242533b06e3bcd937dc298bb354fb52ab5666d9eddf52f5 -size 274 diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java index 75184afe0..51104ef08 100644 --- a/src/net/torvald/terrarum/AppLoader.java +++ b/src/net/torvald/terrarum/AppLoader.java @@ -55,6 +55,14 @@ public class AppLoader implements ApplicationListener { public static final String GAME_NAME = "Terrarum"; public static final String COPYRIGHT_DATE_NAME = "Copyright 2013-2019 Torvald (minjaesong)"; + // is this jvm good? + static { + if (System.getProperty("sun.arch.data.model") == null || System.getProperty("sun.arch.data.model").equals("unknown")) { + System.err.println("Error: Your JVM is not supported by the application.\nPlease install the desired version."); + System.exit(1); + } + } + /** *
* Version numbering that follows Semantic Versioning 2.0.0 (https://semver.org/) @@ -139,12 +147,13 @@ public class AppLoader implements ApplicationListener { public static String processor = "(a super-duper virtual processor)"; public static String processorVendor = "(andromeda software development)"; // definitely not taken from "that" demogroup public static String renderer = "(a super-fancy virtual photoradiator)"; - public static String rendererVendor = "(radiosity)"; + public static String rendererVendor = "(aperture science psychovisualcomputation laboratory)"; public static int THREADS = ThreadParallel.INSTANCE.getThreadCount(); public static boolean MULTITHREAD; public static final boolean is32BitJVM = !System.getProperty("sun.arch.data.model").contains("64"); + // some JVMs don't have this property, but they probably don't have "sun.misc.Unsafe" either, so it's no big issue \_(ツ)_/ public static int GL_VERSION; public static final int MINIMAL_GL_VERSION = 320; @@ -169,7 +178,7 @@ public class AppLoader implements ApplicationListener { } public static void setGAME_LOCALE(String value) { - if (value.isEmpty() || value.equals("")) { + if (value.isEmpty()) { GAME_LOCALE = getSysLang(); } else { diff --git a/work_files/graphics/gui/cursor.psd b/work_files/graphics/gui/cursor.psd index e53938e77..0cade0e09 100755 --- a/work_files/graphics/gui/cursor.psd +++ b/work_files/graphics/gui/cursor.psd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a3d035cfdea068f81aa623c933ed955cce39e91d044ed03ff42626b5fd7b3fc -size 48511 +oid sha256:2c55555f6cac3eff9a25f5a6607ff986d6c0c52f6db623f6b9dd67c2e8adc115 +size 54882 diff --git a/work_files/photoshop_tools/terrarum_vc_16col.act b/work_files/photoshop_tools/terrarum_vc_16col.act index 57ac3b319..57e0bb3d1 100644 Binary files a/work_files/photoshop_tools/terrarum_vc_16col.act and b/work_files/photoshop_tools/terrarum_vc_16col.act differ