-
-
Notifications
You must be signed in to change notification settings - Fork 421
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stop using Mojang's translation system entirely
Fixes JustAlittleWolf/ModDetectionPreventer#6 Sorry for breaking all open translation PRs with this commit, but it's necessary for security reasons. Anything in the lang folder can potentially be read by servers, so the files had to be moved.
- Loading branch information
1 parent
5987308
commit f8a096c
Showing
24 changed files
with
255 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| /* | ||
| * Copyright (c) 2014-2024 Wurst-Imperium and contributors. | ||
| * | ||
| * This source code is subject to the terms of the GNU General Public | ||
| * License, version 3. If a copy of the GPL was not distributed with this | ||
| * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt | ||
| */ | ||
| package net.wurstclient; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.IllegalFormatException; | ||
| import java.util.List; | ||
| import java.util.function.BiConsumer; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
|
|
||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.resource.language.I18n; | ||
| import net.minecraft.client.resource.language.TranslationStorage; | ||
| import net.minecraft.resource.Resource; | ||
| import net.minecraft.resource.ResourceManager; | ||
| import net.minecraft.resource.SynchronousResourceReloader; | ||
| import net.minecraft.util.Identifier; | ||
| import net.minecraft.util.Language; | ||
|
|
||
| public class WurstTranslator implements SynchronousResourceReloader | ||
| { | ||
| private final WurstClient wurst = WurstClient.INSTANCE; | ||
| private TranslationStorage mcEnglish; | ||
|
|
||
| private final HashMap<String, String> englishOnlyStrings = new HashMap<>(); | ||
| private final HashMap<String, String> currentLangStrings = new HashMap<>(); | ||
|
|
||
| @Override | ||
| public void reload(ResourceManager manager) | ||
| { | ||
| mcEnglish = TranslationStorage.load(manager, | ||
| Lists.newArrayList("en_us"), false); | ||
|
|
||
| currentLangStrings.clear(); | ||
| loadTranslations(manager, getCurrentLangCodes(), | ||
| currentLangStrings::put); | ||
|
|
||
| englishOnlyStrings.clear(); | ||
| loadTranslations(manager, List.of("en_us"), englishOnlyStrings::put); | ||
| } | ||
|
|
||
| /** | ||
| * Translates the given key with the given args into the current language, | ||
| * or into English if the "Force English" setting is enabled. Both Wurst and | ||
| * vanilla translations are supported. | ||
| */ | ||
| public String translate(String key, Object... args) | ||
| { | ||
| // Forced English | ||
| if(isForcedEnglish()) | ||
| return translateEnglish(key, args); | ||
|
|
||
| // Wurst translation | ||
| String string = currentLangStrings.get(key); | ||
| if(string != null) | ||
| try | ||
| { | ||
| return String.format(string, args); | ||
|
|
||
| }catch(IllegalFormatException e) | ||
| { | ||
| return key; | ||
| } | ||
|
|
||
| // Vanilla translation | ||
| return translateMc(key, args); | ||
| } | ||
|
|
||
| /** | ||
| * Translates the given key with the given args into English, regardless of | ||
| * the current language. Both Wurst and vanilla translations are supported. | ||
| */ | ||
| public String translateEnglish(String key, Object... args) | ||
| { | ||
| String string = englishOnlyStrings.get(key); | ||
| if(string == null) | ||
| string = mcEnglish.get(key); | ||
|
|
||
| try | ||
| { | ||
| return String.format(string, args); | ||
|
|
||
| }catch(IllegalFormatException e) | ||
| { | ||
| return key; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Translates the given key with the given args into the current language, | ||
| * or into English if the "Force English" setting is enabled, using only | ||
| * Minecraft's own translations. | ||
| * | ||
| * @apiNote This method differs from | ||
| * {@link I18n#translate(String, Object...)} in that it does not | ||
| * return "Format error" if the key contains a percent sign. | ||
| */ | ||
| public String translateMc(String key, Object... args) | ||
| { | ||
| if(I18n.hasTranslation(key)) | ||
| return I18n.translate(key, args); | ||
|
|
||
| return key; | ||
| } | ||
|
|
||
| /** | ||
| * Translates the given key with the given args into English, regardless of | ||
| * the current language, using only Minecraft's own translations. | ||
| * | ||
| * @apiNote This method differs from | ||
| * {@link I18n#translate(String, Object...)} in that it does not | ||
| * return "Format error" if the key contains a percent sign. | ||
| */ | ||
| public String translateMcEnglish(String key, Object... args) | ||
| { | ||
| try | ||
| { | ||
| return String.format(mcEnglish.get(key), args); | ||
|
|
||
| }catch(IllegalFormatException e) | ||
| { | ||
| return key; | ||
| } | ||
| } | ||
|
|
||
| public boolean isForcedEnglish() | ||
| { | ||
| return wurst.getOtfs().translationsOtf.getForceEnglish().isChecked(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a translation storage for Minecraft's English strings, regardless | ||
| * of the current language. Does not include any of Wurst's translations. | ||
| */ | ||
| public TranslationStorage getMcEnglish() | ||
| { | ||
| return mcEnglish; | ||
| } | ||
|
|
||
| private ArrayList<String> getCurrentLangCodes() | ||
| { | ||
| String mainLangCode = | ||
| MinecraftClient.getInstance().getLanguageManager().getLanguage(); | ||
|
|
||
| ArrayList<String> langCodes = new ArrayList<>(); | ||
| langCodes.add("en_us"); | ||
| if(!"en_us".equals(mainLangCode)) | ||
| langCodes.add(mainLangCode); | ||
|
|
||
| return langCodes; | ||
| } | ||
|
|
||
| private void loadTranslations(ResourceManager manager, | ||
| Iterable<String> langCodes, BiConsumer<String, String> entryConsumer) | ||
| { | ||
| for(String langCode : langCodes) | ||
| { | ||
| String langFilePath = "translations/" + langCode + ".json"; | ||
| Identifier langId = Identifier.of("wurst", langFilePath); | ||
|
|
||
| for(Resource resource : manager.getAllResources(langId)) | ||
| try(InputStream stream = resource.getInputStream()) | ||
| { | ||
| Language.load(stream, entryConsumer); | ||
|
|
||
| }catch(IOException e) | ||
| { | ||
| System.out.println("Failed to load translations for " | ||
| + langCode + " from pack " + resource.getPackId()); | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.