release: Version 1.0.0

4drian3d · 4drian3d · commit 26af110ce5af · 2023-05-29T20:25:37.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,15 +4,14 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.viaversionExpansionVelocity)
-    implementation(projects.viaversionExpansionPaper)
+    implementation(projects.exampleExpansionVelocity)
+    implementation(projects.exampleExpansionPaper)
 }
 
 subprojects {
     apply<JavaPlugin>()
     repositories {
         maven("https://papermc.io/repo/repository/maven-public/")
-        maven("https://repo.viaversion.com")
     }
     java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
     tasks {
@@ -25,7 +24,7 @@ subprojects {
 
 tasks {
     shadowJar {
-        archiveFileName.set("MiniPlaceholders-${rootProject.name}-${project.version}.jar")
+        archiveFileName.set("${rootProject.name}-${project.version}.jar")
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
     build {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,6 +1,6 @@
 dependencies {
     compileOnly(libs.miniplaceholders)
-    compileOnly(libs.viaversion)
+    //compileOnly(libs.spark) Some library
     compileOnly(libs.adventure.api)
     compileOnly(libs.adventure.minimessage)
 }
diff --git a/common/src/main/java/io/github/miniplaceholders/expansion/example/common/CommonExpansion.java b/common/src/main/java/io/github/miniplaceholders/expansion/example/common/CommonExpansion.java
@@ -0,0 +1,11 @@
+package io.github.miniplaceholders.expansion.example.common;
+
+import io.github.miniplaceholders.api.Expansion;
+
+public final class CommonExpansion {
+    public static void register() {
+        Expansion.builder("example")
+                .build()
+                .register();
+    }
+}
diff --git a/common/src/main/java/io/github/miniplaceholders/expansion/viaversion/common/CommonExpansion.java b/common/src/main/java/io/github/miniplaceholders/expansion/viaversion/common/CommonExpansion.java
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group = io.github.miniplaceholders
 version = 1.0.0
-description = ViaVersion-Expansion
+description = Example-Expansion
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,6 @@ runtask = "2.1.0"
 
 miniplaceholders = "2.2.0"
 adventure = "4.13.1"
-viaversion = "[4.0.0,5.0.0)"
 
 [libraries]
 
@@ -22,8 +21,6 @@ miniplaceholders = { group = "io.github.miniplaceholders", name = "miniplacehold
 adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
 adventure-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
 
-viaversion = { group = "com.viaversion", name = "viaversion-api", version.ref = "viaversion" }
-
 [plugins]
 
 blossom = { id = "net.kyori.blossom", version.ref = "blossom" }
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
@@ -1,7 +1,7 @@
 dependencies {
     compileOnly(libs.paper.api)
     compileOnly(libs.miniplaceholders)
-    implementation(projects.exampleExpansionCommon)
+    implementation(projects.viaversionExpansionCommon)
 }
 
 tasks {
diff --git a/paper/src/main/java/io/github/miniplaceholders/expansion/example/paper/PaperPlugin.java b/paper/src/main/java/io/github/miniplaceholders/expansion/example/paper/PaperPlugin.java
@@ -0,0 +1,25 @@
+package io.github.miniplaceholders.expansion.example.paper;
+
+import io.github.miniplaceholders.expansion.example.common.CommonExpansion;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import io.github.miniplaceholders.api.Expansion;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+
+public final class PaperPlugin extends JavaPlugin {
+
+    @Override
+    public void onEnable(){
+        this.getSLF4JLogger().info("Starting Example Expansion for Paper");
+
+        CommonExpansion.register();
+
+        Expansion.builder("example")
+            .filter(Player.class)
+            .audiencePlaceholder("name", (aud, queue, ctx) -> Tag.selfClosingInserting(Component.text(((Player)aud).getName())))
+            .build()
+            .register();
+    }
+}
diff --git a/paper/src/main/java/io/github/miniplaceholders/expansion/viaversion/paper/PaperPlugin.java b/paper/src/main/java/io/github/miniplaceholders/expansion/viaversion/paper/PaperPlugin.java
diff --git a/paper/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml
@@ -1,11 +1,12 @@
-name: ViaVersion-Expansion
+name: Example-Expansion
 version: '${version}'
 author: 4drian3d
-main: io.github.miniplaceholders.expansion.viaversion.paper.PaperPlugin
+main: io.github.miniplaceholders.expansion.example.paper.PaperPlugin
 api-version: '1.19'
 folia-supported: true
 dependencies:
   - name: MiniPlaceholders
     required: true
-  - name: ViaVersion
-    required: true
+  # Add some plugin dependency
+  #- name: spark
+  #  required: true
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,14 +1,14 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-rootProject.name = "ViaVersion-Expansion"
+rootProject.name = "Example-Expansion"
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
 
 arrayOf("common", "paper", "velocity").forEach {
-    include("viaversion-expansion-$it")
+    include("example-expansion-$it")
 
-    project(":viaversion-expansion-$it").projectDir = file(it)
+    project(":example-expansion-$it").projectDir = file(it)
 }
 
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -6,10 +6,10 @@ dependencies {
     compileOnly(libs.velocity.api)
     annotationProcessor(libs.velocity.api)
     compileOnly(libs.miniplaceholders)
-    implementation(projects.exampleExpansionCommon)
+    implementation(projects.viaversionExpansionCommon)
 }
 
 blossom {
-    replaceTokenIn("src/main/java/io/github/miniplaceholders/expansion/example/velocity/Constants.java")
+    replaceTokenIn("src/main/java/io/github/miniplaceholders/expansion/viaversion/velocity/Constants.java")
     replaceToken("{version}", project.version)
 }
diff --git a/velocity/src/main/java/io/github/miniplaceholders/expansion/example/velocity/Constants.java b/velocity/src/main/java/io/github/miniplaceholders/expansion/example/velocity/Constants.java
@@ -1,4 +1,4 @@
-package io.github.miniplaceholders.expansion.viaversion.velocity;
+package io.github.miniplaceholders.expansion.example.velocity;
 
 public class Constants {
     public static final String VERSION = "{version}";
diff --git a/velocity/src/main/java/io/github/miniplaceholders/expansion/example/velocity/VelocityPlugin.java b/velocity/src/main/java/io/github/miniplaceholders/expansion/example/velocity/VelocityPlugin.java
@@ -1,39 +1,48 @@
-package io.github.miniplaceholders.expansion.viaversion.velocity;
+package io.github.miniplaceholders.expansion.example.velocity;
 
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Dependency;
 import com.velocitypowered.api.plugin.Plugin;
+import com.velocitypowered.api.plugin.Dependency;
 import com.velocitypowered.api.proxy.Player;
-import io.github.miniplaceholders.expansion.viaversion.common.CommonExpansion;
+
+import io.github.miniplaceholders.expansion.example.common.CommonExpansion;
 import org.slf4j.Logger;
 
+import io.github.miniplaceholders.api.Expansion;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+
 @Plugin(
-    name = "ViaVersion-Expansion",
-    id = "viaversion-expansion",
+    name = "Example-Expansion",
+    id = "example-expansion",
     version = Constants.VERSION,
     authors = {"4drian3d"},
     dependencies = {
         @Dependency(id = "miniplaceholders"),
-        @Dependency(id = "viaversion")
+        @Dependency(id = "some_plugin")
     }
 )
 public final class VelocityPlugin {
     private final Logger logger;
 
     @Inject
-    public VelocityPlugin(final Logger logger) {
+    public VelocityPlugin(Logger logger) {
         this.logger = logger;
     }
 
     @Subscribe
     public void onProxyInitialize(ProxyInitializeEvent event) {
         logger.info("Starting Example Expansion for Velocity");
 
-        CommonExpansion.builder()
-                .filter(Player.class)
-                .build()
-                .register();
+        CommonExpansion.register();
+
+        Expansion.builder("example")
+            .filter(Player.class)
+            .audiencePlaceholder("name", (aud, queue, ctx) -> Tag.selfClosingInserting(Component.text(((Player)aud).getUsername())))
+            .build()
+            .register();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,14 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- implementation(projects.viaversionExpansionVelocity)`
`8`		`- implementation(projects.viaversionExpansionPaper)`
	`7`	`+ implementation(projects.exampleExpansionVelocity)`
	`8`	`+ implementation(projects.exampleExpansionPaper)`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`subprojects {`
`12`	`12`	`apply<JavaPlugin>()`
`13`	`13`	`repositories {`
`14`	`14`	`maven("https://papermc.io/repo/repository/maven-public/")`
`15`		`- maven("https://repo.viaversion.com")`
`16`	`15`	`}`
`17`	`16`	`java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))`
`18`	`17`	`tasks {`
`@@ -25,7 +24,7 @@ subprojects {`
`25`	`24`
`26`	`25`	`tasks {`
`27`	`26`	`shadowJar {`
`28`		`- archiveFileName.set("MiniPlaceholders-${rootProject.name}-${project.version}.jar")`
	`27`	`+ archiveFileName.set("${rootProject.name}-${project.version}.jar")`
`29`	`28`	`duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`30`	`29`	`}`
`31`	`30`	`build {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compileOnly(libs.miniplaceholders)`
`3`		`- compileOnly(libs.viaversion)`
	`3`	`+ //compileOnly(libs.spark) Some library`
`4`	`4`	`compileOnly(libs.adventure.api)`
`5`	`5`	`compileOnly(libs.adventure.minimessage)`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`compileOnly(libs.paper.api)`
`3`	`3`	`compileOnly(libs.miniplaceholders)`
`4`		`- implementation(projects.exampleExpansionCommon)`
	`4`	`+ implementation(projects.viaversionExpansionCommon)`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`tasks {`