Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KyoriPowered/adventure-platform
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.3.2
Choose a base ref
...
head repository: KyoriPowered/adventure-platform
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref

Commits on Dec 21, 2023

  1. Copy the full SHA
    7e710a3 View commit details
  2. Copy the full SHA
    36ab631 View commit details

Commits on Jan 2, 2024

  1. Copy the full SHA
    bc1ca9b View commit details

Commits on Feb 3, 2024

  1. Copy the full SHA
    222e58e View commit details

Commits on Feb 4, 2024

  1. Copy the full SHA
    286fb75 View commit details
  2. Merge pull request #147 from KyoriPowered/renovate/patch-release-depe…

    …ndency-changes
    
    chore(deps): Update patch-release dependency changes to v5.10.2
    zml2008 authored Feb 4, 2024
    Copy the full SHA
    800b3c5 View commit details
  3. Merge pull request #148 from KyoriPowered/renovate/org.jetbrains-anno…

    …tations-24.x
    
    chore(deps): Update dependency org.jetbrains:annotations to v24.1.0
    zml2008 authored Feb 4, 2024
    Copy the full SHA
    63d7285 View commit details
  4. Merge pull request #142 from KyoriPowered/renovate/gradle-and-github-…

    …actions
    
    chore(deps): Update gradle and github actions
    zml2008 authored Feb 4, 2024
    Copy the full SHA
    e8a4e3a View commit details
  5. Copy the full SHA
    861efe8 View commit details
  6. Merge pull request #141 from KyoriPowered/renovate/error-prone-monorepo

    chore(deps): Update dependency com.google.errorprone:error_prone_annotations to v2.24.1
    zml2008 authored Feb 4, 2024
    Copy the full SHA
    3eabb5f View commit details

Commits on Feb 17, 2024

  1. Copy the full SHA
    f933d13 View commit details
  2. Copy the full SHA
    53bf72f View commit details
  3. Bump BungeeCord version

    bivashy committed Feb 17, 2024
    Copy the full SHA
    d36cd91 View commit details

Commits on Feb 18, 2024

  1. Copy the full SHA
    7f4dc01 View commit details

Commits on Feb 19, 2024

  1. Copy the full SHA
    2e8fbf5 View commit details

Commits on Feb 29, 2024

  1. Copy the full SHA
    de6e761 View commit details

Commits on Mar 4, 2024

  1. Fix code format violations

    bivashy committed Mar 4, 2024
    Copy the full SHA
    5964a61 View commit details
  2. Copy the full SHA
    c36534b View commit details

Commits on Mar 12, 2024

  1. Copy the full SHA
    548299e View commit details

Commits on Mar 28, 2024

  1. Copy the full SHA
    d3015c3 View commit details

Commits on Mar 29, 2024

  1. Copy the full SHA
    c58d830 View commit details

Commits on Apr 2, 2024

  1. Copy the full SHA
    fc69675 View commit details

Commits on Apr 3, 2024

  1. Merge pull request #161 from KyoriPowered/renovate/gradle-and-github-…

    …actions
    
    chore(deps): Update dependency gradle to v8.7
    zml2008 authored Apr 3, 2024
    Copy the full SHA
    5ba74ef View commit details
  2. Merge pull request #158 from KyoriPowered/renovate/error-prone-monorepo

    chore(deps): Update dependency com.google.errorprone:error_prone_annotations to v2.26.1
    zml2008 authored Apr 3, 2024
    Copy the full SHA
    94a37fb View commit details

Commits on Apr 26, 2024

  1. Add Bukkit 1.20.5 support

    56738 committed Apr 26, 2024
    Copy the full SHA
    aad62b5 View commit details
  2. Copy the full SHA
    5fc9287 View commit details
  3. Copy the full SHA
    1557d3c View commit details

Commits on Apr 28, 2024

  1. Merge pull request #163 from 56738/spigot-1.20.5

    Bukkit 1.20.5 support
    kashike authored Apr 28, 2024
    Copy the full SHA
    d5ab099 View commit details

Commits on May 2, 2024

  1. Copy the full SHA
    9259ece View commit details
  2. Copy the full SHA
    fa4fac2 View commit details
  3. fix snapshot badge

    powercasgamer authored May 2, 2024
    Copy the full SHA
    9555fcd View commit details
  4. Merge pull request #166 from powercasgamer/fix/snapshot-badge

    fix snapshot badge
    zml2008 authored May 2, 2024
    Copy the full SHA
    9c15901 View commit details

Commits on May 4, 2024

  1. Fix javadoc generation

    56738 committed May 4, 2024
    Copy the full SHA
    62680d8 View commit details

