Skip to content

Commit df2c61a

Browse files
4drian3d4drian3d
committed
feat!: Updated to MiniPlaceholders v3
1 parent 5fdd3f4 commit df2c61a

File tree

25 files changed

+325
-192
lines changed

25 files changed

+325
-192
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up JDK 17
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: '17'
22+
java-version: '21'
2323
distribution: 'temurin'
2424
cache: 'gradle'
2525
- name: Build with Gradle

‎build.gradle.kts‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,56 @@
11
plugins {
22
java
3+
alias(libs.plugins.idea.ext)
4+
alias(libs.plugins.blossom)
35
alias(libs.plugins.shadow)
46
}
57

68
dependencies {
9+
compileOnly(libs.miniplaceholders)
10+
compileOnly(libs.adventure.api)
11+
compileOnly(libs.adventure.minimessage)
712
implementation(projects.playerExpansionPaper)
813
implementation(projects.playerExpansionVelocity)
14+
implementation(projects.playerExpansionFabric)
15+
implementation(projects.playerExpansionSponge)
16+
implementation(projects.playerExpansionCommon)
17+
}
18+
19+
java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
20+
tasks {
21+
compileJava {
22+
options.encoding = Charsets.UTF_8.name()
23+
options.release.set(21)
24+
}
925
}
1026

1127
subprojects {
1228
apply<JavaPlugin>()
13-
repositories {
14-
maven("https://papermc.io/repo/repository/maven-public/")
15-
}
16-
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
29+
java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
1730
tasks {
1831
compileJava {
1932
options.encoding = Charsets.UTF_8.name()
20-
options.release.set(17)
33+
options.release.set(21)
2134
}
2235
}
2336
}
2437

2538
tasks {
2639
shadowJar {
27-
archiveFileName.set("MiniPlaceholders-Player-Expansion-${project.version}.jar")
40+
archiveFileName.set("Player-Expansion-${project.version}.jar")
2841
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
2942
}
3043
build {
3144
dependsOn(shadowJar)
3245
}
3346
}
47+
48+
sourceSets {
49+
main {
50+
blossom {
51+
javaSources {
52+
property("version", project.version.toString())
53+
}
54+
}
55+
}
56+
}

‎common/src/main/java/io/github/miniplaceholders/expansion/player/common/PlatformExpansionProvider.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package io.github.miniplaceholders.expansion.player.common;
2+
3+
import io.github.miniplaceholders.api.Expansion;
4+
5+
public abstract class PlatformExpansionProvider<T> {
6+
protected T platformInstance;
7+
8+
protected PlatformExpansionProvider(T platformInstance) {
9+
this.platformInstance = platformInstance;
10+
}
11+
12+
public abstract Expansion.Builder provideBuilder();
13+
}

common/src/main/java/io/github/miniplaceholders/expansion/player/common/DisplayNamePlaceholder.java renamed to common/src/main/java/io/github/miniplaceholders/expansion/player/common/resolver/DisplayNameResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.miniplaceholders.expansion.player.common;
1+
package io.github.miniplaceholders.expansion.player.common.resolver;
22

3-
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
3+
import io.github.miniplaceholders.api.resolver.AudienceTagResolver;
44
import net.kyori.adventure.audience.Audience;
55
import net.kyori.adventure.identity.Identity;
66
import net.kyori.adventure.text.Component;
@@ -9,7 +9,7 @@
99
import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
1010
import org.jetbrains.annotations.NotNull;
1111

