Fix jar resource loading on newer Java versions (still works on 8) (#337)

This commit is contained in:
Raven Szewczyk authored and GitHub committed 2023-01-25 20:50:48 +01:00
1 parent 75ff631f16
commit e133afc774
3 files changed
+3 -4

No files matched your search

@@ -190,7 +190,7 @@ public abstract class GuiRecipeTab extends Widget {
final boolean fromJar = NEIClientConfig.loadHandlersFromJar();
NEIClientConfig.logger.info("Loading handler info from " + (fromJar ? "JAR" : "Config"));
handlerMap.clear();
URL handlerUrl = Thread.currentThread().getContextClassLoader().getResource("assets/nei/csv/handlers.csv");
URL handlerUrl = GuiRecipeTab.class.getResource("/assets/nei/csv/handlers.csv");
URL url;
if (fromJar) {
@@ -120,7 +120,7 @@ public class RecipeCatalysts {
final boolean fromJar = NEIClientConfig.loadCatalystsFromJar();
NEIClientConfig.logger.info("Loading catalyst info from " + (fromJar ? "JAR" : "Config"));
recipeCatalystMap.clear();
URL handlerUrl = Thread.currentThread().getContextClassLoader().getResource("assets/nei/csv/catalysts.csv");
URL handlerUrl = RecipeCatalysts.class.getResource("/assets/nei/csv/catalysts.csv");
URL url;
if (fromJar) {
@@ -165,8 +165,7 @@ public class StackInfo {
}
} else {
final URL filterUrl =
Thread.currentThread().getContextClassLoader().getResource("assets/nei/guidfilters.cfg");
final URL filterUrl = StackInfo.class.getResource("/assets/nei/guidfilters.cfg");
try (BufferedReader reader = new BufferedReader(new InputStreamReader(filterUrl.openStream()))) {
itemStrings = IOUtils.readLines(reader);