R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make material gatherer resilient to JSON errors

Browse Source
This commit is contained in:
embeddedt 2023-04-08 17:08:35 -04:00
parent 26d76de7ef
commit 4f35a6cda3
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -7,7 +7,9 @@ import com.google.common.cache.RemovalNotification;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException;
import com.mojang.datafixers.util.Pair; import com.mojang.datafixers.util.Pair;
import com.mojang.math.Transformation; import com.mojang.math.Transformation;
import net.minecraft.Util; import net.minecraft.Util;
@ -172,8 +174,8 @@ public abstract class ModelBakeryMixin {
// strip models/ and .json from the name // strip models/ and .json from the name
ResourceLocation model = new ResourceLocation(fileLocation.getNamespace(), fileLocation.getPath().substring(7, fileLocation.getPath().length()-5)); ResourceLocation model = new ResourceLocation(fileLocation.getNamespace(), fileLocation.getPath().substring(7, fileLocation.getPath().length()-5));
return Pair.of(model, parser.parse(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8))); return Pair.of(model, parser.parse(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)));
} catch(IOException e) { } catch(IOException | JsonParseException e) {
ModernFix.LOGGER.error("Error reading model " + fileLocation, e); ModernFix.LOGGER.error("Error reading model {}: {}", fileLocation, e);
return Pair.of(fileLocation, null); return Pair.of(fileLocation, null);
} }
}, Util.backgroundExecutor())); }, Util.backgroundExecutor()));
@ -198,7 +200,7 @@ public abstract class ModelBakeryMixin {
basicModels.put(pair.getFirst(), model); basicModels.put(pair.getFirst(), model);
} }
} catch(Exception e) { } catch(Exception e) {
ModernFix.LOGGER.warn("Unable to load " + pair.getFirst(), e); ModernFix.LOGGER.warn("Unable to load {}: {}", pair.getFirst(), e);
} }
} }
modelBytes.clear(); modelBytes.clear();