diff options
6 files changed, 26 insertions, 28 deletions
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 85784814..20edfc77 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 @@ -64,10 +64,10 @@ public class PlayingDGAlarm extends AbstractGuiFeature { 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/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnline.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnline.gui index 1b2bda6b..6553db30 100644 --- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnline.gui +++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnline.gui @@ -16,31 +16,31 @@ ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --> - <padding left="5" right="5" top="2.5" bottom="2.5"> + <padding left="2.5" right="2.5" top="1.25" bottom="1.25"> <border> <line slot="left" dir="VERTICAL" thickness="1.0" color="#FF23272A"/> <line slot="top" dir="HORIZONTAL" thickness="1.0" color="#FF23272A"/> <line slot="bottom" dir="HORIZONTAL" thickness="1.0" color="#FF23272A"/> <line slot="right" dir="VERTICAL" thickness="1.0" color="#FF23272A"/> <bgcolor slot="content" backgroundColor="#FF2C2F33"> - <padding left="3" right="3" top="3" bottom="3"> + <padding left="1.5" right="1.5" top="1.5" bottom="1.5"> <IntrinsicHeight> <IntrinsicWidth> <row> <UrlImage bind:url="avatarUrl"/> - <size width="5"></size> + <size width="2.5"></size> <flexible> <col crossAlign="START"> <row crossAlign="END"> - <scaler scale="3.0"> + <scaler scale="1.5"> <Text bind:text="username" color="#FFFFFFFF"/> </scaler> <Text text="#" color="#FFAAAAAA"/> <Text bind:text="discriminator" color="#FFAAAAAA"/> </row> - <size height="5"/> + <size height="2.5"/> <Text text="started playing with Dungeons Guide!" color="#FFFFFFFF"/> - <size height="5"/> + <size height="2.5"/> </col> </flexible> </row> diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnlineList.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnlineList.gui index 3ab3e7f8..8bd99959 100644 --- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnlineList.gui +++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordOnline/discordOnlineList.gui @@ -18,5 +18,6 @@ <align hAlign="END" vAlign="START"> <col mainAlign="START" crossAlign="END" bind:api="listApi"> + <size height="2.5"/> </col> </align> diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui index 757e9bf0..748a4096 100644 --- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui +++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/invite.gui @@ -16,33 +16,32 @@ ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --> - <padding left="5" right="5" top="2.5" bottom="2.5"> + <padding left="2.5" right="2.5" top="1.25" bottom="1.25"> <border> <line slot="left" dir="VERTICAL" thickness="1.0" color="#FF23272A"/> <line slot="top" dir="HORIZONTAL" thickness="1.0" color="#FF23272A"/> <line slot="bottom" dir="HORIZONTAL" thickness="1.0" color="#FF23272A"/> <line slot="right" dir="VERTICAL" thickness="1.0" color="#FF23272A"/> <bgcolor slot="content" backgroundColor="#FF2C2F33"> - <padding left="3" right="3" top="3" bottom="3"> + <padding left="1.5" right="1.5" top="1.5" bottom="1.5"> <IntrinsicHeight> <IntrinsicWidth> <row> <UrlImage bind:url="avatarUrl"/> - <size width="5"></size> + <size width="2.5"></size> <flexible> <col crossAlign="START"> <row crossAlign="END"> - <scaler scale="3.0"> + <scaler scale="1.5"> <Text bind:text="username" color="#FFFFFFFF"/> </scaler> <Text text="#" color="#FFAAAAAA"/> <Text bind:text="discriminator" color="#FFAAAAAA"/> </row> - <size height="5"/> + <size height="2.5"/> <Text text="§ewants you to join their party!" color="#FFFFFFFF"/> - <size height="5"/> - <size height="30"> - <scaler scale="2.0" > + <size height="2.5"/> + <size height="15"> <SelectiveContainer bind:visible="visible"> <row crossAlign="START" slot="buttons"> <flexible fit="TIGHT" flex="1"> @@ -76,7 +75,6 @@ <Text text="Accepted Invite" slot="accepted" color="#FFFFFFFF"/> <Text text="Denied Invite" slot="denied" color="#FFFFFFFF"/> </SelectiveContainer> - </scaler> </size> </col> </flexible> diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui index 1640b705..adfab373 100644 --- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui +++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/joinRequest.gui @@ -16,33 +16,32 @@ ~ along with this program. If not, see <https://www.gnu.org/licenses/>. --> - <padding left="5" right="5" top="2.5" bottom="2.5"> + <padding left="2.5" right="2.5" top="1.25" bottom="1.25"> <border> <line slot="left" dir="VERTICAL" thickness="1.0" color="#FF23272A"/> <line slot="top" dir="HORIZONTAL" thickness="1.0" color="#FF23272A"/> <line slot="bottom" dir="HORIZONTAL" thickness="1.0" color="#FF23272A"/> <line slot="right" dir="VERTICAL" thickness="1.0" color="#FF23272A"/> <bgcolor slot="content" backgroundColor="#FF2C2F33"> - <padding left="3" right="3" top="3" bottom="3"> + <padding left="1.5" right="1.5" top="1.5" bottom="1.5"> <IntrinsicHeight> <IntrinsicWidth> <row> <UrlImage bind:url="avatarUrl"/> - <size width="5"></size> + <size width="2.5"></size> <flexible> <col crossAlign="START"> <row crossAlign="END"> - <scaler scale="3.0"> + <scaler scale="1.5"> <Text bind:text="username" color="#FFFFFFFF"/> </scaler> <Text text="#" color="#FFAAAAAA"/> <Text bind:text="discriminator" color="#FFAAAAAA"/> </row> - <size height="5"/> + <size height="2.5"/> <Text text="wants to join your party!" color="#FFFFFFFF"/> - <size height="5"/> - <size height="30"> - <scaler scale="2.0"> + <size height="2.5"/> + <size height="15"> <SelectiveContainer bind:visible="visible"> <row crossAlign="START" slot="buttons"> <flexible fit="TIGHT" flex="1"> @@ -89,7 +88,6 @@ <Text text="Denied Join Request" slot="denied" color="#FFFFFFFF"/> <Text text="Ignored Join Request" slot="ignored" color="#FFFFFFFF"/> </SelectiveContainer> - </scaler> </size> </col> </flexible> diff --git a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/partyInviteList.gui b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/partyInviteList.gui index 0d1d2590..d6a3c1b5 100644 --- a/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/partyInviteList.gui +++ b/mod/src/main/resources/assets/dungeonsguide/gui/features/discordParty/partyInviteList.gui @@ -18,5 +18,6 @@ <align hAlign="START" vAlign="START"> <col mainAlign="START" crossAlign="START" bind:api="listApi"> + <size height="2.5"/> </col> </align> |