Skip to content

Commit 5222ce3

Browse files
committed
Merge branch 'api-12' into api-14
2 parents b06229f + 0b67e0f commit 5222ce3

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

src/main/java/org/spongepowered/api/command/parameter/ArgumentReader.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ interface Immutable extends ArgumentReader {
139139
*/
140140
interface Mutable extends ArgumentReader {
141141

142+
/**
143+
* Moves the cursor to the next character.
144+
*/
145+
void skipChar();
146+
142147
/**
143148
* Moves the cursor to the next non-whitespace character. The cursor
144149
* will not advance if it already refers to a non-whitespace character.

src/main/java/org/spongepowered/api/command/parameter/managed/clientcompletion/ClientCompletionTypes.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ public final class ClientCompletionTypes {
6666
*/
6767
public static final DefaultedRegistryReference<ClientCompletionType> NONE = ClientCompletionTypes.key(ResourceKey.sponge("none"));
6868

69+
/**
70+
* Indicates to the client that the {@link ValueParser} is a greedy
71+
* string.
72+
*/
73+
public static final DefaultedRegistryReference<ClientCompletionType> REMAINING_JOINED_STRINGS = ClientCompletionTypes.key(ResourceKey.sponge("remaining_joined_strings"));
74+
6975
/**
7076
* Indicates to the client that the {@link ValueParser} is a
7177
* {@link ResourceKey}.

src/main/java/org/spongepowered/api/data/Keys.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,13 @@ public final class Keys {
11921192
*/
11931193
public static final Key<Value<UUID>> FIRST_TRUSTED = Keys.key(ResourceKey.sponge("first_trusted"), UUID.class);
11941194

1195+
/**
1196+
* Whether a {@link ItemFrame} is "fixed".
1197+
*
1198+
* <p>Fixed item frames can not have their contents modified.</p>
1199+
*/
1200+
public static final Key<Value<Boolean>> FIXED = Keys.key(ResourceKey.sponge("fixed"), Boolean.class);
1201+
11951202
/**
11961203
* The fixed time in a {@link ServerWorld world} of a {@link WorldType}.
11971204
* <p>If set the time is fixed at a particular {@link MinecraftDayTime} otherwise time flows freely.</p>

0 commit comments

Comments
 (0)