diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java index 9c6ce0d66..c7170eaf1 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/ComponentSerializerImpl.java @@ -52,7 +52,7 @@ import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; import net.kyori.adventure.text.TranslationArgument; -import net.kyori.adventure.text.serializer.json.JSONFlags; +import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.option.OptionState; import org.jetbrains.annotations.Nullable; @@ -79,7 +79,7 @@ final class ComponentSerializerImpl extends TypeAdapter { static final Type TRANSLATABLE_ARGUMENT_LIST_TYPE = new TypeToken>() {}.getType(); static TypeAdapter create(final OptionState features, final Gson gson) { - return new ComponentSerializerImpl(features.value(JSONFlags.EMIT_COMPACT_TEXT_COMPONENT), gson).nullSafe(); + return new ComponentSerializerImpl(features.value(JSONOptions.EMIT_COMPACT_TEXT_COMPONENT), gson).nullSafe(); } private final boolean emitCompactTextComponent; diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java index aaecdfbc9..d234979e1 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializer.java @@ -31,7 +31,7 @@ import net.kyori.adventure.builder.AbstractBuilder; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.json.JSONComponentSerializer; -import net.kyori.adventure.text.serializer.json.JSONFlags; +import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.adventure.util.Buildable; import net.kyori.adventure.util.PlatformAPI; import net.kyori.option.OptionState; @@ -125,10 +125,10 @@ static Builder builder() { */ interface Builder extends AbstractBuilder, Buildable.Builder, JSONComponentSerializer.Builder { @Override - @NotNull Builder features(final @NotNull OptionState flags); + @NotNull Builder options(final @NotNull OptionState flags); @Override - @NotNull Builder editFeatures(final @NotNull Consumer flagEditor); + @NotNull Builder editOptions(final @NotNull Consumer optionEditor); /** * Sets that the serializer should downsample hex colors to named colors. @@ -138,7 +138,7 @@ interface Builder extends AbstractBuilder, Buildable.Bu */ @Override default @NotNull Builder downsampleColors() { - return this.editFeatures(features -> features.value(JSONFlags.EMIT_RGB, false)); + return this.editOptions(features -> features.value(JSONOptions.EMIT_RGB, false)); } /** @@ -167,7 +167,7 @@ interface Builder extends AbstractBuilder, Buildable.Bu @Deprecated @Override default @NotNull Builder emitLegacyHoverEvent() { - return this.editFeatures(b -> b.value(JSONFlags.EMIT_HOVER_EVENT_TYPE, JSONFlags.HoverEventValueMode.BOTH)); + return this.editOptions(b -> b.value(JSONOptions.EMIT_HOVER_EVENT_TYPE, JSONOptions.HoverEventValueMode.BOTH)); } /** diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java index 44a1cdcae..d71a2d4f4 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/GsonComponentSerializerImpl.java @@ -30,7 +30,7 @@ import java.util.function.Consumer; import java.util.function.UnaryOperator; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.json.JSONFlags; +import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.adventure.util.Services; import net.kyori.option.OptionState; import org.jetbrains.annotations.NotNull; @@ -50,10 +50,10 @@ final class GsonComponentSerializerImpl implements GsonComponentSerializer { static final class Instances { static final GsonComponentSerializer INSTANCE = SERVICE .map(Provider::gson) - .orElseGet(() -> new GsonComponentSerializerImpl(JSONFlags.byDataVersion(), null)); + .orElseGet(() -> new GsonComponentSerializerImpl(JSONOptions.byDataVersion(), null)); static final GsonComponentSerializer LEGACY_INSTANCE = SERVICE .map(Provider::gsonLegacy) - .orElseGet(() -> new GsonComponentSerializerImpl(JSONFlags.byDataVersion().at(2525 /* just before 1.16 */), null)); + .orElseGet(() -> new GsonComponentSerializerImpl(JSONOptions.byDataVersion().at(2525 /* just before 1.16 */), null)); } private final Gson serializer; @@ -122,7 +122,7 @@ static final class Instances { } static final class BuilderImpl implements Builder { - private OptionState flags = JSONFlags.byDataVersion(); // latest + private OptionState flags = JSONOptions.byDataVersion(); // latest private net.kyori.adventure.text.serializer.json.@Nullable LegacyHoverEventSerializer legacyHoverSerializer; BuilderImpl() { @@ -136,16 +136,16 @@ static final class BuilderImpl implements Builder { } @Override - public @NotNull Builder features(final @NotNull OptionState flags) { + public @NotNull Builder options(final @NotNull OptionState flags) { this.flags = requireNonNull(flags, "flags"); return this; } @Override - public @NotNull Builder editFeatures(final @NotNull Consumer flagEditor) { + public @NotNull Builder editOptions(final @NotNull Consumer optionEditor) { final OptionState.Builder builder = OptionState.optionState() .values(this.flags); - requireNonNull(flagEditor, "flagEditor").accept(builder); + requireNonNull(optionEditor, "flagEditor").accept(builder); this.flags = builder.build(); return this; } diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java index 968b593c5..52b081fe1 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/SerializerFactory.java @@ -37,7 +37,7 @@ import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; -import net.kyori.adventure.text.serializer.json.JSONFlags; +import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.option.OptionState; import org.jetbrains.annotations.Nullable; @@ -86,7 +86,7 @@ public TypeAdapter create(final Gson gson, final TypeToken type) { } else if (COLOR_WRAPPER_TYPE.isAssignableFrom(rawType)) { return (TypeAdapter) TextColorWrapper.Serializer.INSTANCE; } else if (COLOR_TYPE.isAssignableFrom(rawType)) { - return (TypeAdapter) (this.features.value(JSONFlags.EMIT_RGB) ? TextColorSerializer.INSTANCE : TextColorSerializer.DOWNSAMPLE_COLOR); + return (TypeAdapter) (this.features.value(JSONOptions.EMIT_RGB) ? TextColorSerializer.INSTANCE : TextColorSerializer.DOWNSAMPLE_COLOR); } else if (TEXT_DECORATION_TYPE.isAssignableFrom(rawType)) { return (TypeAdapter) TextDecorationSerializer.INSTANCE; } else if (BLOCK_NBT_POS_TYPE.isAssignableFrom(rawType)) { diff --git a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java index 0481ff866..af48b0b6d 100644 --- a/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java +++ b/text-serializer-gson/src/main/java/net/kyori/adventure/text/serializer/gson/StyleSerializer.java @@ -43,7 +43,7 @@ import net.kyori.adventure.text.format.Style; import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextDecoration; -import net.kyori.adventure.text.serializer.json.JSONFlags; +import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.adventure.util.Codec; import net.kyori.option.OptionState; import org.jetbrains.annotations.Nullable; @@ -83,12 +83,12 @@ final class StyleSerializer extends TypeAdapter