12-
public final class DisplayNamePlaceholder implements AudiencePlaceholder {
12+
public final class DisplayNameResolver implements AudienceTagResolver<@NotNull Audience> {
1313
@Override
1414
public Tag tag(
1515
final @NotNull Audience audience,

common/src/main/java/io/github/miniplaceholders/expansion/player/common/LocalePlaceholder.java renamed to common/src/main/java/io/github/miniplaceholders/expansion/player/common/resolver/LocaleResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.miniplaceholders.expansion.player.common;
1+
package io.github.miniplaceholders.expansion.player.common.resolver;
22

3-
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
3+
import io.github.miniplaceholders.api.resolver.AudienceTagResolver;
44
import net.kyori.adventure.audience.Audience;
55
import net.kyori.adventure.identity.Identity;
66
import net.kyori.adventure.text.minimessage.Context;
@@ -10,7 +10,7 @@
1010

1111
import java.util.Locale;
1212

13-
public final class LocalePlaceholder implements AudiencePlaceholder {
13+
public final class LocaleResolver implements AudienceTagResolver<Audience> {
1414
@Override
1515
public Tag tag(
1616
final @NotNull Audience audience,

common/src/main/java/io/github/miniplaceholders/expansion/player/common/NamePlaceholder.java renamed to common/src/main/java/io/github/miniplaceholders/expansion/player/common/resolver/NameResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package io.github.miniplaceholders.expansion.player.common;
1+
package io.github.miniplaceholders.expansion.player.common.resolver;
22

3-
import io.github.miniplaceholders.api.placeholder.AudiencePlaceholder;
3+
import io.github.miniplaceholders.api.resolver.AudienceTagResolver;
44
import net.kyori.adventure.audience.Audience;
55
import net.kyori.adventure.identity.Identity;
66
import net.kyori.adventure.text.minimessage.Context;
77
import net.kyori.adventure.text.minimessage.tag.Tag;
88
import net.kyori.adventure.text.minimessage.tag.resolver.ArgumentQueue;
99
import org.jetbrains.annotations.NotNull;
1010

11-
public final class NamePlaceholder implements AudiencePlaceholder {
11+
public final class NameResolver implements AudienceTagResolver<@NotNull Audience> {
1212
@Override
1313
public Tag tag(
1414
final @NotNull Audience audience,

‎fabric/build.gradle.kts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
plugins {
2+
id("fabric-loom")
3+
}
4+
5+
dependencies {
6+
compileOnly(libs.miniplaceholders)
7+
compileOnly(projects.playerExpansionCommon)
8+
minecraft(libs.minecraft)
9+
mappings(loom.officialMojangMappings())
10+
modCompileOnly(libs.fabric.loader)
11+
modCompileOnly(libs.fabric.api)
12+
modCompileOnly(libs.adventure.platform.fabric)
13+
}

‎fabric/src/main/java/io/github/miniplaceholders/expansion/player/fabric/FabricProvider.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package io.github.miniplaceholders.expansion.player.fabric;
2+
3+
import io.github.miniplaceholders.api.Expansion;
4+
import io.github.miniplaceholders.expansion.player.common.PlatformExpansionProvider;
5+
import io.github.miniplaceholders.expansion.player.common.resolver.DisplayNameResolver;
6+
import io.github.miniplaceholders.expansion.player.common.resolver.LocaleResolver;
7+
import io.github.miniplaceholders.expansion.player.common.resolver.NameResolver;
8+
import net.minecraft.server.MinecraftServer;
9+
10+
public class FabricProvider extends PlatformExpansionProvider<MinecraftServer> {
11+
public FabricProvider(Object platformInstance) {
12+
super((MinecraftServer) platformInstance);
13+
}
14+
15+
@Override
16+
public Expansion.Builder provideBuilder() {
17+
return Expansion.builder("player")
18+
.audiencePlaceholder("name", new NameResolver())
19+
.audiencePlaceholder("displayname", new DisplayNameResolver())
20+
.audiencePlaceholder("locale", new LocaleResolver());
21+
}
22+
}

‎gradle.properties‎

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

‎gradle/libs.versions.toml‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,42 @@ metadata.format.version = "1.1"
22

33
[versions]
44

5-
velocity = "3.2.0-SNAPSHOT"
6-
paper = "1.19.3-R0.1-SNAPSHOT"
5+
velocity = "3.4.0-SNAPSHOT"
6+
paper = "1.21.8-R0.1-SNAPSHOT"
7+
sponge = "14.0.0"
78

8-
blossom = "1.3.1"
9-
shadow = "8.1.1"
10-
runtask = "2.1.0"
11-
pluginyml = "0.6.0"
9+
blossom = "2.1.0"
10+
shadow = "9.0.2"
11+
runtask = "2.3.1"
1212

13-
miniplaceholders = "2.2.3"
14-
adventure = "4.14.0"
13+
miniplaceholders = "3.0.0-SNAPSHOT"
14+
adventure = "4.24.0"
15+
adventurefabric = "6.6.0"
16+
17+
fabric-loader = "0.17.2"
18+
fabric-api = "0.131.0+1.21.8"
19+
minecraft = "1.21.8"
1520

1621
[libraries]
1722

18-
velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }
19-
paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
23+
minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
24+
velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
25+
papermc = { module = "io.papermc.paper:paper-api", version.ref = "paper" }
26+
sponge = { module = "org.spongepowered:spongeapi", version.ref = "sponge" }
27+
28+
fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" }
29+
fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
30+
2031
miniplaceholders = { group = "io.github.miniplaceholders", name = "miniplaceholders-api", version.ref = "miniplaceholders" }
2132

2233
adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
2334
adventure-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
35+
adventure-platform-fabric = { group = "net.kyori", name = "adventure-platform-fabric", version.ref = "adventurefabric" }
2436

2537
[plugins]
2638

2739
blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
28-
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
40+
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
2941
runvelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
3042
runpaper = { id = "xyz.jpenilla.run-velocity", version.ref = "runtask" }
31-
pluginyml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }
43+
idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version = "1.2" }

0 commit comments

Comments
 (0)