Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --full-stacktrace
- name: Create Release Artifact
run: ./gradlew createReleaseJar
- name: Upload Artifact
uses: actions/upload-artifact@v6
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.rappytv.betterfriends.api;

import java.util.UUID;
import net.labymod.api.labyconnect.LabyConnectSession;
import net.labymod.api.labyconnect.protocol.model.friend.Friend;
import net.labymod.api.mojang.GameProfile;
import net.labymod.api.reference.annotation.Referenceable;
import org.jetbrains.annotations.Nullable;

@Referenceable
public interface FriendHelper {
public interface SessionHelper {

LabyConnectSession getValidSession();

@Nullable
default Friend getFriend(GameProfile profile) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.rappytv.betterfriends.api.blocklist;

import java.util.UUID;

public record BlockedPlayer(UUID uuid, String username) {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.rappytv.betterfriends.api.blocklist;

import java.util.List;
import java.util.UUID;
import net.labymod.api.reference.annotation.Referenceable;

@Referenceable
public interface BlocklistManager {

boolean isBlocked(UUID uuid);

List<BlockedPlayer> getBlockedPlayers();

void loadBlocklist(List<BlockedPlayer> players);

void block(UUID uuid, String username);

void block(BlockedPlayer player);

void unblock(UUID uuid);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.rappytv.betterfriends.api.blocklist.event;

import com.rappytv.betterfriends.api.blocklist.BlockedPlayer;
import net.labymod.api.event.Event;

public record BlockPlayerEvent(BlockedPlayer player) implements Event {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.rappytv.betterfriends.api.blocklist.event;

import com.rappytv.betterfriends.api.blocklist.BlockedPlayer;
import net.labymod.api.event.Event;

public record UnblockPlayerEvent(BlockedPlayer player) implements Event {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.rappytv.betterfriends.api.ui;

import net.labymod.api.client.gui.icon.Icon;
import net.labymod.api.client.resources.ResourceLocation;

public class BetterFriendsTextures {

public static final Icon BLOCKED = Icon.texture(ResourceLocation.create(
"betterfriends",
"textures/blocked.png"
));

}
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,11 @@ plugins {
val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")

group = "org.example"
version = providers.environmentVariable("VERSION").getOrElse("1.1.1")
version = providers.environmentVariable("VERSION").getOrElse("1.1.2")

labyMod {
defaultPackageName = "com.rappytv.betterfriends"

minecraft {
registerVersion(versions.toTypedArray()) {
runs {
getByName("client") {
devLogin = true
}
}
}
}

addonInfo {
namespace = "betterfriends"
displayName = "BetterFriends"
Expand All @@ -31,6 +21,16 @@ labyMod {

addon("voicechat", true)
}

minecraft {
registerVersion(versions.toTypedArray()) {
runs {
getByName("client") {
devLogin = true
}
}
}
}
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,33 @@
import com.rappytv.betterfriends.api.generated.ReferenceStorage;
import com.rappytv.betterfriends.core.command.BetterFriendsCommand;
import com.rappytv.betterfriends.core.config.BetterFriendsConfig;
import com.rappytv.betterfriends.core.interactions.BlockPlayerBullet;
import com.rappytv.betterfriends.core.interactions.FriendNoteEditorBullet;
import com.rappytv.betterfriends.core.interactions.FriendTogglePinBullet;
import com.rappytv.betterfriends.core.interactions.UnblockPlayerBullet;
import com.rappytv.betterfriends.core.listeners.ChatReceiveListener;
import com.rappytv.betterfriends.core.listeners.ConfigVersionListener;
import com.rappytv.betterfriends.core.listeners.FriendListener;
import com.rappytv.betterfriends.core.listeners.FriendRequestListener;
import com.rappytv.betterfriends.core.listeners.LabyChatReceiveListener;
import com.rappytv.betterfriends.core.listeners.PlayerBlockListener;
import com.rappytv.betterfriends.core.listeners.TemporaryPinListener;
import com.rappytv.betterfriends.core.ui.badge.FriendPinBadge;
import com.rappytv.betterfriends.core.ui.hud.FriendCountHudWidget;
import com.rappytv.betterfriends.core.ui.hud.IncomingFriendRequestCountHudWidget;
import com.rappytv.betterfriends.core.ui.hud.OnlineFriendCountHudWidget;
import com.rappytv.betterfriends.core.ui.hud.UnreadChatCountWidget;
import com.rappytv.betterfriends.core.ui.tags.BlockedPlayerIconTag;
import com.rappytv.betterfriends.core.ui.tags.FriendNoteNameTag;
import com.rappytv.betterfriends.core.ui.tags.FriendPinIconTag;
import net.labymod.api.Laby;
import net.labymod.api.addon.LabyAddon;
import net.labymod.api.client.component.Component;
import net.labymod.api.client.component.format.NamedTextColor;
import net.labymod.api.client.entity.player.tag.PositionType;
import net.labymod.api.client.gui.hud.binding.category.HudWidgetCategory;
import net.labymod.api.models.addon.annotation.AddonMain;
import net.labymod.api.notification.Notification;
import net.labymod.api.revision.SimpleRevision;
import net.labymod.api.util.version.SemanticVersion;

Expand All @@ -45,23 +51,34 @@ protected void preConfigurationLoad() {
new SemanticVersion(1, 1, 0),
"2026-04-30"
));
Laby.references().revisionRegistry().register(new SimpleRevision(
"betterfriends",
new SemanticVersion(1, 1, 2),
"2026-06-18"
));
}

@Override
protected void enable() {
INSTANCE = this;
this.registerSettingCategory();

references().blocklistManager()
.loadBlocklist(this.configuration().blocklist().blockedPlayers());

this.registerCommand(new BetterFriendsCommand());

this.registerListener(new ChatReceiveListener(this));
this.registerListener(new FriendListener(this));
this.registerListener(new FriendRequestListener(this));
this.registerListener(new LabyChatReceiveListener(this));
this.registerListener(new PlayerBlockListener(this));
this.registerListener(new TemporaryPinListener(this));

this.labyAPI().interactionMenuRegistry().register(new BlockPlayerBullet(this));
this.labyAPI().interactionMenuRegistry().register(new FriendNoteEditorBullet(this));
this.labyAPI().interactionMenuRegistry().register(new FriendTogglePinBullet(this));
this.labyAPI().interactionMenuRegistry().register(new UnblockPlayerBullet(this));

HudWidgetCategory category = new HudWidgetCategory(this, "widgets");
this.labyAPI().hudWidgetRegistry().categoryRegistry().register(category);
Expand All @@ -75,9 +92,15 @@ protected void enable() {
"labymod_role",
"betterfriends_friend_note",
position,
new FriendNoteNameTag(this, position)
new FriendNoteNameTag(position)
);
}
this.labyAPI().tagRegistry().registerBefore(
"VoiceTag",
"betterfriends_blocked_icon",
PositionType.RIGHT_TO_NAME,
new BlockedPlayerIconTag()
);
this.labyAPI().tagRegistry().registerBefore(
"VoiceTag",
"betterfriends_pin_icon",
Expand All @@ -104,4 +127,22 @@ public static ReferenceStorage references() {
public static Component getPrefix() {
return INSTANCE.configuration().prefixCustomizationConfig().buildPrefix();
}

public static boolean isVoiceChatEnabled() {
return Laby.labyAPI().addonService().isEnabled("voicechat");
}

public static void displayNotifications(String titleKey, Component component) {
Laby.references().chatExecutor().displayClientMessage(
BetterFriendsAddon.getPrefix().append(component)
);

if (!Laby.labyAPI().minecraft().isIngame()) {
Notification.builder()
.title(Component.translatable(titleKey))
.text(component.color(NamedTextColor.WHITE))
.duration(10000)
.buildAndPush();
}
}
}
Loading
Loading