No more deprecated new JsonParser()

kappa-maintainer · kappa-maintainer · commit 503232d025a1 · 2025-12-19T18:23:43.000+08:00
diff --git a/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch b/patches/minecraft/net/minecraft/client/resources/AbstractResourcePack.java.patch
@@ -1,11 +1,21 @@
 --- before/net/minecraft/client/resources/AbstractResourcePack.java
 +++ after/net/minecraft/client/resources/AbstractResourcePack.java
-@@ -102,4 +102,8 @@
+@@ -77,7 +77,7 @@
+         try
+         {
+             bufferedreader = new BufferedReader(new InputStreamReader(p_110596_1_, StandardCharsets.UTF_8));
+-            jsonobject = new JsonParser().parse(bufferedreader).getAsJsonObject();
++            jsonobject = JsonParser.parseReader(bufferedreader).getAsJsonObject();
+         }
+         catch (RuntimeException runtimeexception)
+         {
+@@ -101,5 +101,9 @@
+     public String getPackName()
      {
          return this.resourcePackFile.getName();
-     }
++    }
 +    
 +    public File getResourcePackFile() {
 +        return resourcePackFile;
-+    }
+     }
  }
diff --git a/patches/minecraft/net/minecraft/client/resources/ResourceIndex.java.patch b/patches/minecraft/net/minecraft/client/resources/ResourceIndex.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/resources/ResourceIndex.java
++++ after/net/minecraft/client/resources/ResourceIndex.java
+@@ -41,7 +41,7 @@
+         try
+         {
+             bufferedreader = Files.newReader(file2, StandardCharsets.UTF_8);
+-            JsonObject jsonobject = new JsonParser().parse(bufferedreader).getAsJsonObject();
++            JsonObject jsonobject = JsonParser.parseReader(bufferedreader).getAsJsonObject();
+             JsonObject jsonobject1 = JsonUtils.getJsonObject(jsonobject, "objects", null);
+ 
+             if (jsonobject1 != null)
diff --git a/patches/minecraft/net/minecraft/client/resources/SimpleResource.java.patch b/patches/minecraft/net/minecraft/client/resources/SimpleResource.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/resources/SimpleResource.java
++++ after/net/minecraft/client/resources/SimpleResource.java
+@@ -75,7 +75,7 @@
+                 try
+                 {
+                     bufferedreader = new BufferedReader(new InputStreamReader(this.mcmetaInputStream, StandardCharsets.UTF_8));
+-                    this.mcmetaJson = new JsonParser().parse(bufferedreader).getAsJsonObject();
++                    this.mcmetaJson = JsonParser.parseReader(bufferedreader).getAsJsonObject();
+                 }
+                 finally
+                 {
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderGroup.java.patch
@@ -1,6 +1,21 @@
 --- before/net/minecraft/client/shader/ShaderGroup.java
 +++ after/net/minecraft/client/shader/ShaderGroup.java
-@@ -178,7 +178,8 @@
+@@ -55,13 +55,12 @@
+ 
+     public void parseGroup(TextureManager p_152765_1_, ResourceLocation p_152765_2_) throws JsonException, IOException, JsonSyntaxException
+     {
+-        JsonParser jsonparser = new JsonParser();
+         IResource iresource = null;
+ 
+         try
+         {
+             iresource = this.resourceManager.getResource(p_152765_2_);
+-            JsonObject jsonobject = jsonparser.parse(IOUtils.toString(iresource.getInputStream(), StandardCharsets.UTF_8)).getAsJsonObject();
++            JsonObject jsonobject = JsonParser.parseString(IOUtils.toString(iresource.getInputStream(), StandardCharsets.UTF_8)).getAsJsonObject();
+ 
+             if (JsonUtils.isJsonArray(jsonobject, "targets"))
+             {
+@@ -178,7 +177,8 @@
  
                          if (framebuffer2 == null)
                          {
diff --git a/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch b/patches/minecraft/net/minecraft/client/shader/ShaderManager.java.patch
@@ -1,12 +1,21 @@
 --- before/net/minecraft/client/shader/ShaderManager.java
 +++ after/net/minecraft/client/shader/ShaderManager.java
-@@ -53,7 +53,8 @@
+@@ -52,15 +52,15 @@
+ 
      public ShaderManager(IResourceManager resourceManager, String programName) throws JsonException, IOException
      {
-         JsonParser jsonparser = new JsonParser();
+-        JsonParser jsonparser = new JsonParser();
 -        ResourceLocation resourcelocation = new ResourceLocation("shaders/program/" + programName + ".json");
 +        String[] rl = ResourceLocation.splitObjectName(programName);
 +        ResourceLocation resourcelocation = new ResourceLocation(rl[0], "shaders/program/" + rl[1] + ".json");
          this.programFilename = programName;
          IResource iresource = null;
  
+         try
+         {
+             iresource = resourceManager.getResource(resourcelocation);
+-            JsonObject jsonobject = jsonparser.parse(IOUtils.toString(iresource.getInputStream(), StandardCharsets.UTF_8)).getAsJsonObject();
++            JsonObject jsonobject = JsonParser.parseString(IOUtils.toString(iresource.getInputStream(), StandardCharsets.UTF_8)).getAsJsonObject();
+             String s = JsonUtils.getString(jsonobject, "vertex");
+             String s1 = JsonUtils.getString(jsonobject, "fragment");
+             JsonArray jsonarray = JsonUtils.getJsonArray(jsonobject, "samplers", null);
diff --git a/patches/minecraft/net/minecraft/stats/StatisticsManagerServer.java.patch b/patches/minecraft/net/minecraft/stats/StatisticsManagerServer.java.patch
@@ -0,0 +1,11 @@
+--- before/net/minecraft/stats/StatisticsManagerServer.java
++++ after/net/minecraft/stats/StatisticsManagerServer.java
+@@ -84,7 +84,7 @@
+ 
+     public Map<StatBase, TupleIntJsonSerializable> parseJson(String p_150881_1_)
+     {
+-        JsonElement jsonelement = new JsonParser().parse(p_150881_1_);
++        JsonElement jsonelement = JsonParser.parseString(p_150881_1_);
+ 
+         if (!jsonelement.isJsonObject())
+         {
diff --git a/src/main/java/net/minecraftforge/client/model/ModelFluid.java b/src/main/java/net/minecraftforge/client/model/ModelFluid.java
@@ -501,7 +501,7 @@ public ModelFluid process(ImmutableMap<String, String> customData)
         if(!customData.containsKey("fluid")) return this;
 
         String fluidStr = customData.get("fluid");
-        JsonElement e = new JsonParser().parse(fluidStr);
+        JsonElement e = JsonParser.parseString(fluidStr);
         String fluid = e.getAsString();
         if(!FluidRegistry.isFluidRegistered(fluid))
         {
diff --git a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java
@@ -116,7 +116,7 @@ public MultiLayerModel process(ImmutableMap<String, String> customData)
 
     private ModelResourceLocation getLocation(String json)
     {
-        JsonElement e = new JsonParser().parse(json);
+        JsonElement e = JsonParser.parseString(json);
         if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString())
         {
             return new ModelResourceLocation(e.getAsString());
diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java
@@ -499,7 +499,7 @@ public ModelWrapper process(ImmutableMap<String, String> data)
             boolean hasChanged = false;
             if(data.containsKey("mesh"))
             {
-                JsonElement e = new JsonParser().parse(data.get("mesh"));
+                JsonElement e = JsonParser.parseString(data.get("mesh"));
                 if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString())
                 {
                     return new ModelWrapper(modelLocation, model, ImmutableSet.of(e.getAsString()), smooth, gui3d, defaultKey, textures);
@@ -530,7 +530,7 @@ else if (e.isJsonArray())
             }
             if(data.containsKey("key"))
             {
-                JsonElement e = new JsonParser().parse(data.get("key"));
+                JsonElement e = JsonParser.parseString(data.get("key"));
                 if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isNumber())
                 {
                     newDefaultKey = e.getAsNumber().intValue();
diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java
@@ -974,13 +974,12 @@ private void readInjectedDependencies()
             FMLLog.log.debug("File {} not found. No dependencies injected", injectedDepFile.getAbsolutePath());
             return;
         }
-        JsonParser parser = new JsonParser();
         JsonElement injectedDeps;
         try
         {
             try (Reader reader = new InputStreamReader(new FileInputStream(injectedDepFile), StandardCharsets.UTF_8))
             {
-                injectedDeps = parser.parse(reader);
+                injectedDeps = JsonParser.parseReader(reader);
             }
             for (JsonElement el : injectedDeps.getAsJsonArray())
             {

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ public ModelFluid process(ImmutableMap<String, String> customData)`
`501`	`501`	`if(!customData.containsKey("fluid")) return this;`
`502`	`502`
`503`	`503`	`String fluidStr = customData.get("fluid");`
`504`		`- JsonElement e = new JsonParser().parse(fluidStr);`
	`504`	`+ JsonElement e = JsonParser.parseString(fluidStr);`
`505`	`505`	`String fluid = e.getAsString();`
`506`	`506`	`if(!FluidRegistry.isFluidRegistered(fluid))`
`507`	`507`	`{`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public MultiLayerModel process(ImmutableMap<String, String> customData)`
`116`	`116`
`117`	`117`	`private ModelResourceLocation getLocation(String json)`
`118`	`118`	`{`
`119`		`- JsonElement e = new JsonParser().parse(json);`
	`119`	`+ JsonElement e = JsonParser.parseString(json);`
`120`	`120`	`if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString())`
`121`	`121`	`{`
`122`	`122`	`return new ModelResourceLocation(e.getAsString());`
Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ public ModelWrapper process(ImmutableMap<String, String> data)`
`499`	`499`	`boolean hasChanged = false;`
`500`	`500`	`if(data.containsKey("mesh"))`
`501`	`501`	`{`
`502`		`- JsonElement e = new JsonParser().parse(data.get("mesh"));`
	`502`	`+ JsonElement e = JsonParser.parseString(data.get("mesh"));`
`503`	`503`	`if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isString())`
`504`	`504`	`{`
`505`	`505`	`return new ModelWrapper(modelLocation, model, ImmutableSet.of(e.getAsString()), smooth, gui3d, defaultKey, textures);`
`@@ -530,7 +530,7 @@ else if (e.isJsonArray())`
`530`	`530`	`}`
`531`	`531`	`if(data.containsKey("key"))`
`532`	`532`	`{`
`533`		`- JsonElement e = new JsonParser().parse(data.get("key"));`
	`533`	`+ JsonElement e = JsonParser.parseString(data.get("key"));`
`534`	`534`	`if(e.isJsonPrimitive() && e.getAsJsonPrimitive().isNumber())`
`535`	`535`	`{`
`536`	`536`	`newDefaultKey = e.getAsNumber().intValue();`
Original file line number	Diff line number	Diff line change
`@@ -974,13 +974,12 @@ private void readInjectedDependencies()`
`974`	`974`	`FMLLog.log.debug("File {} not found. No dependencies injected", injectedDepFile.getAbsolutePath());`
`975`	`975`	`return;`
`976`	`976`	`}`
`977`		`- JsonParser parser = new JsonParser();`
`978`	`977`	`JsonElement injectedDeps;`
`979`	`978`	`try`
`980`	`979`	`{`
`981`	`980`	`try (Reader reader = new InputStreamReader(new FileInputStream(injectedDepFile), StandardCharsets.UTF_8))`
`982`	`981`	`{`
`983`		`- injectedDeps = parser.parse(reader);`
	`982`	`+ injectedDeps = JsonParser.parseReader(reader);`
`984`	`983`	`}`
`985`	`984`	`for (JsonElement el : injectedDeps.getAsJsonArray())`
`986`	`985`	`{`