Skip to content
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

Jump to bottom

Bring up bug information in JSON into crash-report #201

Merged
merged 1 commit into from
Apr 19, 2021
Merged

Bring up bug information in JSON into crash-report #201

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 21 additions & 8 deletions src/main/rtm-patches/jp/ngt/rtm/modelpack/ModelPackManager.java.pm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,32 @@

TimeTableManager.INSTANCE.load();
par1.loadFinished = true;
@@ -148,10 +150,11 @@
@@ -144,29 +146,42 @@
public ResourceType getType(String name) {
return this.typeMap.get(name);
}

public String registerResourceSet(ResourceType type, File file) throws IOException {
+ List<String> json = null;
for(String s2 : ENCODING) {
try {
String s3 = NGTText.readText(file, false, s2);
ResourceConfig resourceconfig = (ResourceConfig)NGTJson.getObjectFromJson(s3, type.cfgClass);
+ resourceconfig.file = file;
return this.registerResourceSet(type, resourceconfig, s3);
- String s3 = NGTText.readText(file, false, s2);
- ResourceConfig resourceconfig = (ResourceConfig)NGTJson.getObjectFromJson(s3, type.cfgClass);
- return this.registerResourceSet(type, resourceconfig, s3);
+ json = NGTText.readText(file, s2);
} catch (IOException ioexception) {
ioexception.printStackTrace();
}
}
@@ -161,12 +164,21 @@
+ if (json == null)
+ throw new ModelPackException("Can't load json. please check encoding of json " +
+ "file and file is exists.", file.getAbsolutePath());

- throw new ModelPackException("Can't load model", file.getAbsolutePath());
+ ResourceConfig resourceconfig = (ResourceConfig)NGTJson.getObjectFromJson(NGTText.append(json, true), type.cfgClass);
+ resourceconfig.file = file;
+ return this.registerResourceSet(type, resourceconfig, NGTText.append(json, false));
}

public String registerResourceSet(ResourceType type, ResourceConfig cfg, String origJson) {
cfg.init();
Expand All @@ -98,7 +111,7 @@
return cfg.getName();
} else {
throw new ModelPackException("Failed to create ResourceSet", cfg.getName());
@@ -183,10 +195,11 @@
@@ -183,10 +198,11 @@
NGTLog.debug("[RTM] Send model to client : " + resourceconfig.getName());
++j;
}
Expand All @@ -110,7 +123,7 @@
public void addModelSetName(int count, String typeName, String name) {
assert NGTUtil.isSMP() && !NGTUtil.isServer();

@@ -228,16 +241,13 @@
@@ -228,16 +244,13 @@
resourcetype1 = type.parent;
}

Expand Down