Skip to content

Commit 91e8c4e

Browse files
committed
Fix playerlist on unstyled servers
1 parent e077170 commit 91e8c4e

4 files changed

Lines changed: 19 additions & 14 deletions

File tree

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,11 @@ dependencies {
5959
}
6060

6161
processResources {
62-
def projectVersion = project.version
63-
inputs.property "version", projectVersion
62+
inputs.property "version", project.version
6463

65-
filesMatching("fabric.mod.json") {
66-
expand "version": projectVersion
67-
}
64+
filesMatching("fabric.mod.json") {
65+
expand "version": inputs.properties.version
66+
}
6867
}
6968

7069
tasks.withType(JavaCompile).configureEach {
@@ -82,10 +81,11 @@ java {
8281
}
8382

8483
jar {
85-
def archivesBaseName = project.base.archivesName
86-
from("LICENSE") {
87-
rename { "${it}_${archivesBaseName.get()}" }
88-
}
84+
inputs.property "archivesName", project.base.archivesName
85+
86+
from("LICENSE") {
87+
rename { "${it}_${inputs.properties.archivesName}"}
88+
}
8989
}
9090

9191
// configure the maven publication

gradle.properties

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ org.gradle.parallel=true
66
# check these on https://fabricmc.net/develop
77
minecraft_version=1.21.5
88
yarn_mappings=1.21.5+build.1
9-
loader_version=0.16.10
9+
loader_version=0.16.14
10+
loom_version=1.10-SNAPSHOT
1011

1112
# Mod Properties
12-
mod_version=1.2.0
13-
maven_group=com.scnamelink
13+
mod_version=1.2.1
14+
maven_group=golden.scnamelink
1415
archives_base_name=sc-name-link
1516

1617
# Dependencies
17-
fabric_version=0.119.5+1.21.5
18+
fabric_version=0.127.0+1.21.5
1819
modmenu_version=13.0.3
1920
clothconfig_version=18.0.145

src/client/java/golden/scnamelink/SpooncraftNameLinkClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static DisplayMapping getMapping(UUID uuid, String name) {
6262
static MutableText applyMapping(Text message, DisplayMapping mapping,
6363
boolean replaceName, boolean replaceColour) {
6464
if (message == null || message.getString().isEmpty() || mapping == null) {
65-
return Text.empty();
65+
return (MutableText) message;
6666
}
6767

6868
MutableText outputMessage = Text.empty();

src/client/java/golden/scnamelink/mixin/client/PlayerListEntryMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ public void replaceDisplayName(CallbackInfoReturnable<Text> cir) {
3636
return;
3737
}
3838

39+
if (displayName == null && profile.getName() != null) {
40+
displayName = Text.literal(profile.getName());
41+
}
42+
3943
Text label = SpooncraftNameLinkClient.getStyledName(displayName, profile.getId(),
4044
profile.getName(),
4145
CONFIG.replacetablist, CONFIG.colourtablist);

0 commit comments

Comments
 (0)