diff options
Diffstat (limited to 'mod/src/main/java')
21 files changed, 23 insertions, 26 deletions
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java index 9b901907..79112aca 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/GuiFeature.java @@ -68,7 +68,6 @@ public abstract class GuiFeature extends AbstractFeature { @DGEventHandler public void drawScreen(RenderGameOverlayEvent.Post postRender) { - if (!isEnabled()) return; if (!(postRender.type == RenderGameOverlayEvent.ElementType.EXPERIENCE || postRender.type == RenderGameOverlayEvent.ElementType.JUMPBAR)) return; GlStateManager.pushMatrix(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureBoxRealLivid.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureBoxRealLivid.java index cdc99aaf..c60e1336 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureBoxRealLivid.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureBoxRealLivid.java @@ -44,7 +44,6 @@ public class FeatureBoxRealLivid extends SimpleFeature { @DGEventHandler public void drawWorld(RenderWorldLastEvent event) { float partialTicks = event.partialTicks; - if (!isEnabled()) return; if (!skyblockStatus.isOnDungeon()) return; if (DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext() == null) return; if (DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext().getBossfightProcessor() == null) return; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureChestPrice.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureChestPrice.java index 953126f6..bd42819e 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureChestPrice.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureChestPrice.java @@ -49,7 +49,6 @@ public class FeatureChestPrice extends SimpleFeature { @DGEventHandler public void onGuiBGRender(GuiScreenEvent.BackgroundDrawnEvent rendered) { - if (!isEnabled()) return; if (!(rendered.gui instanceof GuiChest)) return; if (!DungeonsGuide.getDungeonsGuide().getSkyblockStatus().isOnDungeon()) return; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java index 55138fde..425dcc69 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java @@ -51,7 +51,7 @@ public class FeatureHideAnimals extends SimpleFeature { @DGEventHandler() public void onEntityRenderPre(RenderLivingEvent.Pre renderPlayerEvent) { - if (!isEnabled()) return; + if (!skyblockStatus.isOnDungeon()) return; if (DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext() == null) return; if (DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext().getBossfightProcessor() == null) return; 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 1c04429c..42ea79c1 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 @@ -61,7 +61,7 @@ public class PartyInviteViewer extends SimpleFeature { @DGEventHandler public void drawScreen(RenderGameOverlayEvent.Post postRender) { - if (!isEnabled()) return; + if (!(postRender.type == RenderGameOverlayEvent.ElementType.EXPERIENCE || postRender.type == RenderGameOverlayEvent.ElementType.JUMPBAR)) return; try { @@ -95,7 +95,7 @@ public class PartyInviteViewer extends SimpleFeature { @DGEventHandler public void onMouseInput(GuiScreenEvent.MouseInputEvent.Pre mouseInputEvent) { - if (!isEnabled()) return; + int mouseX = Mouse.getX(); int mouseY = Minecraft.getMinecraft().displayHeight - Mouse.getY() +3; for (PartyJoinRequest joinRequest:joinRequests) { 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 5ce63a0b..ae799764 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 @@ -71,7 +71,7 @@ public class PlayingDGAlarm extends SimpleFeature { @DGEventHandler public void drawScreen(RenderGameOverlayEvent.Post postRender) { - if (!isEnabled()) return; + if (!(postRender.type == RenderGameOverlayEvent.ElementType.EXPERIENCE || postRender.type == RenderGameOverlayEvent.ElementType.JUMPBAR)) return; try { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxBats.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxBats.java index 4d0eec66..56e32138 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxBats.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxBats.java @@ -47,7 +47,7 @@ public class FeatureBoxBats extends SimpleFeature { @DGEventHandler public void drawWorld(RenderWorldLastEvent event) { float partialTicks = event.partialTicks; - if (!isEnabled()) return; + if (!skyblockStatus.isOnDungeon()) return; final BlockPos player = Minecraft.getMinecraft().thePlayer.getPosition(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxSkelemaster.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxSkelemaster.java index 49a6bb58..c705febc 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxSkelemaster.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxSkelemaster.java @@ -47,7 +47,7 @@ public class FeatureBoxSkelemaster extends SimpleFeature { @DGEventHandler public void drawWorld(RenderWorldLastEvent event) { float partialTicks = event.partialTicks; - if (!isEnabled()) return; + if (!skyblockStatus.isOnDungeon()) return; final BlockPos player = Minecraft.getMinecraft().thePlayer.getPosition(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxStarMobs.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxStarMobs.java index 2dbc1baa..462489ff 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxStarMobs.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureBoxStarMobs.java @@ -47,7 +47,7 @@ public class FeatureBoxStarMobs extends SimpleFeature { @DGEventHandler public void drawWorld(RenderWorldLastEvent event) { float partialTicks = event.partialTicks; - if (!isEnabled()) return; + if (!skyblockStatus.isOnDungeon()) return; final BlockPos player = Minecraft.getMinecraft().thePlayer.getPosition(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureHideNameTags.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureHideNameTags.java index 9e8a7ed1..6aff796a 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureHideNameTags.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureHideNameTags.java @@ -37,7 +37,7 @@ public class FeatureHideNameTags extends SimpleFeature { @DGEventHandler public void onEntityRenderPre(RenderLivingEvent.Pre renderPlayerEvent) { - if (!isEnabled()) return; + if (!skyblockStatus.isOnDungeon()) return; if (renderPlayerEvent.entity instanceof EntityArmorStand) { 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 26ba2b3e..69c8ec07 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 @@ -48,7 +48,7 @@ public class FeaturePlayerESP extends SimpleFeature { if (preCalled) return; - if (!isEnabled()) return; + DungeonContext dungeonContext = DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePressAnyKeyToCloseChest.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePressAnyKeyToCloseChest.java index 5e228eed..8dd96533 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePressAnyKeyToCloseChest.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeaturePressAnyKeyToCloseChest.java @@ -41,7 +41,7 @@ public class FeaturePressAnyKeyToCloseChest extends SimpleFeature { @DGEventHandler public void onKeyInput(GuiScreenEvent.KeyboardInputEvent keyboardInputEvent) { GuiScreen screen = Minecraft.getMinecraft().currentScreen; - if (!isEnabled()) return; + if (!DungeonsGuide.getDungeonsGuide().getSkyblockStatus().isOnDungeon()) return; if (screen instanceof GuiChest){ @@ -65,7 +65,7 @@ public class FeaturePressAnyKeyToCloseChest extends SimpleFeature { @DGEventHandler public void onMouseInput(GuiScreenEvent.MouseInputEvent.Pre mouseInputEvent) { GuiScreen screen = Minecraft.getMinecraft().currentScreen; - if (!isEnabled()) return; + if (!DungeonsGuide.getDungeonsGuide().getSkyblockStatus().isOnDungeon()) return; if (Mouse.getEventButton() == -1) return; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureCopyMessages.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureCopyMessages.java index 465d8aee..2c69e2dd 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureCopyMessages.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureCopyMessages.java @@ -36,7 +36,7 @@ public class FeatureCopyMessages extends SimpleFeature { } @DGEventHandler(triggerOutOfSkyblock = true) public void onChat(ClientChatReceivedEvent clientChatReceivedEvent) { - if (!isEnabled()) return; + if (clientChatReceivedEvent.type == 2) return; clientChatReceivedEvent.message.appendSibling(new ChatComponentText(" §7[Copy]").setChatStyle(new ChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, TextUtils.stripColor(clientChatReceivedEvent.message.getFormattedText()))).setChatHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ChatComponentText("§eCopy Message"))))); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureDisableMessage.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureDisableMessage.java index ac589202..48056824 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureDisableMessage.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureDisableMessage.java @@ -65,7 +65,7 @@ public class FeatureDisableMessage extends SimpleFeature { @DGEventHandler() public void onChat(ClientChatReceivedEvent clientChatReceivedEvent) { if (clientChatReceivedEvent.type == 2) return; - if (!isEnabled()) return; + if (!SkyblockStatus.isOnSkyblock()) return; String msg = clientChatReceivedEvent.message.getFormattedText(); for (MessageData md:PRE_DEFINED) { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java index a29b5431..559fe2aa 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java @@ -134,7 +134,7 @@ public class FeatureEpicCountdown extends SimpleFeature { @DGEventHandler public void onRender(RenderGameOverlayEvent.Post postRender) { - if (!isEnabled()) return; + if (!(postRender.type == RenderGameOverlayEvent.ElementType.EXPERIENCE || postRender.type == RenderGameOverlayEvent.ElementType.JUMPBAR)) return; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java index c3429aee..dc68f133 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java @@ -82,7 +82,7 @@ public class FeaturePenguins extends SimpleFeature { @DGEventHandler public void onEntityRenderPre(RenderPlayerEvent.Pre renderPlayerEvent) { - if (!isEnabled()) return; + if (renderPlayerEvent.entityPlayer.isInvisible()) return; renderPlayerEvent.setCanceled(true); GlStateManager.pushMatrix(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipDungeonStat.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipDungeonStat.java index dd4f3436..0447c7ea 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipDungeonStat.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipDungeonStat.java @@ -33,7 +33,7 @@ public class FeatureTooltipDungeonStat extends SimpleFeature { @DGEventHandler public void onTooltip(ItemTooltipEvent event) { - if (!isEnabled()) return; + ItemStack hoveredItem = event.itemStack; NBTTagCompound compound = hoveredItem.getTagCompound(); diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipPrice.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipPrice.java index 42c7037b..f34dbd6e 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipPrice.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureTooltipPrice.java @@ -42,7 +42,7 @@ public class FeatureTooltipPrice extends SimpleFeature { @DGEventHandler public void onTooltip(ItemTooltipEvent event) { - if (!isEnabled()) return; + boolean activated = !this.<Boolean>getParameter("reqShift").getValue() || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT); 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 faa2516f..53279180 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 @@ -44,7 +44,7 @@ public class FeatureGoodParties extends SimpleFeature { @DGEventHandler public void onGuiPostRender(GuiScreenEvent.DrawScreenEvent.Post rendered) { - if (!isEnabled()) return; + if (!(Minecraft.getMinecraft().currentScreen instanceof GuiChest)) return; GuiChest chest = (GuiChest) Minecraft.getMinecraft().currentScreen; ContainerChest cont = (ContainerChest) chest.inventorySlots; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java index 42f442cc..94b0acc3 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java @@ -53,7 +53,7 @@ public class FeatureCustomPartyFinder extends SimpleFeature { @DGEventHandler public void onGuiOpen(GuiOpenEvent event) { if (event.gui == null) guiCustomPartyFinder = null; - if (!isEnabled()) return; + if (!(event.gui instanceof GuiChest)) return; GuiChest chest = (GuiChest) event.gui; if (!(chest.inventorySlots instanceof ContainerChest)) return; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/mechanicbrowser/FeatureMechanicBrowse.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/mechanicbrowser/FeatureMechanicBrowse.java index 4be32934..fb279ea9 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/mechanicbrowser/FeatureMechanicBrowse.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/secret/mechanicbrowser/FeatureMechanicBrowse.java @@ -90,7 +90,7 @@ public class FeatureMechanicBrowse extends GuiFeature { @Override public void drawScreen(RenderGameOverlayEvent.Post post) { - if (!isEnabled()) return; + int i = Mouse.getEventX(); int j = Minecraft.getMinecraft().displayHeight - Mouse.getEventY(); if (Minecraft.getMinecraft().displayWidth != lastWidth || Minecraft.getMinecraft().displayHeight != lastHeight) mGuiMechanicBrowser.initGui(); @@ -109,7 +109,7 @@ public class FeatureMechanicBrowse extends GuiFeature { @DGEventHandler public void onMouseInput(GuiScreenEvent.MouseInputEvent.Pre mouseInputEvent) { - if (!isEnabled()) return; + try { mGuiMechanicBrowser.handleMouseInput(); } catch (IOException e) { @@ -120,7 +120,7 @@ public class FeatureMechanicBrowse extends GuiFeature { @DGEventHandler public void onGuiPreRender(GuiScreenEvent.DrawScreenEvent.Pre rendered) { - if (!isEnabled()) return; + int i = Mouse.getEventX(); int j = Minecraft.getMinecraft().displayHeight - Mouse.getEventY(); mGuiMechanicBrowser.drawScreen(i, j, rendered.renderPartialTicks); @@ -129,7 +129,7 @@ public class FeatureMechanicBrowse extends GuiFeature { @DGEventHandler public void drawWorld(RenderWorldLastEvent event) { float partialTicks = event.partialTicks; - if (!isEnabled()) return; + SkyblockStatus skyblockStatus = DungeonsGuide.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; if (DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext() == null || !DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext().getMapProcessor().isInitialized()) return; |