From fb4c0ddf9e05d03fa871300eb9df91524d3610df Mon Sep 17 00:00:00 2001 From: crafteverywhere <1196377271@qq.com> Date: Sun, 19 Oct 2014 05:37:19 +0800 Subject: [PATCH] make the manuals translatable. --- .../tinker/manuals/{ => en_US}/casting.png | Bin .../tinker/manuals/{ => en_US}/diary.xml | 0 .../tinker/manuals/{ => en_US}/firstday.xml | 0 .../tinker/manuals/{ => en_US}/materials.xml | 0 .../tinker/manuals/{ => en_US}/oreberries.png | Bin .../tinker/manuals/{ => en_US}/smeltery.xml | 0 .../manuals/{ => en_US}/smelterysmall.png | Bin .../java/tconstruct/client/TProxyClient.java | 24 +++++++++++++----- 8 files changed, 18 insertions(+), 6 deletions(-) rename resources/assets/tinker/manuals/{ => en_US}/casting.png (100%) rename resources/assets/tinker/manuals/{ => en_US}/diary.xml (100%) rename resources/assets/tinker/manuals/{ => en_US}/firstday.xml (100%) rename resources/assets/tinker/manuals/{ => en_US}/materials.xml (100%) rename resources/assets/tinker/manuals/{ => en_US}/oreberries.png (100%) rename resources/assets/tinker/manuals/{ => en_US}/smeltery.xml (100%) rename resources/assets/tinker/manuals/{ => en_US}/smelterysmall.png (100%) diff --git a/resources/assets/tinker/manuals/casting.png b/resources/assets/tinker/manuals/en_US/casting.png similarity index 100% rename from resources/assets/tinker/manuals/casting.png rename to resources/assets/tinker/manuals/en_US/casting.png diff --git a/resources/assets/tinker/manuals/diary.xml b/resources/assets/tinker/manuals/en_US/diary.xml similarity index 100% rename from resources/assets/tinker/manuals/diary.xml rename to resources/assets/tinker/manuals/en_US/diary.xml diff --git a/resources/assets/tinker/manuals/firstday.xml b/resources/assets/tinker/manuals/en_US/firstday.xml similarity index 100% rename from resources/assets/tinker/manuals/firstday.xml rename to resources/assets/tinker/manuals/en_US/firstday.xml diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/en_US/materials.xml similarity index 100% rename from resources/assets/tinker/manuals/materials.xml rename to resources/assets/tinker/manuals/en_US/materials.xml diff --git a/resources/assets/tinker/manuals/oreberries.png b/resources/assets/tinker/manuals/en_US/oreberries.png similarity index 100% rename from resources/assets/tinker/manuals/oreberries.png rename to resources/assets/tinker/manuals/en_US/oreberries.png diff --git a/resources/assets/tinker/manuals/smeltery.xml b/resources/assets/tinker/manuals/en_US/smeltery.xml similarity index 100% rename from resources/assets/tinker/manuals/smeltery.xml rename to resources/assets/tinker/manuals/en_US/smeltery.xml diff --git a/resources/assets/tinker/manuals/smelterysmall.png b/resources/assets/tinker/manuals/en_US/smelterysmall.png similarity index 100% rename from resources/assets/tinker/manuals/smelterysmall.png rename to resources/assets/tinker/manuals/en_US/smelterysmall.png diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 6f517f5c53c..a408db45f2c 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -46,11 +46,23 @@ public void registerRenderer () public void readManuals () { DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); - diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory); - volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory); - volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory); - smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory); - initManualIcons(); + + String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); + + diary = readManual("/assets/tinker/manuals/" + CurrentLanguage +"/diary.xml", dbFactory); + volume1 = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory); + volume2 = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/materials.xml", dbFactory); + smelter = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/smeltery.xml", dbFactory); + + if(diary == null || volume1 == null || volume2 == null || smelter == null) + { + diary = readManual("/assets/tinker/manuals/en_US/diary.xml", dbFactory); + volume1 = readManual("/assets/tinker/manuals/en_US/firstday.xml", dbFactory); + volume2 = readManual("/assets/tinker/manuals/en_US/materials.xml", dbFactory); + smelter = readManual("/assets/tinker/manuals/en_US/smeltery.xml", dbFactory); + } + + initManualIcons(); initManualRecipes(); initManualPages(); manualData = new ManualInfo(); @@ -121,4 +133,4 @@ public void recalculateHealth () ArmorProxyClient.armorExtended.recalculateHealth(mc.thePlayer, TPlayerStats.get(mc.thePlayer)); } -} +} \ No newline at end of file