Skip to content

Commit 9bd705c

Browse files
committed
Merge branch 'api-15' into api-16
2 parents c5911e4 + 92ddc65 commit 9bd705c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+345
-42
lines changed

src/main/java/org/spongepowered/api/advancement/AdvancementType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
package org.spongepowered.api.advancement;
2626

2727
import net.kyori.adventure.text.format.TextColor;
28+
import org.spongepowered.api.data.type.StringRepresentable;
2829
import org.spongepowered.api.registry.DefaultedRegistryValue;
2930
import org.spongepowered.api.util.annotation.CatalogedBy;
3031

@@ -33,7 +34,7 @@
3334
* also the appearance in the notifications.
3435
*/
3536
@CatalogedBy(AdvancementTypes.class)
36-
public interface AdvancementType extends DefaultedRegistryValue<AdvancementType> {
37+
public interface AdvancementType extends DefaultedRegistryValue<AdvancementType>, StringRepresentable {
3738

3839
/**
3940
* Gets the {@link TextColor} of the advancement type.

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
@@ -1194,6 +1194,13 @@ public final class Keys {
11941194
*/
11951195
public static final Key<Value<UUID>> FIRST_TRUSTED = Keys.key(ResourceKey.sponge("first_trusted"), UUID.class);
11961196

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

src/main/java/org/spongepowered/api/data/type/DyeColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* Represents a color of dye that can be used by various items and blocks.
3333
*/
3434
@CatalogedBy(DyeColors.class)
35-
public interface DyeColor extends DefaultedRegistryValue<DyeColor> {
35+
public interface DyeColor extends DefaultedRegistryValue<DyeColor>, StringRepresentable {
3636

3737
/**
3838
* Gets this dye color as a {@link Color} for easy translation.

src/main/java/org/spongepowered/api/data/type/FoxType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
* Represents a type of fox a fox is.
3232
*/
3333
@CatalogedBy(FoxTypes.class)
34-
public interface FoxType extends DefaultedRegistryValue<FoxType> {
34+
public interface FoxType extends DefaultedRegistryValue<FoxType>, StringRepresentable {
3535

3636
}

src/main/java/org/spongepowered/api/data/type/HorseColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
* <p>The color of a horse is a genetic trait that can be inherited to a new born horse.</p>
3434
*/
3535
@CatalogedBy(HorseColors.class)
36-
public interface HorseColor extends DefaultedRegistryValue<HorseColor> {
36+
public interface HorseColor extends DefaultedRegistryValue<HorseColor>, StringRepresentable {
3737

3838
}

src/main/java/org/spongepowered/api/data/type/LlamaType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
import org.spongepowered.api.util.annotation.CatalogedBy;
2929

3030
@CatalogedBy(LlamaTypes.class)
31-
public interface LlamaType extends DefaultedRegistryValue<LlamaType> {
31+
public interface LlamaType extends DefaultedRegistryValue<LlamaType>, StringRepresentable {
3232

3333
}

src/main/java/org/spongepowered/api/data/type/MooshroomType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
* Represents a type of mooshroom a mooshroom is.
3232
*/
3333
@CatalogedBy(MooshroomTypes.class)
34-
public interface MooshroomType extends DefaultedRegistryValue<MooshroomType> {
34+
public interface MooshroomType extends DefaultedRegistryValue<MooshroomType>, StringRepresentable {
3535

3636
}

src/main/java/org/spongepowered/api/data/type/PandaGene.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Represents the type of panda a panda is.
3232
*/
3333
@CatalogedBy(PandaGenes.class)
34-
public interface PandaGene extends DefaultedRegistryValue<PandaGene> {
34+
public interface PandaGene extends DefaultedRegistryValue<PandaGene>, StringRepresentable {
3535

3636
boolean isRecessive();
3737
}

0 commit comments

Comments
 (0)