Merge pull request #18 from WizardlyBump17/new-command-system-1.20.6-2

New command system 1.20.6 2

Author: WizardlyBump17

.github/workflows/publish.yml .github/workflows/build-and-publish.yml.github/workflows/publish.yml renamed to .github/workflows/build-and-publish.yml

@@ -1,12 +1,15 @@
-name: Publish to GitHub Packages
+name: Build and upload
 
 on:
+  push:
+  pull_request:
+    types:
+      - opened
+      - reopened
+  workflow_dispatch:
   release:
     types:
-      - published
-  push:
-    branches:
-      - new-command-system-1.20.6
+      - created
 
 env:
   USERNAME: ${{ github.actor }}
@@ -17,13 +20,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: write
-      packages: write
+      contents: read
     steps:
       - name: Get current date
         run: echo "WLIB_BUILD_DATE=$(date +'%Y-%m-%d_%H-%M-%S')" >> "$GITHUB_ENV"
       - name: Get snapshot number
-        run: echo "WLIB_SNAPSHOT_NUMBER=$((${{ github.run_number }}+${{ github.run_attempt }}))" >> $GITHUB_ENV
+        run: echo "WLIB_SNAPSHOT_NUMBER=$((${{ github.run_number }}+${{ github.run_attempt }}+68))" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -48,5 +50,27 @@ jobs:
           for file in */build/libs/*.jar; do
             gh release upload ${{ github.event.release.tag_name }} $file
           done
-      - name: Publish
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+    if: ${{ github.event_name != 'pull_request' }}
+    needs:
+      - build
+    steps:
+      - name: Get current date
+        run: echo "WLIB_BUILD_DATE=$(date +'%Y-%m-%d_%H-%M-%S')" >> "$GITHUB_ENV"
+      - name: Get snapshot number
+        run: echo "WLIB_SNAPSHOT_NUMBER=$((${{ github.run_number }}+${{ github.run_attempt }}+68))" >> $GITHUB_ENV
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Clean, Build and Publish
         run: ./gradlew publish
+

.github/workflows/build.yml

@@ -1,3 +1,4 @@
 **/build/
 .idea/
 .gradle/
+/build.properties

.gitignore

