Revert "release: Version 1.0.0"

4drian3d · 4drian3d · commit 5d10a8026ed4 · 2023-05-30T22:39:19.000-05:00
This reverts commit 26af110.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,7 @@ 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 {
@@ -24,7 +25,7 @@ subprojects {
 
 tasks {
     shadowJar {
-        archiveFileName.set("${rootProject.name}-${project.version}.jar")
+        archiveFileName.set("MiniPlaceholders-${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.spark) Some library
+    compileOnly(libs.viaversion)
     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
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
@@ -0,0 +1,28 @@
+package io.github.miniplaceholders.expansion.viaversion.common;
+
+import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.ViaAPI;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import io.github.miniplaceholders.api.Expansion;
+import net.kyori.adventure.identity.Identity;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+
+public final class CommonExpansion {
+    public static Expansion.Builder builder() {
+        final ViaAPI<?> api = Via.getAPI();
+        return Expansion.builder("viaversion")
+                .audiencePlaceholder("player_protocol_version", (aud, queue, ctx) -> {
+                    final ProtocolVersion version = aud.get(Identity.UUID)
+                            .map(api::getPlayerVersion)
+                            .map(ProtocolVersion::getProtocol)
+                            .orElse(ProtocolVersion.unknown);
+                    return Tag.preProcessParsed(version.getName());
+                })
+                .audiencePlaceholder("player_protocol_id", (aud, queue, ctx) -> {
+                    final int id = aud.get(Identity.UUID)
+                            .map(api::getPlayerVersion)
+                            .orElse(-1);
+                    return Tag.preProcessParsed(Integer.toString(id));
+                });
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group = io.github.miniplaceholders
 version = 1.0.0
-description = Example-Expansion
+description = ViaVersion-Expansion
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ runtask = "2.1.0"
 
 miniplaceholders = "2.2.0"
 adventure = "4.13.1"
+viaversion = "[4.0.0,5.0.0)"
 
 [libraries]
 
@@ -21,6 +22,8 @@ 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.viaversionExpansionCommon)
+    implementation(projects.exampleExpansionCommon)
 }
 
 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
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
@@ -0,0 +1,19 @@
+package io.github.miniplaceholders.expansion.viaversion.paper;
+
+import io.github.miniplaceholders.expansion.viaversion.common.CommonExpansion;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+@SuppressWarnings("unused")
+public final class PaperPlugin extends JavaPlugin {
+
+    @Override
+    public void onEnable(){
+        this.getSLF4JLogger().info("Starting ViaVersion Expansion for Paper");
+
+        CommonExpansion.builder()
+                .filter(Player.class)
+                .build()
+                .register();
+    }
+}
diff --git a/paper/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml
@@ -1,12 +1,11 @@
-name: Example-Expansion
+name: ViaVersion-Expansion
 version: '${version}'
 author: 4drian3d
-main: io.github.miniplaceholders.expansion.example.paper.PaperPlugin
+main: io.github.miniplaceholders.expansion.viaversion.paper.PaperPlugin
 api-version: '1.19'
 folia-supported: true
 dependencies:
   - name: MiniPlaceholders
     required: true
-  # Add some plugin dependency
-  #- name: spark
-  #  required: true
+  - name: ViaVersion
+    required: true
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.viaversionExpansionCommon)
+    implementation(projects.exampleExpansionCommon)
 }
 
 blossom {
-    replaceTokenIn("src/main/java/io/github/miniplaceholders/expansion/viaversion/velocity/Constants.java")
+    replaceTokenIn("src/main/java/io/github/miniplaceholders/expansion/example/velocity/Constants.java")
     replaceToken("{version}", project.version)
 }
diff --git a/velocity/src/main/java/io/github/miniplaceholders/expansion/viaversion/velocity/Constants.java b/velocity/src/main/java/io/github/miniplaceholders/expansion/viaversion/velocity/Constants.java
@@ -1,4 +1,4 @@
-package io.github.miniplaceholders.expansion.example.velocity;
+package io.github.miniplaceholders.expansion.viaversion.velocity;
 
 public class Constants {
     public static final String VERSION = "{version}";
diff --git a/velocity/src/main/java/io/github/miniplaceholders/expansion/viaversion/velocity/VelocityPlugin.java b/velocity/src/main/java/io/github/miniplaceholders/expansion/viaversion/velocity/VelocityPlugin.java
@@ -1,48 +1,39 @@
-package io.github.miniplaceholders.expansion.example.velocity;
+package io.github.miniplaceholders.expansion.viaversion.velocity;
 
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.Dependency;
+import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.proxy.Player;
-
-import io.github.miniplaceholders.expansion.example.common.CommonExpansion;
+import io.github.miniplaceholders.expansion.viaversion.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 = "Example-Expansion",
-    id = "example-expansion",
+    name = "ViaVersion-Expansion",
+    id = "viaversion-expansion",
     version = Constants.VERSION,
     authors = {"4drian3d"},
     dependencies = {
         @Dependency(id = "miniplaceholders"),
-        @Dependency(id = "some_plugin")
+        @Dependency(id = "viaversion")
     }
 )
 public final class VelocityPlugin {
     private final Logger logger;
 
     @Inject
-    public VelocityPlugin(Logger logger) {
+    public VelocityPlugin(final Logger logger) {
         this.logger = logger;
     }
 
     @Subscribe
     public void onProxyInitialize(ProxyInitializeEvent event) {
         logger.info("Starting Example Expansion for Velocity");
 
-        CommonExpansion.register();
-
-        Expansion.builder("example")
-            .filter(Player.class)
-            .audiencePlaceholder("name", (aud, queue, ctx) -> Tag.selfClosingInserting(Component.text(((Player)aud).getUsername())))
-            .build()
-            .register();
+        CommonExpansion.builder()
+                .filter(Player.class)
+                .build()
+                .register();
     }
 }

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.spark) Some library`
	`3`	`+ compileOnly(libs.viaversion)`
`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.viaversionExpansionCommon)`
	`4`	`+ implementation(projects.exampleExpansionCommon)`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`tasks {`