diff options
| author | GlodBlock <1356392126@qq.com> | 2022-09-09 17:10:18 +0800 |
|---|---|---|
| committer | GlodBlock <1356392126@qq.com> | 2022-09-09 17:10:18 +0800 |
| commit | 57534728461585d58c950f30c2b9e83ebda74b05 (patch) | |
| tree | cbd55daa307701d20a6eaacd2c309f1267e9d390 | |
| parent | 8a883c286ba45d0d4355789d068319addc21ede0 (diff) | |
| download | GT5-Unofficial-57534728461585d58c950f30c2b9e83ebda74b05.tar.gz GT5-Unofficial-57534728461585d58c950f30c2b9e83ebda74b05.tar.bz2 GT5-Unofficial-57534728461585d58c950f30c2b9e83ebda74b05.zip | |
actually apply localization for prefix and suffix
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/detrav/net/ProspectingPacket.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java index d2db2ec860..346b016e11 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -258,7 +258,9 @@ public class BehaviourDetravToolProspector extends Behaviour_None { } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)){ if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue; final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1), null); - addOreToHashMap(werkstoff.getLocalizedName() + " Ore", aPlayer); + String type = BartWorksHelper.isSmallOre(tBlock) ? "oreSmall" : "ore"; + String translated = GT_LanguageManager.getTranslation("bw.blocktype." + type); + addOreToHashMap(translated.replace("%material", werkstoff.getLocalizedName()), aPlayer); } else if (data == 1) { tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index df21799da2..b083e4829e 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -3,6 +3,7 @@ package com.detrav.net; import com.detrav.DetravScannerMod; import com.detrav.gui.DetravScannerGUI; import com.detrav.gui.textures.DetravMapTexture; +import com.detrav.utils.BartWorksHelper; import com.detrav.utils.GTppHelper; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.google.common.base.Objects; @@ -69,7 +70,8 @@ public class ProspectingPacket extends DetravPacket { name = tMaterial.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); } else { final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) (meta * -1), null); - name = werkstoff.getLocalizedName() + " Ore"; + String translated = GT_LanguageManager.getTranslation("bw.blocktype.ore"); + name = translated.replace("%material", werkstoff.getLocalizedName()); rgba = werkstoff != null ? werkstoff.getRGBA() : new short[]{0,0,0,0}; } } else { |