From 50a485b14dc8be0af8ea2dcca5cb75d37911cad5 Mon Sep 17 00:00:00 2001 From: crafteverywhere <1196377271@qq.com> Date: Thu, 23 Oct 2014 07:15:22 +0800 Subject: [PATCH] Add null check for each manual and change the localtions of pics. --- .../tinker/manuals/{en_US => }/casting.png | Bin .../tinker/manuals/{en_US => }/oreberries.png | Bin .../manuals/{en_US => }/smelterysmall.png | Bin .../java/tconstruct/client/TProxyClient.java | 38 +++++++++++++----- 4 files changed, 27 insertions(+), 11 deletions(-) rename resources/assets/tinker/manuals/{en_US => }/casting.png (100%) rename resources/assets/tinker/manuals/{en_US => }/oreberries.png (100%) rename resources/assets/tinker/manuals/{en_US => }/smelterysmall.png (100%) diff --git a/resources/assets/tinker/manuals/en_US/casting.png b/resources/assets/tinker/manuals/casting.png similarity index 100% rename from resources/assets/tinker/manuals/en_US/casting.png rename to resources/assets/tinker/manuals/casting.png diff --git a/resources/assets/tinker/manuals/en_US/oreberries.png b/resources/assets/tinker/manuals/oreberries.png similarity index 100% rename from resources/assets/tinker/manuals/en_US/oreberries.png rename to resources/assets/tinker/manuals/oreberries.png diff --git a/resources/assets/tinker/manuals/en_US/smelterysmall.png b/resources/assets/tinker/manuals/smelterysmall.png similarity index 100% rename from resources/assets/tinker/manuals/en_US/smelterysmall.png rename to resources/assets/tinker/manuals/smelterysmall.png diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 0379481f..1ab4de61 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -46,23 +46,39 @@ public class TProxyClient extends TProxyCommon public void readManuals () { DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); + String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); - String CurrentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); + Document diary_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage +"/diary.xml", dbFactory); + Document volume1_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/firstday.xml", dbFactory); + Document volume2_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/materials.xml", dbFactory); + Document smelter_cl = readManual("/assets/tinker/manuals/" + CurrentLanguage + "/smeltery.xml", dbFactory); - 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); - } + + if(diary_cl != null) + { + diary = diary_cl; + } + + if(volume1_cl != null) + { + volume1 = volume1_cl; + } + + if(volume2_cl != null) + { + volume2 = volume2_c1; + } + + if(smelter_cl != null) + { + smelter = smelter_cl; + } - initManualIcons(); + initManualIcons(); initManualRecipes(); initManualPages(); manualData = new ManualInfo(); @@ -133,4 +149,4 @@ public class TProxyClient extends TProxyCommon ArmorProxyClient.armorExtended.recalculateHealth(mc.thePlayer, TPlayerStats.get(mc.thePlayer)); } -} +} \ No newline at end of file