Skip to content

Commit 5e8d1dc

Browse files
committed
Fixup entries in JsonData
1 parent 1e556cc commit 5e8d1dc

File tree

1 file changed

+49
-36
lines changed
  • json-data-utils/src/main/java/net/minecraftforge/util/data/json

1 file changed

+49
-36
lines changed

json-data-utils/src/main/java/net/minecraftforge/util/data/json/JsonData.java

Lines changed: 49 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,6 @@ public class JsonData {
2323
.setPrettyPrinting()
2424
.create();
2525

26-
public static LauncherManifest launcherManifest(File file) {
27-
return fromJson(file, LauncherManifest.class);
28-
}
29-
public static LauncherManifest launcherManifest(InputStream stream) {
30-
return fromJson(stream, LauncherManifest.class);
31-
}
32-
public static LauncherManifest launcherManifest(byte[] data) {
33-
return fromJson(data, LauncherManifest.class);
34-
}
35-
36-
public static MinecraftVersion minecraftVersion(File file) {
37-
return fromJson(file, MinecraftVersion.class);
38-
}
39-
public static MinecraftVersion minecraftVersion(InputStream stream) {
40-
return fromJson(stream, MinecraftVersion.class);
41-
}
42-
public static MinecraftVersion minecraftVersion(byte[] data) {
43-
return fromJson(data, MinecraftVersion.class);
44-
}
45-
4626
public static AssetsIndex assetsIndex(File file) {
4727
return fromJson(file, AssetsIndex.class);
4828
}
@@ -63,24 +43,14 @@ public static int configSpec(byte[] data) {
6343
return fromJson(data, Config.class).spec;
6444
}
6545

66-
public static PatcherConfig patcherConfig(File file) {
67-
return fromJson(file, PatcherConfig.class);
68-
}
69-
public static PatcherConfig patcherConfig(InputStream stream) {
70-
return fromJson(stream, PatcherConfig.class);
71-
}
72-
public static PatcherConfig patcherConfig(byte[] data) {
73-
return fromJson(data, PatcherConfig.class);
74-
}
75-
76-
public static PatcherConfig.V2 patcherConfigV2(File file) {
77-
return fromJson(file, PatcherConfig.V2.class);
46+
public static LauncherManifest launcherManifest(File file) {
47+
return fromJson(file, LauncherManifest.class);
7848
}
79-
public static PatcherConfig.V2 patcherConfigV2(InputStream stream) {
80-
return fromJson(stream, PatcherConfig.V2.class);
49+
public static LauncherManifest launcherManifest(InputStream stream) {
50+
return fromJson(stream, LauncherManifest.class);
8151
}
82-
public static PatcherConfig.V2 patcherConfigV2(byte[] data) {
83-
return fromJson(data, PatcherConfig.V2.class);
52+
public static LauncherManifest launcherManifest(byte[] data) {
53+
return fromJson(data, LauncherManifest.class);
8454
}
8555

8656
public static MCPConfig mcpConfig(File file) {
@@ -103,6 +73,36 @@ public static MCPConfig.V2 mcpConfigV2(byte[] data) {
10373
return fromJson(data, MCPConfig.V2.class);
10474
}
10575

76+
public static MinecraftVersion minecraftVersion(File file) {
77+
return fromJson(file, MinecraftVersion.class);
78+
}
79+
public static MinecraftVersion minecraftVersion(InputStream stream) {
80+
return fromJson(stream, MinecraftVersion.class);
81+
}
82+
public static MinecraftVersion minecraftVersion(byte[] data) {
83+
return fromJson(data, MinecraftVersion.class);
84+
}
85+
86+
public static PatcherConfig patcherConfig(File file) {
87+
return fromJson(file, PatcherConfig.class);
88+
}
89+
public static PatcherConfig patcherConfig(InputStream stream) {
90+
return fromJson(stream, PatcherConfig.class);
91+
}
92+
public static PatcherConfig patcherConfig(byte[] data) {
93+
return fromJson(data, PatcherConfig.class);
94+
}
95+
96+
public static PatcherConfig.V2 patcherConfigV2(File file) {
97+
return fromJson(file, PatcherConfig.V2.class);
98+
}
99+
public static PatcherConfig.V2 patcherConfigV2(InputStream stream) {
100+
return fromJson(stream, PatcherConfig.V2.class);
101+
}
102+
public static PatcherConfig.V2 patcherConfigV2(byte[] data) {
103+
return fromJson(data, PatcherConfig.V2.class);
104+
}
105+
106106
public static PromosSlim promosSlim(File file) {
107107
return fromJson(file, PromosSlim.class);
108108
}
@@ -116,6 +116,19 @@ public static PromosSlim promosSlim(String data) {
116116
return fromJson(data, PromosSlim.class);
117117
}
118118

119+
public static RunConfig runConfig(File file) {
120+
return fromJson(file, RunConfig.class);
121+
}
122+
public static RunConfig runConfig(InputStream stream) {
123+
return fromJson(stream, RunConfig.class);
124+
}
125+
public static RunConfig runConfig(byte[] data) {
126+
return fromJson(data, RunConfig.class);
127+
}
128+
public static RunConfig runConfig(String data) {
129+
return fromJson(data, RunConfig.class);
130+
}
131+
119132
protected static <T> T fromJson(File file, Class<T> classOfT) throws JsonSyntaxException, JsonIOException {
120133
try (FileInputStream stream = new FileInputStream(file)) {
121134
return fromJson(stream, classOfT);

0 commit comments

Comments
 (0)