diff options
| author | syeyoung <42869671+cyoung06@users.noreply.github.com> | 2023-11-11 21:37:07 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 21:37:07 +0900 |
| commit | de2ea64b5127570baa61ade6fd7a63416c8b7cb9 (patch) | |
| tree | 78391b66157d3877428757feef7131243c39ee93 | |
| parent | 9e3e93a3337989d7f669678a495866b38fdf3f89 (diff) | |
| download | Skyblock-Dungeons-Guide-de2ea64b5127570baa61ade6fd7a63416c8b7cb9.tar.gz Skyblock-Dungeons-Guide-de2ea64b5127570baa61ade6fd7a63416c8b7cb9.tar.bz2 Skyblock-Dungeons-Guide-de2ea64b5127570baa61ade6fd7a63416c8b7cb9.zip | |
No throwables (#436)
* - fix error handling, don't use throwables like amateur
Signed-off-by: syeyoung <cyoung06@naver.com>
* - no need for hack to stop
Signed-off-by: syeyoung <cyoung06@naver.com>
* - gui error handling
Signed-off-by: syeyoung <cyoung06@naver.com>
---------
Signed-off-by: syeyoung <cyoung06@naver.com>
24 files changed, 134 insertions, 279 deletions
diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/tooltip/NotificationManager.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/tooltip/NotificationManager.java index 7e4ccdce..517e20ac 100644 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/tooltip/NotificationManager.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/tooltip/NotificationManager.java @@ -139,8 +139,8 @@ public class NotificationManager { private void keyTyped(char typedChar, int keyCode) throws IOException { try { view.keyPressed0(typedChar, keyCode); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -148,8 +148,8 @@ public class NotificationManager { private void keyHeld(int keyCode, char typedChar) throws IOException { try { view.keyHeld0(typedChar, keyCode); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -157,8 +157,8 @@ public class NotificationManager { private void keyReleased(int keyCode, char typedChar) throws IOException { try { view.keyReleased0(typedChar, keyCode); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -167,8 +167,8 @@ public class NotificationManager { try { return view.mouseClicked0(mouseX, mouseY , mouseX, mouseY, mouseButton); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } return false; @@ -178,8 +178,8 @@ public class NotificationManager { try { view.mouseReleased0(mouseX, mouseY , mouseX, mouseY, state); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -188,8 +188,8 @@ public class NotificationManager { try { view.mouseClickMove0(mouseX, mouseY , mouseX, mouseY, clickedMouseButton, timeSinceLastClick); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -198,8 +198,8 @@ public class NotificationManager { try { view.mouseMoved0(mouseX, mouseY , mouseX, mouseY, true); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -215,7 +215,6 @@ public class NotificationManager { @SubscribeEvent(priority = EventPriority.HIGHEST) public void handleMouseInput(GuiScreenEvent.MouseInputEvent.Pre mouseInputEvent) throws IOException { - try { int i = Mouse.getEventX(); int j = this.mc.displayHeight - Mouse.getEventY(); int k = Mouse.getEventButton(); @@ -241,14 +240,14 @@ public class NotificationManager { this.mouseClickMove(i, j, this.eventButton, l); } if (lastX != i || lastY != j) { - try { EnumCursor prevCursor = view.getCurrentCursor(); view.setCursor(EnumCursor.DEFAULT); this.mouseMove(i, j); EnumCursor newCursor = view.getCurrentCursor(); + try { if (prevCursor != newCursor) Mouse.setNativeCursor(GLCursors.getCursor(newCursor)); } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + e.printStackTrace(); } } @@ -256,14 +255,15 @@ public class NotificationManager { int wheel = Mouse.getEventDWheel(); if (wheel != 0) { - boolean cancel = view.mouseScrolled0(i, j, i, j, wheel); - if (cancel) mouseInputEvent.setCanceled(true); + try { + boolean cancel = view.mouseScrolled0(i, j, i, j, wheel); + if (cancel) mouseInputEvent.setCanceled(true); + } catch (Exception e) { + e.printStackTrace(); + } } lastX = i; lastY = j; - } catch (Throwable e) { - e.printStackTrace(); - } } @SubscribeEvent(priority = EventPriority.HIGHEST) diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java index 44dfb230..d6b2e496 100644 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/GuiScreenAdapter.java @@ -137,8 +137,8 @@ public class GuiScreenAdapter extends GuiScreen { try { view.keyPressed0(typedChar, keyCode); super.keyTyped(typedChar, keyCode); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -146,8 +146,8 @@ public class GuiScreenAdapter extends GuiScreen { public void keyHeld(int keyCode, char typedChar) throws IOException { try { view.keyHeld0(typedChar, keyCode); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -155,8 +155,8 @@ public class GuiScreenAdapter extends GuiScreen { public void keyReleased(int keyCode, char typedChar) throws IOException { try { view.keyReleased0(typedChar, keyCode); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -167,8 +167,8 @@ public class GuiScreenAdapter extends GuiScreen { super.mouseClicked(mouseX, mouseY, mouseButton); view.mouseClicked0(mouseX, mouseY , mouseX, mouseY, mouseButton); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -192,8 +192,8 @@ public class GuiScreenAdapter extends GuiScreen { try { view.mouseReleased0(mouseX, mouseY , mouseX, mouseY, state); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -203,8 +203,8 @@ public class GuiScreenAdapter extends GuiScreen { try { view.mouseClickMove0(mouseX, mouseY , mouseX, mouseY, clickedMouseButton, timeSinceLastClick); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -213,8 +213,8 @@ public class GuiScreenAdapter extends GuiScreen { try { view.mouseMoved0(mouseX, mouseY , mouseX, mouseY, true); - } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) + } catch (Exception e) { + e.printStackTrace(); } } @@ -231,7 +231,6 @@ public class GuiScreenAdapter extends GuiScreen { @Override public void handleMouseInput() throws IOException { if (!isOpen) return; - try { int i = Mouse.getEventX(); int j = this.mc.displayHeight - Mouse.getEventY(); int k = Mouse.getEventButton(); @@ -256,15 +255,14 @@ public class GuiScreenAdapter extends GuiScreen { this.mouseClickMove(i, j, this.eventButton, l); } if (lastX != i || lastY != j) { - try { EnumCursor prevCursor = view.getCurrentCursor(); view.setCursor(EnumCursor.DEFAULT); this.mouseMove(i, j); EnumCursor newCursor = view.getCurrentCursor(); + try { if (prevCursor != newCursor) Mouse.setNativeCursor(GLCursors.getCursor(newCursor)); } catch (Throwable e) { - if (e.getMessage() == null || !e.getMessage().contains("hack to stop")) e.printStackTrace(); } } @@ -272,13 +270,14 @@ public class GuiScreenAdapter extends GuiScreen { int wheel = Mouse.getEventDWheel(); if (wheel != 0) { - view.mouseScrolled0(i, j, i, j, wheel); + try { + view.mouseScrolled0(i, j, i, j, wheel); + } catch (Exception e) { + e.printStackTrace(); + } } lastX = i; lastY = j; - } catch (Throwable e) { - e.printStackTrace(); - } } public void handleKeyboardInput() throws IOException { diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/xml/PropByPropParsedWidgetConverter.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/xml/PropByPropParsedWidgetConverter.java index 8f6e2feb..32663151 100644 --- a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/xml/PropByPropParsedWidgetConverter.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/guiv2/xml/PropByPropParsedWidgetConverter.java @@ -81,6 +81,8 @@ public abstract class PropByPropParsedWidgetConverter<W extends Widget, R extend .getTarget() .invoke(rootWidget); exported.setValue(obj); + } catch (Error e) { + throw e; } catch (Throwable e) { throw new RuntimeException(e); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java index 6a2295d9..a5eb360f 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/chat/ChatProcessor.java @@ -80,7 +80,7 @@ public class ChatProcessor { } } - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java index 28a702d3..30e96d2d 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java @@ -327,7 +327,7 @@ public class CommandDgDebug extends CommandBase { DungeonRoom dungeonRoom = context.getScaffoldParser().getRoomMap().get(roomPt); GeneralRoomProcessor grp = (GeneralRoomProcessor) dungeonRoom.getRoomProcessor(); grp.pathfind("COMMAND", args[1], args[2], FeatureRegistry.SECRET_LINE_PROPERTIES_AUTOPATHFIND.getRouteProperties()); - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } @@ -430,7 +430,7 @@ public class CommandDgDebug extends CommandBase { DungeonsGuide.getDungeonsGuide().getDungeonFacade().setContext(null); MapUtils.clearMap(); - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } @@ -687,7 +687,7 @@ public class CommandDgDebug extends CommandBase { for (String s : dungeonRoom.getMechanics().keySet()) { grp.pathfind("COMMAND-" + s, s, "navigate", FeatureRegistry.SECRET_LINE_PROPERTIES_AUTOPATHFIND.getRouteProperties()); } - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java index ff3e8038..b120499e 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDungeonsGuide.java @@ -215,7 +215,7 @@ public class CommandDungeonsGuide extends CommandBase { Minecraft.getMinecraft().displayGuiScreen(target); target = null; } - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java index 82c4b6cb..2d73ff92 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java @@ -252,7 +252,7 @@ public class CosmeticsManager { } } contextThreadLocal.set(total); - } catch (Throwable t) { + } catch (Exception t) { System.out.println(clientChatReceivedEvent.message); t.printStackTrace(); } @@ -367,7 +367,7 @@ public class CosmeticsManager { startingSearch, 0); } clientChatReceivedEvent.message = SurgicalReplacer.combine(chatComponents); - } catch (Throwable t) { + } catch (Exception t) { System.out.println(clientChatReceivedEvent.message); t.printStackTrace(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java index 44bdf4c0..86cf868c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/DiscordIntegrationManager.java @@ -126,7 +126,7 @@ public class DiscordIntegrationManager implements IPCListener { ipcClient.setListener(this); System.out.println("Connecting"); } catch (NoDiscordClientException ignored) { - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } @@ -184,7 +184,7 @@ public class DiscordIntegrationManager implements IPCListener { JDiscordRelation relation = JDiscordRelation.parse(obj); relationMap.put(relation.getDiscordUser().getIdLong(), relation); } - } catch (Throwable e) {e.printStackTrace();} + } catch (Exception e) {e.printStackTrace();} } private void sendRichPresence(RichPresence presence) { @@ -240,8 +240,8 @@ public class DiscordIntegrationManager implements IPCListener { else { updatePresence(); } - } catch (Throwable t) { - t.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); // let thread just die if catastrophic failure occurs. } try { Thread.sleep(32); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionDisplayPane.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionDisplayPane.java index b6478138..64c9b8a2 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionDisplayPane.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionDisplayPane.java @@ -62,7 +62,7 @@ public class ActionDisplayPane extends MPanel { displayPane = new ActionTreeDisplayPane(dungeonRoom, tree); displayPane.setBounds(new Rectangle(0,25,getBounds().width,getBounds().height-25)); add(displayPane); - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java index 9d117abd..019d42e3 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java @@ -178,7 +178,7 @@ public class GeneralEditPane extends MPanel { dataoutputstream.close(); } ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §fSaved to "+f.getName())); - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/RoommatchingPane.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/RoommatchingPane.java index 35c1728d..0b7f1df6 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/RoommatchingPane.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/RoommatchingPane.java @@ -62,7 +62,7 @@ public class RoommatchingPane extends MPanel { displayPane = new RoomMatchDisplayPane(dungeonRoom, uid, rotation); displayPane.setBounds(new Rectangle(0,25,getBounds().width,getBounds().height-25)); add(displayPane); - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java index 2af9cd76..a96b23e6 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java @@ -205,7 +205,7 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor { if (ch.getRight() != null && ch.getRight().getProcessor() != null) ch.getRight().getProcessor().onDataReceive(compound); } - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); ChatTransmitter.sendDebugChat(new ChatComponentText("Failed to analyze Bomb Defuse Chat")); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java index 7fde5290..46fff031 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java @@ -126,8 +126,10 @@ public class EventHandlerRegistry { if (target.condition == null || (target.condition.get() == Boolean.TRUE)) { // it is safe to use this here. target.invokeSite.invoke(event); } - } catch (Throwable e) { + } catch (Exception e) { logger.error("An error occurred while handling event: \nFeature = " + target.getFeature().getClass().getName(), e); + } catch (Throwable t) { + throw new RuntimeException("An catastrophic error occured while handling event: ", t); } profiler.endSection(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java index ca295afa..2362d5d6 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java @@ -63,7 +63,7 @@ public class PacketInjector extends ChannelDuplexHandler { MinecraftForge.EVENT_BUS.post(receivedEvent); packet = receivedEvent.packet; } - } catch (Throwable t) { + } catch (Exception t) { t.printStackTrace(); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/inviteViewer/PartyInviteViewer.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/inviteViewer/PartyInviteViewer.java index 2073ca3d..1479f8c0 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/inviteViewer/PartyInviteViewer.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/inviteViewer/PartyInviteViewer.java @@ -56,9 +56,8 @@ public class PartyInviteViewer extends AbstractGuiFeature { @DGEventHandler(triggerOutOfSkyblock = true) public void onTick(DGTickEvent tickEvent) { - try { + if (partyInviteViewer != null) partyInviteViewer.tick(); - } catch (Throwable e) {e.printStackTrace();} } @DGEventHandler(triggerOutOfSkyblock = true) diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/onlinealarm/PlayingDGAlarm.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/onlinealarm/PlayingDGAlarm.java index 66c530d3..c05440bc 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/onlinealarm/PlayingDGAlarm.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/discord/onlinealarm/PlayingDGAlarm.java @@ -47,9 +47,8 @@ public class PlayingDGAlarm extends AbstractGuiFeature { @DGEventHandler(triggerOutOfSkyblock = true) public void onTick(DGTickEvent event) { - try { + if (onlinePeopleViewer != null) onlinePeopleViewer.tick(); - } catch (Throwable e) {e.printStackTrace();} } @DGEventHandler(triggerOutOfSkyblock = true) public void onDiscordUserUpdate(DiscordUserUpdateEvent event) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePlayerESP.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePlayerESP.java index 404414da..5b45adb9 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePlayerESP.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePlayerESP.java @@ -75,7 +75,7 @@ public class FeaturePlayerESP extends SimpleFeature { float f = entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * renderPlayerEvent.partialRenderTick; try { renderPlayerEvent.renderer.doRender((AbstractClientPlayer) renderPlayerEvent.entityPlayer, renderPlayerEvent.x, renderPlayerEvent.y, renderPlayerEvent.z, f, renderPlayerEvent.partialRenderTick); - } catch (Throwable t) {} + } catch (Exception t) {} GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_KEEP); GL11.glStencilFunc(GL11.GL_NOTEQUAL, 1, 0xff); @@ -88,7 +88,7 @@ public class FeaturePlayerESP extends SimpleFeature { renderPlayerEvent.renderer.setRenderOutlines(true); try { renderPlayerEvent.renderer.doRender((AbstractClientPlayer) renderPlayerEvent.entityPlayer, 0,-0.9,0, f, renderPlayerEvent.partialRenderTick); - } catch (Throwable t) {} + } catch (Exception t) {} renderPlayerEvent.renderer.setRenderOutlines(false); GL11.glDepthFunc(GL11.GL_LEQUAL); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/FeatureGoodParties.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/FeatureGoodParties.java index 53279180..c929911a 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/FeatureGoodParties.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/FeatureGoodParties.java @@ -112,7 +112,7 @@ public class FeatureGoodParties extends SimpleFeature { } - } catch (Throwable e) { + } catch (Exception e) { e.printStackTrace(); } GlStateManager.colorMask(true, true, true, true); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java index 230224f9..5f87c71e 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java @@ -172,7 +172,7 @@ public class FeatureViewPlayerStatsOnJoin extends SimpleFeature { int x = guiChatBox.getX(scaledResolution); int y = guiChatBox.getY(scaledResolution); ichatc |
