Fix Mojang's fuck ups

Vectrobe · Aug 16, 2018 · e3914f0 · e3914f0
1 parent efb5058
commit e3914f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+### 2.1.1:
+* Fix Mojang's fuck ups
+
 ### 2.1.0:
 * NEW: Vanilla Mode (configurable) disguises vanilla samples added by Geolosys to look like Vanilla (good for Vanilla+ packs or newcomers), and generates ores with their respective Vanilla variants.
 * NEW: Silk Touching a mod-based material now drops the first entry in the ore dictionary not from Geolosys (i.e.: silk-touching Geolosys Uranium with other mods offering uranium will drop one of those mods' uranium ore instead)

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version=2.1.0
+mod_version=2.1.1
 minecraft_version=1.12.2
 forge_version=14.23.3.2678
 mappings_version=snapshot_20180420

diff --git a/src/main/java/com/oitsjustjose/geolosys/client/TranslationManager.java b/src/main/java/com/oitsjustjose/geolosys/client/TranslationManager.java
@@ -28,7 +28,16 @@ private void loadLanguages()
         for (Language lang : Minecraft.getMinecraft().getLanguageManager().getLanguages())
         {
             translations.put(lang.getLanguageCode(), new HashMap<>());
-            InputStream in = Geolosys.class.getResourceAsStream("/assets/geolosys/lang/" + lang.getLanguageCode().substring(0, lang.getLanguageCode().indexOf("_")) + lang.getLanguageCode().substring(lang.getLanguageCode().indexOf("_")).toUpperCase() + ".lang");
+            InputStream in;
+            try
+            {
+                in = Geolosys.class.getResourceAsStream("/assets/geolosys/lang/" + lang.getLanguageCode().substring(0, lang.getLanguageCode().indexOf("_")) + lang.getLanguageCode().substring(lang.getLanguageCode().indexOf("_")).toUpperCase() + ".lang");
+            }
+            catch (StringIndexOutOfBoundsException e)
+            {
+                in = Geolosys.class.getResourceAsStream("/assets/geolosys/lang/en_US.lang");
+                Geolosys.getInstance().LOGGER.info("Couldn't find langfile " + (lang.getLanguageCode().substring(0, lang.getLanguageCode().indexOf("_")) + lang.getLanguageCode().substring(lang.getLanguageCode().indexOf("_")).toUpperCase()) + ", defaulting to en_US");
+            }
             if (in == null)
             {
                 continue;