diff --git a/src/main/java/markil3/immersive_hud/EventBus.java b/src/main/java/markil3/immersive_hud/EventBus.java index 3ddcf23..5ee5898 100644 --- a/src/main/java/markil3/immersive_hud/EventBus.java +++ b/src/main/java/markil3/immersive_hud/EventBus.java @@ -59,19 +59,29 @@ public class EventBus @SubscribeEvent public static void onClick(final PlayerInteractEvent event) { - DistExecutor.safeRunWhenOn(Dist.CLIENT, - (DistExecutor.SafeSupplier) () -> new DistExecutor.SafeRunnable() - { - @Override - public void run() + try + { + DistExecutor.safeRunWhenOn(Dist.CLIENT, + (DistExecutor.SafeSupplier) () -> new DistExecutor.SafeRunnable() { - Item item = - Optional.ofNullable(event.getItemStack()) - .map(ItemStack::getItem) - .orElse(null); - TimerUtils.onClick(event.getHand(), item); - } - }); + @Override + public void run() + { + Item item = + Optional.ofNullable(event.getItemStack()) + .map(ItemStack::getItem) + .orElse(null); + TimerUtils.onClick(event.getHand(), item); + } + }); + } + catch (Exception e) + { + LOGGER.error( + "Error in running markil3.immersive_hud.EventBus#onClick " + + "event", + e); + } } /** @@ -86,15 +96,25 @@ public class EventBus @SubscribeEvent public static void onMount(final EntityMountEvent event) { - DistExecutor.safeRunWhenOn(Dist.CLIENT, - (DistExecutor.SafeSupplier) () -> new DistExecutor.SafeRunnable() - { - @Override - public void run() + try + { + DistExecutor.safeRunWhenOn(Dist.CLIENT, + (DistExecutor.SafeSupplier) () -> new DistExecutor.SafeRunnable() { - TimerUtils.resetMountHealth(); - } - }); + @Override + public void run() + { + TimerUtils.resetMountHealth(); + } + }); + } + catch (Exception e) + { + LOGGER.error( + "Error in running markil3.immersive_hud.EventBus#onMount " + + "event", + e); + } } /** @@ -106,9 +126,21 @@ public class EventBus @SubscribeEvent public static void onRenderHand(final RenderHandEvent event) { - if (TimerUtils.onRenderHand(event.getHand(), event.getMatrixStack(), event.getPartialTicks())) + try { - event.setCanceled(true); + if (TimerUtils.onRenderHand(event.getHand(), + event.getMatrixStack(), + event.getPartialTicks())) + { + event.setCanceled(true); + } + } + catch (Exception e) + { + LOGGER.error( + "Error in running markil3.immersive_hud" + + ".EventBus#onRenderHand event", + e); } } @@ -121,151 +153,171 @@ public class EventBus @SubscribeEvent public static void onGUIDraw(final RenderGameOverlayEvent event) { - Minecraft mc = Minecraft.getInstance(); - boolean fadeIn = false; - - switch (event.getType()) + try { - case CROSSHAIRS: - if (event instanceof RenderGameOverlayEvent.Pre) + Minecraft mc = Minecraft.getInstance(); + boolean fadeIn = false; + + switch (event.getType()) { - if (TimerUtils.drawCrosshair(event.getPartialTicks())) + case CROSSHAIRS: + if (event instanceof RenderGameOverlayEvent.Pre) + { + if (TimerUtils.drawCrosshair(event.getPartialTicks())) + { + event.setCanceled(true); + } + } + /* + * Reset the transparency. + */ + else if (event instanceof RenderGameOverlayEvent.Post) + { + resetAlpha(); + } + break; + case POTION_ICONS: + if (event instanceof RenderGameOverlayEvent.Pre) + { + TimerUtils.updatePotions(mc.player); + event.setCanceled(true); + RenderUtils.renderPotionIcons(mc, + mc.ingameGUI, + event.getMatrixStack(), event.getPartialTicks()); + resetAlpha(); + } + break; + case HOTBAR: + if (event instanceof RenderGameOverlayEvent.Pre) { event.setCanceled(true); + if (!TimerUtils.drawHotbar(event.getPartialTicks())) + { + RenderUtils.renderHotbar(mc, mc.ingameGUI, + event.getMatrixStack(), + event.getPartialTicks(), TimerUtils.hotbarTime); + } } - } - /* - * Reset the transparency. - */ - else if (event instanceof RenderGameOverlayEvent.Post) - { - resetAlpha(); - } - break; - case POTION_ICONS: - if (event instanceof RenderGameOverlayEvent.Pre) - { - TimerUtils.updatePotions(mc.player); - event.setCanceled(true); - RenderUtils.renderPotionIcons(mc, - mc.ingameGUI, - event.getMatrixStack(), event.getPartialTicks()); - resetAlpha(); - } - break; - case HOTBAR: - if (event instanceof RenderGameOverlayEvent.Pre) - { - event.setCanceled(true); - if (!TimerUtils.drawHotbar(event.getPartialTicks())) + break; + case HEALTH: + if (event instanceof RenderGameOverlayEvent.Pre) { - RenderUtils.renderHotbar(mc, mc.ingameGUI, - event.getMatrixStack(), - event.getPartialTicks(), TimerUtils.hotbarTime); + if (TimerUtils.drawHealth(event.getMatrixStack(), + event.getPartialTicks())) + { + event.setCanceled(true); + } } - } - break; - case HEALTH: - if (event instanceof RenderGameOverlayEvent.Pre) - { - if (TimerUtils.drawHealth(event.getMatrixStack(), event.getPartialTicks())) + else if (event instanceof RenderGameOverlayEvent.Post) + { + event.getMatrixStack().pop(); + resetAlpha(); + } + break; + case FOOD: + if (event instanceof RenderGameOverlayEvent.Pre) + { + if (TimerUtils.drawHunger(event.getMatrixStack(), + event.getPartialTicks())) + { + event.setCanceled(true); + } + } + /* + * Reset the transparency. + */ + else if (event instanceof RenderGameOverlayEvent.Post) + { + event.getMatrixStack().pop(); + resetAlpha(); + } + break; + case ARMOR: + if (event instanceof RenderGameOverlayEvent.Pre) + { + if (TimerUtils.drawArmor(event.getMatrixStack(), + event.getPartialTicks())) + { + event.setCanceled(true); + } + } + /* + * Reset the transparency. + */ + else if (event instanceof RenderGameOverlayEvent.Post) + { + event.getMatrixStack().pop(); + resetAlpha(); + } + break; + case AIR: + if (event instanceof RenderGameOverlayEvent.Pre) + { + if (TimerUtils.drawAir(event.getMatrixStack(), + event.getPartialTicks())) + { + event.setCanceled(true); + } + } + /* + * Reset the transparency. + */ + else if (event instanceof RenderGameOverlayEvent.Post) + { + event.getMatrixStack().pop(); + resetAlpha(); + } + break; + case HEALTHMOUNT: + if (event instanceof RenderGameOverlayEvent.Pre) + { + if (TimerUtils.drawMountHealth(event.getMatrixStack(), + event.getPartialTicks())) + { + event.setCanceled(true); + } + } + else if (event instanceof RenderGameOverlayEvent.Post) + { + event.getMatrixStack().pop(); + resetAlpha(); + } + break; + case JUMPBAR: + if (event instanceof RenderGameOverlayEvent.Pre) { event.setCanceled(true); + if (!TimerUtils.drawJumpbar(event.getPartialTicks())) + { + RenderUtils.renderHorseJumpBar(mc, + mc.ingameGUI, + event.getMatrixStack(), + event.getPartialTicks(), + TimerUtils.jumpTime); + } } - } - else if (event instanceof RenderGameOverlayEvent.Post) - { - event.getMatrixStack().pop(); - resetAlpha(); - } - break; - case FOOD: - if (event instanceof RenderGameOverlayEvent.Pre) - { - if (TimerUtils.drawHunger(event.getMatrixStack(), event.getPartialTicks())) + break; + case EXPERIENCE: + if (event instanceof RenderGameOverlayEvent.Pre) { event.setCanceled(true); + if (!TimerUtils.drawExperience(event.getPartialTicks())) + { + RenderUtils.renderExperience(mc, + mc.ingameGUI, + event.getMatrixStack(), + event.getPartialTicks(), + TimerUtils.experienceTime); + } } + break; } - /* - * Reset the transparency. - */ - else if (event instanceof RenderGameOverlayEvent.Post) - { - event.getMatrixStack().pop(); - resetAlpha(); - } - break; - case ARMOR: - if (event instanceof RenderGameOverlayEvent.Pre) - { - if (TimerUtils.drawArmor(event.getMatrixStack(), event.getPartialTicks())) - { - event.setCanceled(true); - } - } - /* - * Reset the transparency. - */ - else if (event instanceof RenderGameOverlayEvent.Post) - { - event.getMatrixStack().pop(); - resetAlpha(); - } - break; - case AIR: - if (event instanceof RenderGameOverlayEvent.Pre) - { - if (TimerUtils.drawAir(event.getMatrixStack(), event.getPartialTicks())) - { - event.setCanceled(true); - } - } - /* - * Reset the transparency. - */ - else if (event instanceof RenderGameOverlayEvent.Post) - { - event.getMatrixStack().pop(); - resetAlpha(); - } - break; - case HEALTHMOUNT: - if (event instanceof RenderGameOverlayEvent.Pre) - { - if (TimerUtils.drawMountHealth(event.getMatrixStack(), event.getPartialTicks())) - { - event.setCanceled(true); - } - } - else if (event instanceof RenderGameOverlayEvent.Post) - { - event.getMatrixStack().pop(); - resetAlpha(); - } - break; - case JUMPBAR: - if (event instanceof RenderGameOverlayEvent.Pre) - { - event.setCanceled(true); - if (!TimerUtils.drawJumpbar(event.getPartialTicks())) - { - RenderUtils.renderHorseJumpBar(mc, mc.ingameGUI, - event.getMatrixStack(), event.getPartialTicks(), TimerUtils.jumpTime); - } - } - break; - case EXPERIENCE: - if (event instanceof RenderGameOverlayEvent.Pre) - { - event.setCanceled(true); - if (!TimerUtils.drawExperience(event.getPartialTicks())) - { - RenderUtils.renderExperience(mc, mc.ingameGUI, - event.getMatrixStack(), event.getPartialTicks(), TimerUtils.experienceTime); - } - } - break; + } + catch (Exception e) + { + LOGGER.error( + "Error in running markil3.immersive_hud.EventBus#onGUIDraw event", + e); } } }