Skip to content

Commit 4db0d52

Browse files
committed
fix: Fixed ExpansionProvider loading
1 parent ec04264 commit 4db0d52

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group = io.github.miniplaceholders
2-
version = 2.0.0
2+
version = 2.0.1
33
description = ViaVersion-Expansion

src/main/java/io/github/miniplaceholders/expansion/viaversion/ViaVersionExpansionProvider.java

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,33 @@ public final class ViaVersionExpansionProvider implements ExpansionProvider {
1313

1414
@Override
1515
public Expansion provideExpansion() {
16-
final ViaAPI<?> api = Via.getAPI();
17-
return Expansion.builder("viaversion")
18-
.audiencePlaceholder("player_protocol_version", (aud, queue, ctx) -> {
19-
final ProtocolVersion version = aud.get(Identity.UUID)
20-
.map(api::getPlayerVersion)
21-
.map(ProtocolVersion::getProtocol)
22-
.orElse(ProtocolVersion.unknown);
23-
return Tag.preProcessParsed(version.getName());
24-
})
25-
.audiencePlaceholder("player_protocol_id", (aud, queue, ctx) -> {
26-
final int id = aud.get(Identity.UUID)
27-
.map(api::getPlayerVersion)
28-
.orElse(-1);
29-
return Tag.preProcessParsed(Integer.toString(id));
30-
}).build();
16+
return ViaVersionExpansion.viaversion();
3117
}
3218

3319
@Override
3420
public LoadRequirement loadRequirement() {
3521
return LoadRequirement.requiredComplement("viaversion", "ViaVersion");
3622
}
23+
24+
static final class ViaVersionExpansion {
25+
private ViaVersionExpansion() {}
26+
27+
static Expansion viaversion() {
28+
final ViaAPI<?> api = Via.getAPI();
29+
return Expansion.builder("viaversion")
30+
.audiencePlaceholder("player_protocol_version", (aud, queue, ctx) -> {
31+
final ProtocolVersion version = aud.get(Identity.UUID)
32+
.map(api::getPlayerVersion)
33+
.map(ProtocolVersion::getProtocol)
34+
.orElse(ProtocolVersion.unknown);
35+
return Tag.preProcessParsed(version.getName());
36+
})
37+
.audiencePlaceholder("player_protocol_id", (aud, queue, ctx) -> {
38+
final int id = aud.get(Identity.UUID)
39+
.map(api::getPlayerVersion)
40+
.orElse(-1);
41+
return Tag.preProcessParsed(Integer.toString(id));
42+
}).build();
43+
}
44+
}
3745
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
provider-class=io.miniplaceholders.expansion.viaversion.ViaVersionExpansionProvider
1+
provider-class=io.github.miniplaceholders.expansion.viaversion.ViaVersionExpansionProvider

0 commit comments

Comments
 (0)