Merge 1.16 into 1.18

embeddedt · embeddedt · commit a502a509ed4b · 2023-07-08T14:51:43.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
@@ -66,7 +66,7 @@ private static void gatherAdditionalViaManualScan(List<PackResources> untrustedP
                 ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), filePrefix + blockstate.getPath() + ".json");
                 try (Resource resource = frm.getResource(fileLocation)) {
                     knownLocations.add(blockstate);
-                } catch (IOException ignored) {
+                } catch (IOException | RuntimeException ignored) {
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private static void gatherAdditionalViaManualScan(List<PackResources> untrustedP`
`66`	`66`	`ResourceLocation fileLocation = new ResourceLocation(blockstate.getNamespace(), filePrefix + blockstate.getPath() + ".json");`
`67`	`67`	`try (Resource resource = frm.getResource(fileLocation)) {`
`68`	`68`	`knownLocations.add(blockstate);`
`69`		`- } catch (IOException ignored) {`
	`69`	`+ } catch (IOException \| RuntimeException ignored) {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`