diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-07-23 18:33:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 18:33:22 +0200 |
| commit | 074ed7431d9b9b585938f0b6cdfcb22fb14f52c6 (patch) | |
| tree | 4df508240abcedb1f0e20f4617f611fa0fa6ffe0 | |
| parent | c1c87c9f07db900cb3c59e32b2c5032d94e637eb (diff) | |
| parent | ed51caa168ce7bbfde761690043bf72addc2478b (diff) | |
| download | GT5-Unofficial-074ed7431d9b9b585938f0b6cdfcb22fb14f52c6.tar.gz GT5-Unofficial-074ed7431d9b9b585938f0b6cdfcb22fb14f52c6.tar.bz2 GT5-Unofficial-074ed7431d9b9b585938f0b6cdfcb22fb14f52c6.zip | |
Merge pull request #13 from repo-alt/master
| -rw-r--r-- | libs/gregtech-5.09.36.00-dev.jar (renamed from libs/gregtech-5.09.34.08-dev.jar) | bin | 11044412 -> 11449339 bytes | |||
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java | 11 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libs/gregtech-5.09.34.08-dev.jar b/libs/gregtech-5.09.36.00-dev.jar Binary files differindex e67ee1e8cc..6563b5edf3 100644 --- a/libs/gregtech-5.09.34.08-dev.jar +++ b/libs/gregtech-5.09.36.00-dev.jar diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java index a2961f5689..65c25d0b1b 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -4,6 +4,7 @@ import com.detrav.DetravScannerMod; import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.utils.BartWorksHelper; import com.detrav.utils.GTppHelper; +import cpw.mods.fml.common.registry.LanguageRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaBase_Item; @@ -144,7 +145,8 @@ public class BehaviourDetravToolProspector extends Behaviour_None { if (aTileEntity instanceof GT_TileEntity_Ores) { GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) aTileEntity; short meta = gt_entity.getMetaData(); - String name = Materials.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name"), meta%1000); + String format = LanguageRegistry.instance().getStringLocalization("gt.blockores." + meta + ".name"); + String name = Materials.getLocalizedNameForItem(format, meta%1000); addOreToHashMap(name, aPlayer); if (!aPlayer.capabilities.isCreativeMode) aItem.doDamage(aStack, this.mCosts); @@ -178,7 +180,8 @@ public class BehaviourDetravToolProspector extends Behaviour_None { && ((GT_TileEntity_Ores) tTileEntity).mNatural) { tMetaID = (short)((GT_TileEntity_Ores) tTileEntity).getMetaData(); try { - String name = Materials.getLocalizedNameForItem(GT_LanguageManager.getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"), tMetaID%1000); + String format = LanguageRegistry.instance().getStringLocalization(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); + String name = Materials.getLocalizedNameForItem(format, tMetaID%1000); if (data != 1 && name.startsWith(small_ore_keyword)) continue; addOreToHashMap(name, aPlayer); } @@ -201,8 +204,8 @@ public class BehaviourDetravToolProspector extends Behaviour_None { try { try { tMetaID = (short)tAssotiation.mMaterial.mMaterial.mMetaItemSubID; - - String name = Materials.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + tMetaID + ".name"), tMetaID%1000); + String format = LanguageRegistry.instance().getStringLocalization("gt.blockores." + tMetaID + ".name"); + String name = Materials.getLocalizedNameForItem(format, tMetaID%1000); addOreToHashMap(name, aPlayer); } catch (Exception e1) { String name = tAssotiation.toString(); |