diff options
| author | ThatGravyBoat <thatgravyboat@gmail.com> | 2021-09-27 14:18:53 -0230 |
|---|---|---|
| committer | ThatGravyBoat <thatgravyboat@gmail.com> | 2021-09-27 14:18:53 -0230 |
| commit | 06c495fd067ed5c16b34322d41e9674319e09506 (patch) | |
| tree | aa05fcfb4f3f16dba59435814c0513b8f68062ef /src/main/java/com/thatgravyboat/skyblockhud/api | |
| parent | f1fd06d889162ac72395ef66043970cfe42cde5e (diff) | |
| parent | 8f14ae49e5cfd329a70895e74ebb22bc7559f32e (diff) | |
| download | SkyblockHud-Death-Defied-06c495fd067ed5c16b34322d41e9674319e09506.tar.gz SkyblockHud-Death-Defied-06c495fd067ed5c16b34322d41e9674319e09506.tar.bz2 SkyblockHud-Death-Defied-06c495fd067ed5c16b34322d41e9674319e09506.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
# src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinRenderItem.java
Diffstat (limited to 'src/main/java/com/thatgravyboat/skyblockhud/api')
3 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java index ba24a5d..f1d4d38 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileJoinedEvent.java @@ -6,7 +6,7 @@ public class ProfileJoinedEvent extends Event { public String profile; - public ProfileJoinedEvent(String profile){ + public ProfileJoinedEvent(String profile) { this.profile = profile; } } diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java index e8561c6..408ac8a 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/ProfileSwitchedEvent.java @@ -6,8 +6,7 @@ public class ProfileSwitchedEvent extends Event { public String profile; - public ProfileSwitchedEvent(String profile){ + public ProfileSwitchedEvent(String profile) { this.profile = profile; } - } diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java b/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java index bd7e81f..4f330d9 100644 --- a/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java +++ b/src/main/java/com/thatgravyboat/skyblockhud/api/item/IAbility.java @@ -1,7 +1,6 @@ package com.thatgravyboat.skyblockhud.api.item; public interface IAbility { - String getAbility(); int getAbilityTime(); |