diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java b/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java index 0e5eda4d9..a0bd4a56b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/backhand/BackhandReflectionCompat.java @@ -55,8 +55,10 @@ public class BackhandReflectionCompat { if (isLoaded && renderOffhandReturn != null) { try { renderOffhandReturn.invokeExact(partialTicks); - } catch (Throwable e) { - LOGGER.error("Failed to invoke Backhand renderOffhandReturn", e); + } catch (Error e) { + throw e; + } catch (Throwable t) { + LOGGER.error("Failed to invoke HoloInventory renderEvent", t); isLoaded = false; } } @@ -66,8 +68,10 @@ public class BackhandReflectionCompat { if (isLoaded && getOffhandItem != null) { try { return (ItemStack) getOffhandItem.invokeExact(player); - } catch (Throwable e) { - LOGGER.error("Failed to invoke Backhand getOffhandItem", e); + } catch (Error e) { + throw e; + } catch (Throwable t) { + LOGGER.error("Failed to invoke HoloInventory renderEvent", t); isLoaded = false; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java b/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java index 77011889e..d3bc4913e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/holoinventory/HoloInventoryReflectionCompat.java @@ -75,8 +75,10 @@ public class HoloInventoryReflectionCompat { } else { renderEventMethod.invokeExact(event); } - } catch (Throwable e) { - LOGGER.error("Failed to invoke HoloInventory renderEvent", e); + } catch (Error e) { + throw e; + } catch (Throwable t) { + LOGGER.error("Failed to invoke HoloInventory renderEvent", t); isLoaded = false; } } @@ -85,8 +87,10 @@ public class HoloInventoryReflectionCompat { if (!isLoaded) return; try { angelicaOverrideSetter.invokeExact(value); - } catch (Throwable e) { - LOGGER.error("Failed to set HoloInventory angelicaOverride", e); + } catch (Error e) { + throw e; + } catch (Throwable t) { + LOGGER.error("Failed to invoke HoloInventory renderEvent", t); isLoaded = false; } } diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java index ff43808e0..85942f445 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeBlock.java @@ -129,7 +129,7 @@ public class ColorizeBlock { static { try { reset(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeEntity.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeEntity.java index a8be96ad5..a98cd14c7 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeEntity.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeEntity.java @@ -46,7 +46,7 @@ public class ColorizeEntity { static { try { reset(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java index 7a3e5e0d8..7f3db5459 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeItem.java @@ -36,7 +36,7 @@ public class ColorizeItem { static { try { reset(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java b/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java index 17ceed792..152f895eb 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java +++ b/src/main/java/com/prupe/mcpatcher/cc/ColorizeWorld.java @@ -63,7 +63,7 @@ public class ColorizeWorld { static { try { reset(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java b/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java index 01eeaba97..1ab110408 100644 --- a/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java +++ b/src/main/java/com/prupe/mcpatcher/cc/Colorizer.java @@ -35,7 +35,7 @@ public class Colorizer { static { try { reset(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } TexturePackChangeHandler.register(new TexturePackChangeHandler(MCPatcherUtils.CUSTOM_COLORS, 2) { diff --git a/src/main/java/com/prupe/mcpatcher/cit/PotionReplacer.java b/src/main/java/com/prupe/mcpatcher/cit/PotionReplacer.java index 31c500551..70d85c4f5 100644 --- a/src/main/java/com/prupe/mcpatcher/cit/PotionReplacer.java +++ b/src/main/java/com/prupe/mcpatcher/cit/PotionReplacer.java @@ -77,7 +77,7 @@ class PotionReplacer { i); } } - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/ctm/BlockFaceMatcher.java b/src/main/java/com/prupe/mcpatcher/ctm/BlockFaceMatcher.java index 0f94c7a94..d73f73d34 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/BlockFaceMatcher.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/BlockFaceMatcher.java @@ -50,7 +50,7 @@ public class BlockFaceMatcher { if (!matcher.isAll()) { return matcher; } - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java index 8db741a31..b28e0006c 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java @@ -49,7 +49,7 @@ public class CTMUtils { Class.forName(MCPatcherUtils.RENDER_PASS_CLASS) .getMethod("finish") .invoke(null); - } catch (Throwable ignore) {} + } catch (Exception ignore) {} TexturePackChangeHandler.register(new TexturePackChangeHandler(MCPatcherUtils.CONNECTED_TEXTURES, 3) { @@ -61,9 +61,7 @@ public class CTMUtils { RenderPassAPI.instance.clear(); try { GlassPaneRenderer.clear(); - } catch (NoClassDefFoundError e) { - // nothing - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } renderBlockState.clear(); diff --git a/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java b/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java index a3d0d1462..216a828ca 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java +++ b/src/main/java/com/prupe/mcpatcher/hd/CustomAnimation.java @@ -87,7 +87,7 @@ public class CustomAnimation implements Comparable { if (!pending.isEmpty()) { try { checkPendingAnimations(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); logger.error("%d remaining animations cleared", pending.size()); pending.clear(); diff --git a/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java b/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java index f12fe08fb..1abf435b3 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java +++ b/src/main/java/com/prupe/mcpatcher/hd/FancyDial.java @@ -219,7 +219,7 @@ public class FancyDial { return instance; } instance.finish(); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } return null; @@ -410,7 +410,7 @@ public class FancyDial { } ImageIO.write(image, "png", path); logger.info("wrote %dx%d %s", image.getWidth(), image.getHeight(), path.getPath()); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java b/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java index de8e297d6..277a4d4e5 100644 --- a/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java +++ b/src/main/java/com/prupe/mcpatcher/hd/FontUtils.java @@ -143,7 +143,7 @@ public class FontUtils { boolean[] isOverride = new boolean[charWidth.length]; try { getCharWidthOverrides(filename, charWidthf, isOverride); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } if (!isOverride[32]) { diff --git a/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java b/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java index 7306297a8..c11b26a05 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java +++ b/src/main/java/com/prupe/mcpatcher/mal/nbt/NBTRule.java @@ -47,7 +47,7 @@ abstract public class NBTRule { } else { return new Exact(tag, value); } - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); return null; } @@ -204,7 +204,7 @@ abstract public class NBTRule { if (result != null && cl.isAssignableFrom(result.getClass())) { return cl.cast(result); } - } catch (Throwable e) {} + } catch (Exception e) {} return null; } diff --git a/src/main/java/com/prupe/mcpatcher/mal/resource/ResourceList.java b/src/main/java/com/prupe/mcpatcher/mal/resource/ResourceList.java index afdee2d25..28c134ab5 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/resource/ResourceList.java +++ b/src/main/java/com/prupe/mcpatcher/mal/resource/ResourceList.java @@ -104,7 +104,7 @@ public class ResourceList { try { zipFile = new ZipFile(jar); scanZipFile(zipFile); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } finally { MCPatcherUtils.close(zipFile); diff --git a/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackChangeHandler.java b/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackChangeHandler.java index 07bcf024f..0e71dc578 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackChangeHandler.java +++ b/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackChangeHandler.java @@ -55,7 +55,7 @@ abstract public class TexturePackChangeHandler implements Comparable imp private static String getShaderSource(String path) { try { InputStream in = ShaderLoader.class.getResourceAsStream(path); - Throwable throwable = null; + Exception throwable = null; String res; try { @@ -123,7 +123,7 @@ public abstract class ChunkRenderShaderBackend imp } res = IOUtils.toString(in, StandardCharsets.UTF_8); - } catch (Throwable tr) { + } catch (Exception tr) { throwable = tr; throw tr; } finally { @@ -131,7 +131,7 @@ public abstract class ChunkRenderShaderBackend imp if (throwable != null) { try { in.close(); - } catch (Throwable var12) { + } catch (Exception var12) { throwable.addSuppressed(var12); } } else { diff --git a/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java b/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java index 655ef3f3f..8810e716d 100644 --- a/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java +++ b/src/main/java/net/coderbot/iris/gui/element/ShaderPackSelectionList.java @@ -47,7 +47,7 @@ public class ShaderPackSelectionList extends IrisGuiSlot { try { names = Iris.getShaderpacksDirectoryManager().enumerate(); - } catch (Throwable e) { + } catch (Exception e) { Iris.logger.error("Error reading files while constructing selection UI", e); // Not translating this since it's going to be seen very rarely, diff --git a/src/main/java/net/coderbot/iris/shaderpack/CommentDirectiveParser.java b/src/main/java/net/coderbot/iris/shaderpack/CommentDirectiveParser.java index 88808c61f..5ddc3982c 100644 --- a/src/main/java/net/coderbot/iris/shaderpack/CommentDirectiveParser.java +++ b/src/main/java/net/coderbot/iris/shaderpack/CommentDirectiveParser.java @@ -67,7 +67,7 @@ public class CommentDirectiveParser { try { actual = testCase.get(); - } catch (Throwable e) { + } catch (Exception e) { System.err.println("Test \"" + name + "\" failed with an exception:"); e.printStackTrace(); diff --git a/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java b/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java index 9678020f7..57a5a24fd 100644 --- a/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java +++ b/src/main/java/net/coderbot/iris/texture/pbr/PBRAtlasTexture.java @@ -67,8 +67,8 @@ public class PBRAtlasTexture extends AutoClosableAbstractTexture { for (TextureAtlasSprite sprite : sprites.values()) { try { uploadSprite(sprite); - } catch (Throwable throwable) { - CrashReport crashReport = CrashReport.makeCrashReport(throwable, "Stitching texture atlas"); + } catch (Exception e) { + CrashReport crashReport = CrashReport.makeCrashReport(e, "Stitching texture atlas"); CrashReportCategory crashReportCategory = crashReport.makeCategory("Texture being stitched together"); crashReportCategory.addCrashSection("Atlas path", id); crashReportCategory.addCrashSection("Sprite", sprite); @@ -97,7 +97,7 @@ public class PBRAtlasTexture extends AutoClosableAbstractTexture { try { upload(atlasWidth, atlasHeight, mipLevel, anisotropicFiltering); return true; - } catch (Throwable t) { + } catch (Exception t) { Iris.logger.error("Could not upload PBR texture", t); return false; }