Skip to content

Language file loading rewrite #75

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
wants to merge 2 commits into
base: 7.3
Choose a base branch
from
Open

Language file loading rewrite #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b34844c
Lang loading rewrite to use FabricLoader's internal methods instead o…
bigsir24 Apr 17, 2025
ad544e8
Fixed wrong path String check when trying to load lang files
bigsir24 Jun 26, 2025
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
148 changes: 41 additions & 107 deletions src/main/java/turniplabs/halplibe/mixin/I18nMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import turniplabs.halplibe.HalpLibe;
import turniplabs.halplibe.mixin.accessors.LanguageAccessor;
import turniplabs.halplibe.util.DirectoryManager;

import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.*;
import java.util.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Mixin(value = I18n.class, remap = false)
Expand All @@ -30,127 +30,61 @@ public abstract class I18nMixin {
private Language currentLanguage;

@Unique
private static String[] filesInDir(String directory) {
List<String> paths = new ArrayList<>();
if (!directory.endsWith("/")) {
directory = directory + "/";
}
private void loadLangFile(Path path, boolean subFolder) {
String langCode = subFolder ? path.getParent().getFileName().toString() : path.getFileName().toString();
Language currentLanguage = this.currentLanguage;
Language defaultLanguage = Language.Default.INSTANCE;

try {
URI uri = Objects.requireNonNull(I18n.class.getResource(directory)).toURI();
FileSystem fileSystem = null;
Path myPath;
if (uri.getScheme().equals("jar")) {
try {
fileSystem = FileSystems.getFileSystem(uri);
} catch (Exception var9) {
fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
if (Files.isRegularFile(path) && path.toString().endsWith(".lang")) {
try (InputStreamReader reader = new InputStreamReader(path.toUri().toURL().openStream(), StandardCharsets.UTF_8)) {
if (langCode.contains(defaultLanguage.getId())) {
//noinspection DataFlowIssue (Suppressing IntelliJ ClassCastException warning)
((LanguageAccessor) defaultLanguage).getEntries().load(reader);
} else if (langCode.contains(currentLanguage.getId())) {
((LanguageAccessor) currentLanguage).getEntries().load(reader);
}

myPath = fileSystem.getPath(directory);
} else {
myPath = Paths.get(uri);
} catch (IOException e) {
throw new RuntimeException(e);
}

Stream<Path> walk = Files.walk(myPath, 1);

try {
Iterator<Path> it = walk.iterator();
it.next();

while (it.hasNext()) {
paths.add(directory + it.next().getFileName().toString());
}
} catch (Throwable var10) {
if (walk != null) {
try {
walk.close();
} catch (Throwable var8) {
var10.addSuppressed(var8);
}
}

throw var10;
}

walk.close();

if (fileSystem != null) {
fileSystem.close();
}
} catch (Exception ignored) {

}

return paths.toArray(new String[0]);
}

@Shadow
public static InputStream getResourceAsStream(String path) {
return null;
}

@Inject(
method = "reload(Ljava/lang/String;Z)V",
at = @At("TAIL")
)
public void addHalplibeModLangFiles(String languageCode, boolean save, CallbackInfo ci) {
Properties entries = ((LanguageAccessor) currentLanguage).getEntries();
Language defaultLanguage = Language.Default.INSTANCE;
Properties defaultEntries = ((LanguageAccessor) defaultLanguage).getEntries(); //if you see a ClassCastException warning here, it is wrong, nothing happens
String defaultLangId = defaultLanguage.getId();
String currentLangId = currentLanguage.getId();
HalpLibe.LOGGER.debug("Current lang: " + currentLangId);

for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
String path = DirectoryManager.getLanguageDirectory(mod.getMetadata().getId());
String[] rootLangs = filesInDir(path);
String[] subCurrentLangs = filesInDir(path + currentLangId + "/");
String[] subDefaultLangs = filesInDir(path + defaultLangId + "/");
HalpLibe.LOGGER.debug(mod.getMetadata().getId() + " contains " + (rootLangs.length + subDefaultLangs.length + subCurrentLangs.length) + " language files.");
HalpLibe.LOGGER.debug(Arrays.toString(rootLangs));
HalpLibe.LOGGER.debug(Arrays.toString(subCurrentLangs));
HalpLibe.LOGGER.debug(Arrays.toString(subDefaultLangs));
for (String lang : rootLangs) {
if (lang.contains(currentLangId)) {
try (InputStream stream = getResourceAsStream(lang)) {
if (stream != null) {
InputStreamReader r = new InputStreamReader(stream, StandardCharsets.UTF_8);
entries.load(r);
}
} catch (IOException e) {
e.printStackTrace();
}
}
if(lang.contains(defaultLangId)){
try (InputStream stream = getResourceAsStream(lang)) {
if (stream != null) {
InputStreamReader r = new InputStreamReader(stream, StandardCharsets.UTF_8);
defaultEntries.load(r);
String modId = mod.getMetadata().getId();
Optional<Path> optionalPath = mod.findPath("lang/" + modId); // Get the path to lang/modid/ folder
if (!optionalPath.isPresent()) continue;

// Get all files inside folder
try (Stream<Path> stream = Files.list(optionalPath.get())) {
List<Path> list = stream.collect(Collectors.toList());

for (Path p : list) {
String fileName = p.getFileName().toString();
// Skip if it doesn't match any lang ID
if(!(fileName.contains(currentLangId) || fileName.contains(defaultLangId))) continue;

if (Files.isDirectory(p)) { // Read subfolder lang files
try (Stream<Path> subStream = Files.list(p)) {
subStream.forEach(subP -> loadLangFile(subP, true)); // Try to read lang files in subdirectory
} catch (IOException e) {
HalpLibe.LOGGER.error("Failed to read .lang files of [{}] in folder {}!", modId, p.getFileName());
}
} catch (IOException e) {
e.printStackTrace();
}
}
}
for (String lang : subCurrentLangs) {
try (InputStream stream = getResourceAsStream(lang)) {
if (stream != null) {
InputStreamReader r = new InputStreamReader(stream, StandardCharsets.UTF_8);
entries.load(r);
}
} catch (IOException e) {
e.printStackTrace();
}
}
for (String lang : subDefaultLangs) {
try (InputStream stream = getResourceAsStream(lang)) {
if (stream != null) {
InputStreamReader r = new InputStreamReader(stream, StandardCharsets.UTF_8);
entries.load(r);
}else /* Read root lang file */ {
loadLangFile(p, false);
}
} catch (IOException e) {
e.printStackTrace();
}
} catch (IOException e) {
HalpLibe.LOGGER.error("Failed to read .lang files of [{}]!", modId);
}
}
}
Expand Down