@@ -1,6 +1,7 @@
 plugins {
-    id("com.gradleup.shadow") version "8.3.2"
+    id("com.gradleup.shadow") version "9.2.2"
     id 'maven-publish'
+    id("systems.manifold.manifold-gradle-plugin") version "0.0.2-alpha" apply false
 }
 
 subprojects {
@@ -9,7 +10,7 @@ subprojects {
     apply plugin: 'maven-publish'
 
     group = 'com.wizardlybump17.wlib'
-    version = "1.6.8-ncs-1.20.6+" + ("true".equalsIgnoreCase(System.getenv("WLIB_SNAPSHOT")) ? "-SNAPSHOT." + System.getenv("WLIB_SNAPSHOT_NUMBER") : "")
+    version = "1.6.8-ncs-2-1.20.6+" + ("true".equalsIgnoreCase(System.getenv("WLIB_SNAPSHOT")) ? "-SNAPSHOT." + System.getenv("WLIB_SNAPSHOT_NUMBER") : "")
 
     repositories {
         mavenLocal()
@@ -20,9 +21,6 @@ subprojects {
         }
     }
 
-    sourceCompatibility = '21'
-    targetCompatibility = '21'
-
     tasks {
         compileJava {
             options.encoding = 'UTF-8'
@@ -38,26 +36,22 @@ subprojects {
 
     java {
         withSourcesJar()
+        sourceCompatibility = 21
+        targetCompatibility = 21
     }
 }
 
 subprojects {
     dependencies {
-        testImplementation(platform("org.junit:junit-bom:5.10.3"))
-        testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
+        testImplementation(platform("org.junit:junit-bom:6.0.0"))
+        testImplementation("org.junit.jupiter:junit-jupiter")
+        testImplementation("org.junit.platform:junit-platform-launcher")
     }
 
     test {
         useJUnitPlatform()
     }
 
-    if (project.name == 'versions' || project.name.matches('v\\d_\\d+_R\\d+')) {
-        tasks.withType(PublishToMavenRepository).configureEach {
-            it.enabled = false
-        }
-        return
-    }
-
     publishing {
         repositories {
             maven {
@@ -72,23 +66,10 @@ subprojects {
         publications {
             gpr(MavenPublication) {
                 from(components.java)
-                pom.withXml {
-                    asNode().dependencies.dependency.each { dep ->
-                        if (dep.artifactId.last().value().last().matches('v\\d_\\d+_R\\d+'))
-                            dep.parent().remove(dep)
-                    }
-                }
             }
         }
     }
 
-    dependencies {
-        testImplementation(
-                platform('org.junit:junit-bom:5.10.2'),
-                'org.junit.jupiter:junit-jupiter:5.10.2'
-        )
-    }
-
     test {
         useJUnitPlatform()
         testLogging {

build.gradle

@@ -1,15 +1,22 @@
 package com.wizardlybump17.wlib.util.bukkit;
 
+import com.google.gson.JsonNull;
+import com.google.gson.JsonPrimitive;
+import com.wizardlybump17.wlib.util.StringUtil;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 
 public final class MiniMessageUtil {
 
+    private static final @NotNull TextComponent NULL = Component.text("null");
+
     private MiniMessageUtil() {
     }
 
@@ -21,18 +28,60 @@ private MiniMessageUtil() {
         TagResolver[] resolvers = new TagResolver[placeholders.size()];
         int resolverIndex = 0;
         for (Map.Entry<String, Object> entry : placeholders.entrySet()) {
-            String key = entry.getKey();
+            String key = StringUtil.pascalToCamel(entry.getKey());
             Object value = entry.getValue();
             resolvers[resolverIndex++] = TagResolver.builder()
                     .tag(
                             key,
-                            Tag.inserting(value instanceof Component component ? component : Component.text(String.valueOf(value)))
+                            Tag.inserting(getInsertion(value))
+                    )
+                    .build();
+        }
+        return miniMessage.deserialize(message, resolvers);
+    }
+
+    public static @NotNull Component getMessage(@NotNull String message, @NotNull String placeholderKey, @NotNull Object placeholderValue, @NotNull String prefix, @NotNull Map<String , ?> additionalPlaceholders) {
+        MiniMessage miniMessage = MiniMessage.miniMessage();
+        if (additionalPlaceholders.isEmpty())
+            return getMessage(message, Map.of(placeholderKey, placeholderValue));
+
+        TagResolver[] resolvers = new TagResolver[additionalPlaceholders.size() + 1];
+        int resolverIndex = 0;
+        for (Map.Entry<String, ?> entry : additionalPlaceholders.entrySet()) {
+            String key = StringUtil.pascalToCamel(entry.getKey());
+            Object value = entry.getValue();
+            resolvers[resolverIndex++] = TagResolver.builder()
+                    .tag(
+                            prefix + key,
+                            Tag.inserting(getInsertion(value))
                     )
                     .build();
         }
+        resolvers[resolverIndex] = TagResolver.builder()
+                .tag(
+                        prefix + placeholderKey,
+                        Tag.inserting(getInsertion(placeholderValue))
+                )
+                .build();
         return miniMessage.deserialize(message, resolvers);
     }
 
+    private static @NotNull Component getInsertion(@Nullable Object object) {
+        if (object == null)
+            return NULL;
+
+        return switch (object) {
+            case Component component -> component;
+            case JsonPrimitive jsonPrimitive -> Component.text(jsonPrimitive.getAsString());
+            case JsonNull ignored -> NULL;
+            default -> Component.text(String.valueOf(object));
+        };
+    }
+
+    public static @NotNull Component getMessage(@NotNull String message, @NotNull String placeholderKey, @NotNull Object placeholderValue, @NotNull Map<String , ?> additionalPlaceholders) {
+        return getMessage(message, placeholderKey, placeholderValue, "", additionalPlaceholders);
+    }
+
     public static @NotNull Component getMessage(@NotNull String message) {
         return getMessage(message, Map.of());
     }

bukkit-utils/src/main/java/com/wizardlybump17/wlib/util/bukkit/MiniMessageUtil.java

@@ -0,0 +1,65 @@
+package com.wizardlybump17.wlib.util.bukkit.collector;
+
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+public class ComponentCollector implements Collector<Component, Component[], Component> {
+
+    public static final @NotNull ComponentCollector COMMA = new ComponentCollector(Component.text(", "));
+    public static final @NotNull ComponentCollector NEW_LINE = new ComponentCollector(Component.text("\n"));
+    public static final @NotNull ComponentCollector EMPTY = new ComponentCollector(Component.empty());
+
+    private final @NotNull Component separator;
+
+    public ComponentCollector(@NotNull Component separator) {
+        this.separator = separator;
+    }
+
+    @Override
+    public @NotNull Supplier<Component[]> supplier() {
+        return () -> new Component[1];
+    }
+
+    @Override
+    public @NotNull BiConsumer<Component[], Component> accumulator() {
+        return (array, component) -> {
+            if (array[0] == null)
+                array[0] = component;
+            else
+                array[0] = array[0].append(separator).append(component);
+        };
+    }
+
+    @Override
+    public @NotNull BinaryOperator<Component[]> combiner() {
+        return (left, right) -> {
+            if (left[0] == null)
+                left[0] = right[0];
+            else
+                left[0] = left[0].append(separator).append(right[0]);
+            return left;
+        };
+    }
+
+    @Override
+    public @NotNull Function<Component[], Component> finisher() {
+        return array -> Objects.requireNonNullElseGet(array[0], Component::empty);
+    }
+
+    @Override
+    public @NotNull Set<Characteristics> characteristics() {
+        return Set.of();
+    }
+
+    public @NotNull Component getSeparator() {
+        return separator;
+    }
+}

bukkit-utils/src/main/java/com/wizardlybump17/wlib/util/bukkit/collector/ComponentCollector.java

@@ -8,7 +8,7 @@ dependencies {
     compileOnly(
             'org.projectlombok:lombok:1.18.32',
             'org.jetbrains:annotations:23.0.0',
-            'net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT',
+            'net.md-5:bungeecord-api:1.21-R0.3',
     )
     annotationProcessor('org.projectlombok:lombok:1.18.32')
     implementation(