Commits on May 7, 2024

  1. Merge pull request #168 from 56738/fix-javadoc

    Fix javadoc generation
    zml2008 authored May 7, 2024
    Copy the full SHA
    605e396 View commit details
  2. Merge pull request #153 from bivashy/main

    BungeeCord: BossBar compatibilty with BungeeCord 1.20-R0.2 and newer
    zml2008 authored May 7, 2024
    Copy the full SHA
    8f5c0c2 View commit details
  3. Merge pull request #164 from KyoriPowered/renovate/gradle-and-github-…

    …actions
    
    chore(deps): Update plugin io.github.gradle-nexus.publish-plugin to v2.0.0
    zml2008 authored May 7, 2024
    Copy the full SHA
    4812be5 View commit details
  4. Merge pull request #165 from KyoriPowered/renovate/error-prone-monorepo

    chore(deps): Update dependency com.google.errorprone:error_prone_annotations to v2.27.1
    zml2008 authored May 7, 2024
    Copy the full SHA
    f075f0e View commit details

Commits on May 30, 2024

  1. Copy the full SHA
    9d78b32 View commit details
  2. Merge pull request #171 from jpenilla/fix-tablist-paper-1206

    Fix tab list header/footer on Paper 1.20.6
    zml2008 authored May 30, 2024
    Copy the full SHA
    7a2a392 View commit details

Commits on Jun 2, 2024

  1. Merge pull request #160 from CubBossa/main

    Set player locale when creating Audience
    zml2008 authored Jun 2, 2024
    Copy the full SHA
    8969272 View commit details
  2. release: version 4.3.3

    zml2008 committed Jun 2, 2024
    Copy the full SHA
    c398830 View commit details
  3. Copy the full SHA
    dd97b66 View commit details

Commits on Jun 10, 2024

  1. Copy the full SHA
    7724203 View commit details

Commits on Jun 19, 2024

  1. Merge pull request #177 from re-ovo/main

    Fixed MinecraftComponentSerializer not working due to relocation
    zml2008 authored Jun 19, 2024
    Copy the full SHA
    609e417 View commit details

Commits on Jul 2, 2024

  1. chore(deps): Update patch-release dependency changes to v5.10.3

    renovate[bot] authored Jul 2, 2024
    Copy the full SHA
    e0238fc View commit details

Commits on Jul 11, 2024

  1. chore(deps): Update dependency gradle to v8.9

    renovate[bot] authored Jul 11, 2024
    Copy the full SHA
    e5b41a2 View commit details

Commits on Jul 19, 2024

  1. Copy the full SHA
    2c041b9 View commit details

Commits on Jul 25, 2024

  1. this is actually a snapshot for now

    zml2008 authored Jul 25, 2024
    Copy the full SHA
    ebad788 View commit details

Commits on Aug 4, 2024

  1. Merge pull request #179 from KyoriPowered/renovate/patch-release-depe…

    …ndency-changes
    
    chore(deps): Update patch-release dependency changes to v5.10.3
    zml2008 authored Aug 4, 2024
    Copy the full SHA
    f52fe40 View commit details
  2. Merge pull request #174 from KyoriPowered/renovate/gradle-and-github-…

    …actions
    
    chore(deps): Update dependency gradle to v8.9
    zml2008 authored Aug 4, 2024
    Copy the full SHA
    288f5b6 View commit details
24 changes: 24 additions & 0 deletions .github/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
changelog:
exclude:
labels:
- "type: dependencies"
- "dependencies"
categories:
- title: "✨ Features"
labels:
- "type: enhancement"
- "enhancement"
- title: "🔧 Changes"
labels:
- "breaking"
- title: "🐛 Fixes"
labels:
- "type: bug"
- "bug"
- title: "📚 Documentation"
labels:
- "type: documentation"
- "documentation"
- title: "Other"
labels:
- "*"
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@ plugins {
id 'net.kyori.indra.publishing.sonatype' version "$indraVersion"
id 'net.kyori.indra.licenser.spotless' version "$indraVersion" apply false
id 'net.kyori.indra.crossdoc' version "$indraVersion" apply false
id 'io.github.gradle-nexus.publish-plugin' version "2.0.0-rc-1"
id 'io.github.gradle-nexus.publish-plugin' version "2.0.0"
}

// Adventure version
ext.adventure = "4.13.1"

group 'net.kyori'
version '4.3.2'
version '4.3.5-SNAPSHOT'
description 'Legacy platform integrations for the adventure UI library'

