Skip to content

Commit ed9a1b8

Browse files
authored
GH-42 Use eternalcode-commons to remove some bloat. (#42)
* Use eternalcode-commons to remove some bloat. * Update commons * Update adventure processors.
1 parent 27d4da5 commit ed9a1b8

File tree

5 files changed

+10
-53
lines changed

5 files changed

+10
-53
lines changed

lobbyheads-core/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ dependencies {
2525
// Rollczi's skullapi
2626
implementation("dev.rollczi:liteskullapi:1.3.0")
2727

28+
// eternalcode commons
29+
implementation("com.eternalcode:eternalcode-commons-adventure:1.1.3")
30+
2831
// spigot-api
2932
compileOnly("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
3033
testImplementation("org.spigotmc:spigot-api:1.20.2-R0.1-SNAPSHOT")
@@ -119,5 +122,6 @@ tasks.shadowJar {
119122
"com.unldenis",
120123
"org.bstats",
121124
"com.eternalcode.gitcheck",
125+
"com.eternalcode.commons",
122126
).forEach { relocate(it, prefix) }
123127
}

lobbyheads-core/src/main/java/com/eternalcode/lobbyheads/HeadsPlugin.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.eternalcode.lobbyheads;
22

3-
import com.eternalcode.lobbyheads.adventure.AdventureLegacyColorProcessor;
3+
import com.eternalcode.commons.adventure.AdventureLegacyColorPostProcessor;
4+
import com.eternalcode.commons.adventure.AdventureLegacyColorPreProcessor;
45
import com.eternalcode.lobbyheads.configuration.ConfigurationService;
56
import com.eternalcode.lobbyheads.configuration.implementation.HeadsConfiguration;
67
import com.eternalcode.lobbyheads.event.EventCaller;
@@ -54,7 +55,8 @@ public void onEnable() {
5455

5556
this.audienceProvider = BukkitAudiences.create(this);
5657
MiniMessage miniMessage = MiniMessage.builder()
57-
.postProcessor(new AdventureLegacyColorProcessor())
58+
.postProcessor(new AdventureLegacyColorPostProcessor())
59+
.preProcessor(new AdventureLegacyColorPreProcessor())
5860
.build();
5961

6062
NotificationAnnouncer notificationAnnouncer = new NotificationAnnouncer(this.audienceProvider, miniMessage);

lobbyheads-core/src/main/java/com/eternalcode/lobbyheads/adventure/AdventureLegacy.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

lobbyheads-core/src/main/java/com/eternalcode/lobbyheads/adventure/AdventureLegacyColorProcessor.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

lobbyheads-core/src/main/java/com/eternalcode/lobbyheads/head/hologram/HologramService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.eternalcode.lobbyheads.head.hologram;
22

3-
import com.eternalcode.lobbyheads.adventure.AdventureLegacy;
3+
import com.eternalcode.commons.adventure.AdventureUtil;
44
import com.eternalcode.lobbyheads.configuration.implementation.HeadsConfiguration;
55
import com.eternalcode.lobbyheads.head.Head;
66
import com.eternalcode.lobbyheads.head.HeadManagerImpl;
@@ -53,7 +53,7 @@ public void createHologram(OfflinePlayer player, Position position, String headN
5353
String replace = headName.replace("{PLAYER}", player.getName());
5454
String string = PlaceholderAPI.setPlaceholders(player, replace);
5555
Component deserialize = this.miniMessage.deserialize(string);
56-
String serialize = AdventureLegacy.SECTION_SERIALIZER.serialize(deserialize);
56+
String serialize = AdventureUtil.SECTION_SERIALIZER.serialize(deserialize);
5757

5858
HologramKey key = new HologramKey(this.plugin, this.getHologramName(position), this.hologramPool);
5959
Hologram hologram = hologram(key, PositionAdapter.convert(this.getLocationOffset(position)), () ->

0 commit comments

Comments
 (0)