xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
FOlkvangrField 2025-08-20 21:46:59 +08:00
parent a0451b46a5
commit b4b471e5c3
4 changed files with 112 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/hbm/config/CustomMachineConfigJSON.java
View File

@ -1,9 +1,8 @@
package com.hbm.config; package com.hbm.config;
import java.io.File; import java.io.*;
import java.io.FileReader; import java.nio.charset.StandardCharsets;
import java.io.FileWriter; import java.nio.file.Files;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -148,7 +147,7 @@ public class CustomMachineConfigJSON {
public static void readConfig(File config) { public static void readConfig(File config) {
try { try {
JsonObject json = gson.fromJson(new FileReader(config), JsonObject.class); JsonObject json = gson.fromJson(new InputStreamReader(Files.newInputStream(config.toPath()), StandardCharsets.UTF_8), JsonObject.class);
JsonArray machines = json.get("machines").getAsJsonArray(); JsonArray machines = json.get("machines").getAsJsonArray();
for(int i = 0; i < machines.size(); i++) { for(int i = 0; i < machines.size(); i++) {

9
src/main/java/com/hbm/inventory/fluid/Fluids.java
View File

@ -1,9 +1,8 @@
package com.hbm.inventory.fluid; package com.hbm.inventory.fluid;
import java.io.File; import java.io.*;
import java.io.FileReader; import java.nio.charset.StandardCharsets;
import java.io.FileWriter; import java.nio.file.Files;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -797,7 +796,7 @@ public class Fluids {
private static void readCustomFluids(File file) { private static void readCustomFluids(File file) {
try { try {
JsonObject json = gson.fromJson(new FileReader(file), JsonObject.class); JsonObject json = gson.fromJson(new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8), JsonObject.class);
for(Entry<String, JsonElement> entry : json.entrySet()) { for(Entry<String, JsonElement> entry : json.entrySet()) {

4
src/main/java/com/hbm/qmaw/GuiQMAW.java
View File

@ -52,13 +52,13 @@ public class GuiQMAW extends GuiScreen {
protected void parseQMAW(QuickManualAndWiki qmaw) { protected void parseQMAW(QuickManualAndWiki qmaw) {
LanguageManager lang = Minecraft.getMinecraft().getLanguageManager(); LanguageManager lang = Minecraft.getMinecraft().getLanguageManager();
this.title = qmaw.title.get(lang.getCurrentLanguage()); this.title = qmaw.title.get(lang.getCurrentLanguage().getLanguageCode());
if(title == null) this.title = qmaw.title.get(EN_US); if(title == null) this.title = qmaw.title.get(EN_US);
if(title == null) this.title = "Missing Localization!"; if(title == null) this.title = "Missing Localization!";
this.icon = qmaw.icon; this.icon = qmaw.icon;
String toParse = qmaw.contents.get(lang.getCurrentLanguage()); String toParse = qmaw.contents.get(lang.getCurrentLanguage().getLanguageCode());
if(toParse == null) toParse = qmaw.contents.get(EN_US); if(toParse == null) toParse = qmaw.contents.get(EN_US);
if(toParse == null) toParse = "Missing Localization!"; if(toParse == null) toParse = "Missing Localization!";
toParse = "" + toParse; // strings are reference types, no? toParse = "" + toParse; // strings are reference types, no?

12
src/main/java/com/hbm/qmaw/QMAWLoader.java
View File

@ -1,9 +1,8 @@
package com.hbm.qmaw; package com.hbm.qmaw;
import java.io.File; import java.io.*;
import java.io.FileReader; import java.nio.charset.StandardCharsets;
import java.io.InputStream; import java.nio.file.Files;
import java.io.InputStreamReader;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -131,7 +130,7 @@ public class QMAWLoader implements IResourceManagerReloadListener {
String name = entry.getName(); String name = entry.getName();
if(name.startsWith("assets/hbm/manual/") && name.endsWith(".json")) { if(name.startsWith("assets/hbm/manual/") && name.endsWith(".json")) {
InputStream fileStream = zip.getInputStream(entry); InputStream fileStream = zip.getInputStream(entry);
InputStreamReader reader = new InputStreamReader(fileStream); InputStreamReader reader = new InputStreamReader(fileStream, StandardCharsets.UTF_8);
try { try {
JsonObject obj = (JsonObject) parser.parse(reader); JsonObject obj = (JsonObject) parser.parse(reader);
String manName = name.replace("assets/hbm/manual/", ""); String manName = name.replace("assets/hbm/manual/", "");
@ -167,7 +166,8 @@ public class QMAWLoader implements IResourceManagerReloadListener {
String name = file.getName(); String name = file.getName();
if(file.isFile() && name.endsWith(".json")) { if(file.isFile() && name.endsWith(".json")) {
try { try {
FileReader reader = new FileReader(file); //FileReader reader = new FileReader(file);
InputStreamReader reader = new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8);
JsonObject obj = (JsonObject) parser.parse(reader); JsonObject obj = (JsonObject) parser.parse(reader);
registerJson(name, obj); registerJson(name, obj);
logFoundManual(name); logFoundManual(name);