Skip to content

Fix localization bugs #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpaceWalkerRS wants to merge 5 commits into
base: gen2
Choose a base branch
from
Open

Fix localization bugs #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ec6917
[localization] fix selected lang not updating properly in 1.1-1.5
SpaceWalkerRS Nov 4, 2026
ec0990c
[localization] fix incorrect last update time for locale
SpaceWalkerRS Nov 4, 2026
24f8c4f
[localization] fix languages not read as UTF-8
SpaceWalkerRS Nov 4, 2026
8537010
[localization] fix mod translations not loading pre-b1.4
SpaceWalkerRS Nov 4, 2026
6ecc32f
[localization] fix translations loading twice in 1.10- if language co…
SpaceWalkerRS Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions ...mc1.5.2/src/main/java/net/ornithemc/osl/localization/impl/mixin/client/LanguageMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

import java.util.Properties;

import org.objectweb.asm.Opcodes;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

Expand Down Expand Up @@ -51,19 +54,6 @@ public class LanguageMixin {
}
}

@Inject(
method = "loadLanguage",
at = @At(
value = "HEAD"
)
)
private void osl$localization$setLanguage(CallbackInfo ci) {
// each ServerPlayerEntity also holds an instance of this class
if ((Language) (Object) this == INSTANCE) {
Localization.getLanguageManager().setSelectedLanguage(this.currentCode);
}
}

@Inject(
method = "loadLanguage",
at = @At(
Expand Down Expand Up @@ -98,13 +88,17 @@ public class LanguageMixin {
@Inject(
method = "loadLanguage",
at = @At(
value = "TAIL"
value = "FIELD",
target = "Lnet/minecraft/locale/Language;currentCode:Ljava/lang/String;",
opcode = Opcodes.PUTFIELD,
shift = Shift.AFTER
)
)
private void osl$localization$localeReloaded(CallbackInfo ci) {
// each ServerPlayerEntity also holds an instance of this class
if ((Language) (Object) this == INSTANCE) {
Localization.getLocale().setLastUpdateTime();
Localization.getLanguageManager().setSelectedLanguage(this.currentCode);
}
}
}
11 changes: 6 additions & 5 deletions ...-mc18w01a/src/main/java/net/ornithemc/osl/localization/impl/mixin/client/LocaleMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@ private void load(List<Resource> resources) { }
)
private void osl$localization$loadExtraTranslations(ResourceManager resourceManager, List<String> languageCodes, CallbackInfo ci,
@Local(ordinal = 0) String languageCode, @Local(ordinal = 2) String namespace) {
String languageCodeLowercase = languageCode.toLowerCase(java.util.Locale.ROOT);

String pathFormat = "lang/%s%s";
String[] paths;

if (ResourcePacks.getSupportedFormat() < 3) {
if (ResourcePacks.getSupportedFormat() < 3 && !languageCode.equals(languageCodeLowercase)) {
paths = new String[] {
String.format(pathFormat, languageCode, ".json"),
String.format(pathFormat, languageCode.toLowerCase(java.util.Locale.ROOT), ".lang"),
String.format(pathFormat, languageCode.toLowerCase(java.util.Locale.ROOT), ".json")
String.format(pathFormat, languageCodeLowercase, ".lang"),
String.format(pathFormat, languageCodeLowercase, ".json")
};
} else {
paths = new String[] {
Expand All @@ -83,8 +85,7 @@ private void load(List<Resource> resources) { }
@Inject(
method = "load(Lnet/minecraft/client/resource/manager/ResourceManager;Ljava/util/List;)V",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/resource/manager/ResourceManager;getResources(Lnet/minecraft/resource/Identifier;)Ljava/util/List;"
value = "TAIL"
)
)
private void osl$localization$localeReloaded(CallbackInfo ci) {
Expand Down
3 changes: 1 addition & 2 deletions ...-mc1.14.4/src/main/java/net/ornithemc/osl/localization/impl/mixin/client/LocaleMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ private void load(List<Resource> resources) { }
@Inject(
method = "load(Lnet/minecraft/resource/manager/ResourceManager;Ljava/util/List;)V",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/resource/manager/ResourceManager;getResources(Lnet/minecraft/resource/Identifier;)Ljava/util/List;"
value = "TAIL"
)
)
private void osl$localization$localeReloaded(CallbackInfo ci) {
Expand Down
2 changes: 2 additions & 0 deletions ...n-mcb1.0-mc11w48a/src/main/java/net/ornithemc/osl/localization/impl/LanguageReloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.ornithemc.osl.localization.impl;

import net.minecraft.locale.Language;
import net.ornithemc.osl.resource.loader.api.client.ClientResourceLoaderEvents;
import net.ornithemc.osl.resource.loader.api.client.resource.reload.AssetsReloaders;
import net.ornithemc.osl.resource.loader.api.resource.manager.ResourceManager;
Expand All @@ -18,6 +19,7 @@ public static void init() {

@Override
public void resourcesReloaded(ResourceManager resourceManager) {
Language.getInstance();// ensure it's loaded
Localization.getLanguageManager().reloadLocale(resourceManager);
}
}
11 changes: 6 additions & 5 deletions libraries/localization/src/main/java/net/ornithemc/osl/localization/impl/Locale.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -110,12 +111,12 @@ public void reload(ResourceManager resourceManager, List<String> languages) {
}

public void loadLanguage(ResourceManager resourceManager, String language) {
String languageLowercase = language.toLowerCase(java.util.Locale.ROOT);

String pathFormat = "lang/%s%s";
String[] paths;

if (ResourcePacks.getSupportedFormat() < 3) {
String languageLowercase = language.toLowerCase(java.util.Locale.ROOT);

if (ResourcePacks.getSupportedFormat() < 3 && !language.equals(languageLowercase)) {
paths = new String[] {
String.format(pathFormat, language, ".lang"),
String.format(pathFormat, language, ".json"),
Expand Down Expand Up @@ -185,7 +186,7 @@ public void loadFromResource(NamespacedIdentifier location, InputStream resource
}

public void loadFromLang(InputStream is) throws IOException {
try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
try (BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
String line;
while ((line = br.readLine()) != null) {
line = line.trim();
Expand All @@ -202,7 +203,7 @@ public void loadFromLang(InputStream is) throws IOException {
}

public void loadFromJson(InputStream is) throws IOException {
try (JsonReader reader = JsonReader.json(new InputStreamReader(is))) {
try (JsonReader reader = JsonReader.json(new InputStreamReader(is, StandardCharsets.UTF_8))) {
reader.beginObject();
while (reader.hasNext()) {
this.set(reader.nextName() , reader.nextString());
Expand Down
Loading