Skip to content

Commit 608d8cf

Browse files
committed
Small improvements
1 parent 1efebbb commit 608d8cf

4 files changed

Lines changed: 21 additions & 17 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.j4c0b3y.api.config.provider.context.LoadContext;
66
import net.j4c0b3y.api.config.provider.context.SaveContext;
77
import net.kyori.adventure.text.Component;
8-
import net.kyori.adventure.text.minimessage.MiniMessage;
98
import org.jetbrains.annotations.NotNull;
109

1110
public class PrefixedComponentProvider implements TypeProvider<PrefixedComponent> {
@@ -20,15 +19,15 @@ public PrefixedComponentProvider(Component prefix) {
2019
@Override
2120
public PrefixedComponent load(@NotNull LoadContext context) {
2221
if (context.getObject() instanceof String string) {
23-
return new PrefixedComponent(this.prefix, MiniMessage.miniMessage().deserialize(string));
22+
return new PrefixedComponent(this.prefix, string);
2423
}
2524
throw new IllegalStateException();
2625
}
2726

2827
@NotNull
2928
@Override
3029
public Object save(@NotNull SaveContext<PrefixedComponent> context) {
31-
return MiniMessage.miniMessage().serialize(context.getObject().getRaw());
30+
return context.getObject().getRaw();
3231
}
3332

3433
}

paper/src/main/java/net/j4c0b3y/api/config/platform/paper/provider/WorldProvider.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
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 org.bukkit.Bukkit;
8-
import org.bukkit.World;
97
import org.jetbrains.annotations.NotNull;
108
import org.jetbrains.annotations.Nullable;
119

@@ -15,19 +13,15 @@ public class WorldProvider implements TypeProvider<WorldReference> {
1513
@Override
1614
public WorldReference load(@NotNull LoadContext context) {
1715
if (context.getObject() instanceof String) {
18-
return new WorldReference(Bukkit.getWorld((String) context.getObject()));
16+
return new WorldReference((String) context.getObject());
1917
}
2018
throw new IllegalArgumentException("Cannot serialize world entry");
2119
}
2220

2321
@Nullable
2422
@Override
2523
public Object save(@NotNull SaveContext<WorldReference> context) {
26-
World world = context.getObject().getWorld();
27-
if (world == null) {
28-
return null;
29-
}
30-
return world.getName();
24+
return context.getObject().getName();
3125
}
3226

3327
}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,23 @@
22

33
import lombok.Getter;
44
import net.kyori.adventure.text.Component;
5+
import net.kyori.adventure.text.minimessage.MiniMessage;
56

67
public class PrefixedComponent {
78

89
@Getter
910
private final Component component;
1011

1112
@Getter
12-
private final Component raw;
13+
private final Component unprefixed;
1314

14-
public PrefixedComponent(Component prefix, Component component) {
15-
this.component = prefix.append(component);
16-
this.raw = component;
15+
@Getter
16+
private final String raw;
17+
18+
public PrefixedComponent(Component prefix, String raw) {
19+
this.raw = raw;
20+
this.unprefixed = MiniMessage.miniMessage().deserialize(raw);
21+
this.component = prefix.append(this.unprefixed);
1722
}
1823

1924
}

paper/src/main/java/net/j4c0b3y/api/config/platform/paper/types/WorldReference.java

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

3+
import lombok.Getter;
4+
import org.bukkit.Bukkit;
35
import org.bukkit.World;
46
import org.jetbrains.annotations.Nullable;
57

@@ -13,8 +15,12 @@ public class WorldReference {
1315

1416
private final WeakReference<World> world;
1517

16-
public WorldReference(World world) {
17-
this.world = new WeakReference<>(world);
18+
@Getter
19+
private final String name;
20+
21+
public WorldReference(String worldName) {
22+
this.name = worldName;
23+
this.world = new WeakReference<>(Bukkit.getWorld(worldName));
1824
}
1925

2026
@Nullable

0 commit comments

Comments
 (0)