From 77ea59cc925bc06e2342483d80a844679e20f075 Mon Sep 17 00:00:00 2001 From: kento2 Date: Sat, 29 Aug 2026 15:11:32 +0200 Subject: [PATCH] use LiteralMeta instead of permission-less literal-names for subLiterals --- .../model/literal/DynamicLiteralBuilder.java | 2 +- .../scrow/commands/model/literal/LiteralMeta.java | 12 ++++++++++++ .../commands/model/literal/LiteralMetaImpl.java | 11 +++++++++++ defs.bzl | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 common/site/lab0x13/scrow/commands/model/literal/LiteralMetaImpl.java diff --git a/common/site/lab0x13/scrow/commands/model/literal/DynamicLiteralBuilder.java b/common/site/lab0x13/scrow/commands/model/literal/DynamicLiteralBuilder.java index 1e5db62..d992abe 100644 --- a/common/site/lab0x13/scrow/commands/model/literal/DynamicLiteralBuilder.java +++ b/common/site/lab0x13/scrow/commands/model/literal/DynamicLiteralBuilder.java @@ -23,7 +23,7 @@ public final class DynamicLiteralBuilder> extends Li return this; } - public DynamicLiteralBuilder withSubLiteralNames(Supplier> names) { + public DynamicLiteralBuilder withSubLiteralMetas(Supplier> names) { subLiteralMetaSupplier = names; return this; } diff --git a/common/site/lab0x13/scrow/commands/model/literal/LiteralMeta.java b/common/site/lab0x13/scrow/commands/model/literal/LiteralMeta.java index b0b2b1f..889a909 100644 --- a/common/site/lab0x13/scrow/commands/model/literal/LiteralMeta.java +++ b/common/site/lab0x13/scrow/commands/model/literal/LiteralMeta.java @@ -1,8 +1,20 @@ package site.lab0x13.scrow.commands.model.literal; +import org.jetbrains.annotations.Nullable; + +import java.util.Arrays; import java.util.List; public interface LiteralMeta { + + static LiteralMeta of(List names, @Nullable String permission) { + return new LiteralMetaImpl(names, permission); + } + + static LiteralMeta of(String... names) { + return of(Arrays.asList(names), null); + } + List names(); String permission(); diff --git a/common/site/lab0x13/scrow/commands/model/literal/LiteralMetaImpl.java b/common/site/lab0x13/scrow/commands/model/literal/LiteralMetaImpl.java new file mode 100644 index 0000000..82bb062 --- /dev/null +++ b/common/site/lab0x13/scrow/commands/model/literal/LiteralMetaImpl.java @@ -0,0 +1,11 @@ +package site.lab0x13.scrow.commands.model.literal; + +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +record LiteralMetaImpl( + List names, + @Nullable String permission +) implements LiteralMeta { +} diff --git a/defs.bzl b/defs.bzl index a32d963..fe77b49 100644 --- a/defs.bzl +++ b/defs.bzl @@ -1,2 +1,2 @@ GROUP = "site.lab0x13.scrow" -VERSION = "1.3.0" \ No newline at end of file +VERSION = "1.3.1" \ No newline at end of file