indraSonatype {
@@ -36,8 +36,8 @@ class BukkitAnnotationsRule implements ComponentMetadataRule {
void execute(final ComponentMetadataContext componentMetadataContext) {
componentMetadataContext.details.withVariant("compile") {
withDependencies {
add("com.google.errorprone:error_prone_annotations:2.22.0")
add("org.jetbrains:annotations:24.0.1")
add("com.google.errorprone:error_prone_annotations:2.33.0")
add("org.jetbrains:annotations:25.0.0")
}
}
}
@@ -56,8 +56,8 @@ subprojects {
}
annotationProcessor 'ca.stellardrift:contract-validator:1.0.1'
checkstyle 'ca.stellardrift:stylecheck:0.2.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.2'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
}

tasks.withType(Javadoc).configureEach {
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.caching=true
org.gradle.parallel=true

javadocPublishRoot=https://jd.advntr.dev/
javadocPublishRoot=https://jd.advntr.dev/platform/
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
21 changes: 12 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -145,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -202,11 +205,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Original file line number Diff line number Diff line change
@@ -25,21 +25,17 @@

import com.viaversion.viaversion.api.connection.UserConnection;
import java.util.Collection;
import java.util.Locale;
import java.util.function.Function;
import net.kyori.adventure.bossbar.BossBar;
import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.platform.facet.Facet;
import net.kyori.adventure.platform.facet.FacetAudience;
import net.kyori.adventure.platform.facet.FacetAudienceProvider;
import net.kyori.adventure.platform.viaversion.ViaFacet;
import net.kyori.adventure.pointer.Pointers;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@SuppressWarnings("Convert2MethodRef")
final class BukkitAudience extends FacetAudience<CommandSender> {
@@ -73,6 +69,7 @@ final class BukkitAudience extends FacetAudience<CommandSender> {
);
private static final Collection<Facet.Book<Player, ?, ?>> BOOK = Facet.of(
// () -> new SpigotFacet.Book(),
() -> new CraftBukkitFacet.Book_1_20_5(),
() -> new CraftBukkitFacet.BookPost1_13(),
() -> new CraftBukkitFacet.Book1_13(),
() -> new CraftBukkitFacet.BookPre1_13());
@@ -95,30 +92,12 @@ final class BukkitAudience extends FacetAudience<CommandSender> {
);

private final @NotNull Plugin plugin;
// Bukkit only provides this as a String
private @Nullable Locale locale;

BukkitAudience(final @NotNull Plugin plugin, final FacetAudienceProvider<?, ?> provider, final @NotNull Collection<CommandSender> viewers) {
super(provider, viewers, CHAT, ACTION_BAR, TITLE, SOUND, ENTITY_SOUND, BOOK, BOSS_BAR, TAB_LIST, POINTERS);
this.plugin = plugin;
}

void locale(final @Nullable Locale locale) {
final boolean changed = this.locale != (this.locale = locale);
if (changed) {
this.refresh();
}
}

@Nullable Locale locale() {
return this.locale;
}

@Override
protected void contributePointers(final Pointers.Builder builder) {
builder.withDynamic(Identity.LOCALE, BukkitAudience.this::locale);
}

@Override
public void showBossBar(final @NotNull BossBar bar) {
// Some boss bar listeners need access to a Plugin to register events.
Original file line number Diff line number Diff line change
@@ -106,10 +106,6 @@ static BukkitAudiences instanceFor(final @NotNull Plugin plugin) {
this.addViewer(event.getPlayer()));
this.registerEvent(PlayerQuitEvent.class, EventPriority.MONITOR, event ->
this.removeViewer(event.getPlayer()));
this.registerLocaleEvent(EventPriority.MONITOR, (viewer, locale) -> {
final @Nullable BukkitAudience audience = this.viewers.get(viewer);
if (audience != null) audience.locale(locale);
});
}

@Override
@@ -128,7 +124,7 @@ static BukkitAudiences instanceFor(final @NotNull Plugin plugin) {

@Override
public @NotNull Audience player(final @NotNull Player player) {
return this.player(player.getUniqueId());
return super.player(player.getUniqueId());
}

@Override
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
import com.viaversion.viaversion.api.connection.UserConnection;
import java.lang.invoke.MethodHandle;
import java.util.Collection;
import java.util.Locale;
import java.util.Set;
import java.util.function.Function;
import net.kyori.adventure.identity.Identity;
@@ -37,6 +38,7 @@
import net.kyori.adventure.platform.facet.FacetPointers;
import net.kyori.adventure.sound.SoundStop;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.translation.Translator;
import net.kyori.adventure.util.TriState;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@@ -418,6 +420,8 @@ public void contributePointers(final ConsoleCommandSender viewer, final net.kyor

static final class PlayerPointers extends BukkitFacet<Player> implements Facet.Pointers<Player> {

private static final MethodHandle LOCALE_SUPPORTED = findMethod(Player.class, "getLocale", String.class);

PlayerPointers() {
super(Player.class);
}
@@ -426,6 +430,16 @@ static final class PlayerPointers extends BukkitFacet<Player> implements Facet.P
public void contributePointers(final Player viewer, final net.kyori.adventure.pointer.Pointers.Builder builder) {
builder.withDynamic(Identity.UUID, viewer::getUniqueId);
builder.withDynamic(Identity.DISPLAY_NAME, () -> BukkitComponentSerializer.legacy().deserializeOrNull(viewer.getDisplayName()));
builder.withDynamic(Identity.LOCALE, () -> {
if (LOCALE_SUPPORTED != null) {
try {
return Translator.parseLocale((String) LOCALE_SUPPORTED.invoke(viewer));
} catch (final Throwable error) {
logError(error, "Failed to call getLocale() for %s", viewer);
}
}
return Locale.getDefault();
});
builder.withStatic(FacetPointers.TYPE, FacetPointers.Type.PLAYER);
builder.withDynamic(FacetPointers.WORLD, () -> Key.key(viewer.getWorld().getName())); // :(
}
Loading