diff options
Diffstat (limited to 'mod')
4 files changed, 9 insertions, 8 deletions
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java index c379c17f..f3db435c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java @@ -305,7 +305,7 @@ public class FeatureRegistry { ETC_COLLECT_SCORE = register(new FeatureCollectScore()); COSMETIC_NICKNAMECOLOR = register(new FeatureNicknameColor()); COSMETIC_PREFIX = register(new FeatureNicknamePrefix()); - DISCORD_RICHPRESENCE = register(new SimpleFeature("Discord", "Discord RPC", "Enable Discord rich presence", "advanced.richpresence", true) { + DISCORD_RICHPRESENCE = register(new SimpleFeature("Discord", "Discord RPC", "Enable Discord rich presence", "advanced.discordrichpresence", true) { { addParameter("disablenotskyblock", new FeatureParameter<Boolean>("disablenotskyblock", "Disable When not on Skyblock", "Disable When not on skyblock", false, "boolean")); } 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 9e7cc18a..e849c210 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 @@ -54,7 +54,7 @@ public class PartyInviteViewer extends SimpleFeature { private WidgetPartyInviteViewer partyInviteViewer; private OverlayWidget widget; public PartyInviteViewer() { - super("Discord", "Party Invite Viewer","Simply type /dg asktojoin or /dg atj to toggle whether ask-to-join would be presented as option on discord!\n\nRequires Discord RPC to be enabled", "discord.party_invite_viewer"); + super("Discord", "Party Invite Viewer","Simply type /dg asktojoin or /dg atj to toggle whether ask-to-join would be presented as option on discord!\n\nRequires Discord RPC to be enabled", "discord.discord_party_invite_viewer"); addParameter("ttl", new FeatureParameter<Integer>("ttl", "Request Duration", "The duration after which the requests will be dismissed automatically. The value is in seconds.", 15, "integer")); widget = new OverlayWidget( 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 892cac52..09cd4ed3 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 @@ -55,7 +55,7 @@ public class PlayingDGAlarm extends SimpleFeature { private OverlayWidget widget; public PlayingDGAlarm() { - super("Discord", "Friend Online Notification","Notifies you in bottom when your discord friend has launched a Minecraft with DG!\n\nRequires the Friend's Discord RPC to be enabled", "discord.playingalarm"); + super("Discord", "Friend Online Notification","Notifies you in bottom when your discord friend has launched a Minecraft with DG!\n\nRequires the Friend's Discord RPC to be enabled", "discord.discord_playingalarm"); widget = new OverlayWidget( onlinePeopleViewer = new WidgetOnlinePeopleViewer(), OverlayType.OVER_ANY, @@ -81,10 +81,11 @@ public class PlayingDGAlarm extends SimpleFeature { public boolean isDisplayable(JDiscordRelation jDiscordRelation) { JDiscordRelation.DiscordRelationType relationshipType = jDiscordRelation.getRelationType(); - if (relationshipType == JDiscordRelation.DiscordRelationType.Blocked) return false; - if (relationshipType == JDiscordRelation.DiscordRelationType.None) return false; - if (relationshipType == JDiscordRelation.DiscordRelationType.PendingIncoming) return false; - if (relationshipType == JDiscordRelation.DiscordRelationType.PendingOutgoing) return false; +// if (relationshipType == JDiscordRelation.DiscordRelationType.Blocked) return false; +// if (relationshipType == JDiscordRelation.DiscordRelationType.None) return false; +// if (relationshipType == JDiscordRelation.DiscordRelationType.PendingIncoming) return false; +// if (relationshipType == JDiscordRelation.DiscordRelationType.PendingOutgoing) return false; + if (relationshipType != JDiscordRelation.DiscordRelationType.Friend) return false; return "816298079732498473".equals(jDiscordRelation.getApplicationId()); } diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/overlay/OverlayManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/overlay/OverlayManager.java index 4ce5f3aa..09f47fef 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/overlay/OverlayManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/overlay/OverlayManager.java @@ -83,7 +83,7 @@ public class OverlayManager { @SubscribeEvent public void renderOverlay(RenderGameOverlayEvent.Post postRender) { - if (!(postRender.type == RenderGameOverlayEvent.ElementType.EXPERIENCE || postRender.type == RenderGameOverlayEvent.ElementType.JUMPBAR)) + if (!(postRender.type == RenderGameOverlayEvent.ElementType.ALL)) return; view.getContext().CONTEXT.put(OVERLAY_TYPE_KEY, OverlayType.UNDER_CHAT); drawScreen(postRender.partialTicks); |