Skip to content

Commit 0d659f5

Browse files
committed
Fix prefixed component
1 parent 3b7f76d commit 0d659f5

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

adventure/src/main/java/net/j4c0b3y/api/config/platform/adventure/AdventureConfigHandler.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.j4c0b3y.api.config.platform.adventure;
22

3+
import lombok.Getter;
34
import net.j4c0b3y.api.config.ConfigHandler;
45
import net.j4c0b3y.api.config.platform.adventure.provider.MiniMessageProvider;
56
import net.j4c0b3y.api.config.platform.adventure.provider.PrefixedComponentProvider;
@@ -20,6 +21,9 @@
2021
*/
2122
public class AdventureConfigHandler extends ConfigHandler {
2223

24+
@Getter
25+
private static Component prefix;
26+
2327
/**
2428
* Creates a new config handler instance,
2529
* registers default resolvers and providers.
@@ -29,8 +33,9 @@ public class AdventureConfigHandler extends ConfigHandler {
2933
public AdventureConfigHandler(Logger logger, Component prefix) {
3034
super(logger);
3135

36+
AdventureConfigHandler.prefix = prefix;
3237
this.bind(MiniComponent.class, new MiniMessageProvider());
33-
this.bind(PrefixedComponent.class, new PrefixedComponentProvider(prefix));
38+
this.bind(PrefixedComponent.class, new PrefixedComponentProvider());
3439
}
3540

3641
/**

adventure/src/main/java/net/j4c0b3y/api/config/platform/adventure/provider/PrefixedComponentProvider.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,15 @@
44
import net.j4c0b3y.api.config.provider.TypeProvider;
55
import net.j4c0b3y.api.config.provider.context.LoadContext;
66
import net.j4c0b3y.api.config.provider.context.SaveContext;
7-
import net.kyori.adventure.text.Component;
87
import org.jetbrains.annotations.NotNull;
98

109
public class PrefixedComponentProvider implements TypeProvider<PrefixedComponent> {
1110

12-
private final Component prefix;
13-
14-
public PrefixedComponentProvider(Component prefix) {
15-
this.prefix = prefix;
16-
}
17-
1811
@NotNull
1912
@Override
2013
public PrefixedComponent load(@NotNull LoadContext context) {
2114
if (context.getObject() instanceof String string) {
22-
return new PrefixedComponent(this.prefix, string);
15+
return new PrefixedComponent(string);
2316
}
2417
throw new IllegalStateException("Failed to parse prefixed component");
2518
}

adventure/src/main/java/net/j4c0b3y/api/config/platform/adventure/types/PrefixedComponent.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.j4c0b3y.api.config.platform.adventure.types;
22

33
import lombok.Getter;
4+
import net.j4c0b3y.api.config.platform.adventure.AdventureConfigHandler;
45
import net.kyori.adventure.text.Component;
56
import net.kyori.adventure.text.minimessage.MiniMessage;
67

@@ -15,10 +16,10 @@ public class PrefixedComponent {
1516
@Getter
1617
private final String raw;
1718

18-
public PrefixedComponent(Component prefix, String raw) {
19+
public PrefixedComponent(String raw) {
1920
this.raw = raw;
2021
this.unprefixed = MiniMessage.miniMessage().deserialize(this.raw);
21-
this.component = prefix.append(this.unprefixed);
22+
this.component = AdventureConfigHandler.getPrefix().append(this.unprefixed);
2223
}
2324

2425
}

0 commit comments

Comments
 (0)