Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-446 Notice #446

Merged
merged 19 commits into from
Jun 21, 2023
Merged

GH-446 Notice #446

merged 19 commits into from
Jun 21, 2023

Conversation

Rollczi
Copy link
Member

@Rollczi Rollczi commented Jun 18, 2023 •
edited by vLuckyyy
Loading

New feature:

  • support sound
  • support hide title

New notice API:
image

Examples

empty: []

oneLineChat: "Hello world"

multiLineChat:
  - "Hello"
  - "world"

onJoin:
  title: "Hello world"
  subtitle: "Subtitle"
  times: "1s 2s 1s"
  
onDeath:
  subtitle: "Subtitle"
  chat: "Death message"
  
multiChat:
  actionbar: "Hello world"
  chat:
    - "Hello"
    - "world"

onQuit:
  actionbar: "Hello world"
  sound: "PLAYER_LEVELUP 2.0 1.0" 

exampleWithSoundCategory:
  actionbar: "Hello world"
  sound: "PLAYER_LEVELUP WEATHER 2.0 1.0" # If you want to play a sound in a certain category, for example if a player has the sound category "WEATHER" in the game settings set to 0%, the sound will not play.

onOtherAction:
  titleHide: true

Sound categories:

  • AMBIENT
  • BLOCKS
  • HOSTILE
  • MASTER
  • MUSIC
  • NEUTRAL
  • PLAYERS
  • RECORDS
  • VOICE
  • WEATHER

vLuckyyy
vLuckyyy requested changes Jun 19, 2023
View reviewed changes
Copy link
Member

@vLuckyyy vLuckyyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

konflikty trzeba naprawic, a tak po za tym to mi sie podoba

@Rollczi
Merge branch 'master' into notice
7d060da 
# Conflicts:
#	eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java
#	eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/SpeedCommand.java
#	eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
#	eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
#	eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
@Rollczi
Fix merge conflicts.
8e6f353
vLuckyyy
vLuckyyy requested changes Jun 19, 2023
View reviewed changes
Copy link
Member

@vLuckyyy vLuckyyy left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wszystkie In zostały zmienione na fadeIn troche wypisałem, ale przydałoby się poprawić bo dużo zbędnych klas jest w review.

eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java Outdated Show resolved Hide resolved
...c/main/java/com/eternalcode/core/configuration/implementation/PlaceholdersConfiguration.java Outdated Show resolved Hide resolved
...ore/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java Outdated
@@ -24,7 +24,7 @@ public class PluginConfiguration implements ReloadableConfig {
"#",
"# This is the main configuration file for EternalCore.",
"#",
"# If you need help with the configuration or have any questions related to EternalCore, join us in our discord, or create an issue on our GitHub.",
"# If you need help with the configuration or have any questions related to EternalCore, join us fadeIn our discord, or create an issue on our GitHub.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Czemu to się zmieniło na fadeIn?

...ore/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/ButcherCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/ButcherCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/mob/ButcherCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/time/DayCommand.java Outdated Show resolved Hide resolved
...ore-core/src/test/java/com/eternalcode/core/notice/PlatformBroadcasterAdventureImplTest.java Show resolved Hide resolved
vLuckyyy
vLuckyyy approved these changes Jun 19, 2023
View reviewed changes
Copy link
Member

@vLuckyyy vLuckyyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reszta chyba git, jak znajdę błąd to napisze

@vLuckyyy
Copy link
Member

Ponadto poprawie od siebie komentarze dot. Notification w domu.

@Rollczi Rollczi changed the title Notice GH-446 Notice Jun 19, 2023
P1otrulla
P1otrulla approved these changes Jun 20, 2023
View reviewed changes
eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/command/handler/NotificationHandler.java Outdated Show resolved Hide resolved
...c/main/java/com/eternalcode/core/configuration/implementation/PlaceholdersConfiguration.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/time/DayCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/time/NightCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/feature/essentials/weather/RainCommand.java Outdated Show resolved Hide resolved
eternalcore-core/src/main/java/com/eternalcode/core/notice/NoticeService.java Outdated Show resolved Hide resolved
eternalcore-core/src/test/java/com/eternalcode/core/test/MockAudienceProvider.java Outdated Show resolved Hide resolved
@Rollczi Rollczi merged commit 1030b6e into master Jun 21, 2023
@Rollczi Rollczi deleted the notice branch June 21, 2023 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@P1otrulla P1otrulla P1otrulla approved these changes

@vLuckyyy vLuckyyy vLuckyyy approved these changes

@Jakubk15 Jakubk15 Awaiting requested review from Jakubk15

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Rollczi @vLuckyyy @P1otrulla