Skip to content

Commit a1902a2

Browse files
GrinchDaniel Naylor
authored andcommitted
Add remaining registry methods
Signed-off-by: Steven Downer <[email protected]>
1 parent 3111cd4 commit a1902a2

File tree

120 files changed

+536
-22
lines changed

Some content is hidden

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

120 files changed

+536
-22
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.spongepowered.api.ResourceKey;
2828
import org.spongepowered.api.Sponge;
2929
import org.spongepowered.api.registry.DefaultedRegistryReference;
30+
import org.spongepowered.api.registry.Registry;
3031
import org.spongepowered.api.registry.RegistryKey;
3132
import org.spongepowered.api.registry.RegistryScope;
3233
import org.spongepowered.api.registry.RegistryScopes;
@@ -74,6 +75,10 @@ public final class AdvancementTypes {
7475
private AdvancementTypes() {
7576
}
7677

78+
public static Registry<AdvancementType> registry() {
79+
return Sponge.game().registry(RegistryTypes.ADVANCEMENT_TYPE);
80+
}
81+
7782
private static DefaultedRegistryReference<AdvancementType> key(final ResourceKey location) {
7883
return RegistryKey.of(RegistryTypes.ADVANCEMENT_TYPE, location).asDefaultedReference(Sponge::game);
7984
}

src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.spongepowered.api.ResourceKey;
2828
import org.spongepowered.api.Sponge;
2929
import org.spongepowered.api.registry.DefaultedRegistryReference;
30+
import org.spongepowered.api.registry.Registry;
3031
import org.spongepowered.api.registry.RegistryKey;
3132
import org.spongepowered.api.registry.RegistryScope;
3233
import org.spongepowered.api.registry.RegistryScopes;
@@ -134,6 +135,10 @@ public final class Triggers {
134135
private Triggers() {
135136
}
136137

138+
public static Registry<Trigger<?>> registry() {
139+
return Sponge.game().registry(RegistryTypes.TRIGGER);
140+
}
141+
137142
private static DefaultedRegistryReference<Trigger<?>> key(final ResourceKey location) {
138143
return RegistryKey.of(RegistryTypes.TRIGGER, location).asDefaultedReference(Sponge::game);
139144
}

src/main/java/org/spongepowered/api/adventure/ResolveOperations.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.spongepowered.api.ResourceKey;
2929
import org.spongepowered.api.Sponge;
3030
import org.spongepowered.api.registry.DefaultedRegistryReference;
31+
import org.spongepowered.api.registry.Registry;
3132
import org.spongepowered.api.registry.RegistryKey;
3233
import org.spongepowered.api.registry.RegistryScope;
3334
import org.spongepowered.api.registry.RegistryScopes;
@@ -73,6 +74,10 @@ public class ResolveOperations {
7374
private ResolveOperations() {
7475
}
7576

77+
public static Registry<ResolveOperation> registry() {
78+
return Sponge.game().registry(RegistryTypes.RESOLVE_OPERATION);
79+
}
80+
7681
private static DefaultedRegistryReference<ResolveOperation> key(final ResourceKey location) {
7782
return RegistryKey.of(RegistryTypes.RESOLVE_OPERATION, location).asDefaultedReference(Sponge::game);
7883
}

src/main/java/org/spongepowered/api/block/BlockTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ private BlockTypes() {
15721572
}
15731573

15741574
public static Registry<BlockType> registry() {
1575-
return Sponge.game().registries().registry(RegistryTypes.BLOCK_TYPE);
1575+
return Sponge.game().registry(RegistryTypes.BLOCK_TYPE);
15761576
}
15771577

15781578
private static DefaultedRegistryReference<BlockType> key(final ResourceKey location) {

src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private BlockEntityTypes() {
112112
}
113113

114114
public static Registry<BlockEntityType> registry() {
115-
return Sponge.game().registries().registry(RegistryTypes.BLOCK_ENTITY_TYPE);
115+
return Sponge.game().registry(RegistryTypes.BLOCK_ENTITY_TYPE);
116116
}
117117

118118
private static DefaultedRegistryReference<BlockEntityType> key(final ResourceKey location) {

src/main/java/org/spongepowered/api/block/transaction/Operations.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.spongepowered.api.ResourceKey;
2828
import org.spongepowered.api.Sponge;
2929
import org.spongepowered.api.registry.DefaultedRegistryReference;
30+
import org.spongepowered.api.registry.Registry;
3031
import org.spongepowered.api.registry.RegistryKey;
3132
import org.spongepowered.api.registry.RegistryScope;
3233
import org.spongepowered.api.registry.RegistryScopes;
@@ -83,6 +84,10 @@ public final class Operations {
8384
private Operations() {
8485
}
8586

87+
public static Registry<Operation> registry() {
88+
return Sponge.game().registry(RegistryTypes.OPERATION);
89+
}
90+
8691
private static DefaultedRegistryReference<Operation> key(final ResourceKey location) {
8792
return RegistryKey.of(RegistryTypes.OPERATION, location).asDefaultedReference(Sponge::game);
8893
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.spongepowered.api.Sponge;
2929
import org.spongepowered.api.command.parameter.managed.ValueParser;
3030
import org.spongepowered.api.registry.DefaultedRegistryReference;
31+
import org.spongepowered.api.registry.Registry;
3132
import org.spongepowered.api.registry.RegistryKey;
3233
import org.spongepowered.api.registry.RegistryScope;
3334
import org.spongepowered.api.registry.RegistryScopes;
@@ -92,6 +93,10 @@ public final class ClientCompletionTypes {
9293
private ClientCompletionTypes() {
9394
}
9495

96+
public static Registry<ClientCompletionType> registry() {
97+
return Sponge.game().registry(RegistryTypes.CLIENT_COMPLETION_TYPE);
98+
}
99+
95100
private static DefaultedRegistryReference<ClientCompletionType> key(final ResourceKey location) {
96101
return RegistryKey.of(RegistryTypes.CLIENT_COMPLETION_TYPE, location).asDefaultedReference(Sponge::game);
97102
}

src/main/java/org/spongepowered/api/command/parameter/managed/operator/Operators.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.spongepowered.api.ResourceKey;
2828
import org.spongepowered.api.Sponge;
2929
import org.spongepowered.api.registry.DefaultedRegistryReference;
30+
import org.spongepowered.api.registry.Registry;
3031
import org.spongepowered.api.registry.RegistryKey;
3132
import org.spongepowered.api.registry.RegistryTypes;
3233

@@ -86,6 +87,10 @@ public final class Operators {
8687
private Operators() {
8788
}
8889

90+
public static Registry<Operator> registry() {
91+
return Sponge.game().registry(RegistryTypes.OPERATOR);
92+
}
93+
8994
private static <T extends Operator> DefaultedRegistryReference<T> key(final ResourceKey location) {
9095
return RegistryKey.of(RegistryTypes.OPERATOR, location).asDefaultedReference(Sponge::game);
9196
}

src/main/java/org/spongepowered/api/command/parameter/managed/standard/ResourceKeyedValueParameters.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.spongepowered.api.ResourceKey;
2929
import org.spongepowered.api.Sponge;
3030
import org.spongepowered.api.block.BlockState;
31+
import org.spongepowered.api.command.parameter.managed.ValueParameter;
3132
import org.spongepowered.api.command.parameter.managed.operator.Operator;
3233
import org.spongepowered.api.command.parameter.managed.operator.Operators;
3334
import org.spongepowered.api.data.persistence.DataContainer;
@@ -39,6 +40,7 @@
3940
import org.spongepowered.api.item.inventory.ItemStackSnapshot;
4041
import org.spongepowered.api.profile.GameProfile;
4142
import org.spongepowered.api.registry.DefaultedRegistryReference;
43+
import org.spongepowered.api.registry.Registry;
4244
import org.spongepowered.api.registry.RegistryKey;
4345
import org.spongepowered.api.registry.RegistryScope;
4446
import org.spongepowered.api.registry.RegistryScopes;
@@ -473,6 +475,10 @@ public final class ResourceKeyedValueParameters {
473475
private ResourceKeyedValueParameters() {
474476
}
475477

478+
public static Registry<ValueParameter<?>> registry() {
479+
return Sponge.game().registry(RegistryTypes.REGISTRY_KEYED_VALUE_PARAMETER);
480+
}
481+
476482
private static <T> DefaultedRegistryReference<ResourceKeyedValueParameter<T>> key(final ResourceKey location) {
477483
return RegistryKey.of(RegistryTypes.REGISTRY_KEYED_VALUE_PARAMETER, location).asDefaultedReference(Sponge::game);
478484
}

src/main/java/org/spongepowered/api/command/registrar/tree/CommandCompletionProviders.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.spongepowered.api.entity.Entity;
3131
import org.spongepowered.api.item.recipe.Recipe;
3232
import org.spongepowered.api.registry.DefaultedRegistryReference;
33+
import org.spongepowered.api.registry.Registry;
3334
import org.spongepowered.api.registry.RegistryKey;
3435
import org.spongepowered.api.registry.RegistryTypes;
3536
import org.spongepowered.api.world.biome.Biome;
@@ -88,6 +89,10 @@ public final class CommandCompletionProviders {
8889
private CommandCompletionProviders() {
8990
}
9091

92+
public static Registry<CommandCompletionProvider> registry() {
93+
return Sponge.game().registry(RegistryTypes.COMMAND_COMPLETION_PROVIDER);
94+
}
95+
9196
private static DefaultedRegistryReference<CommandCompletionProvider> key(final ResourceKey location) {
9297
return RegistryKey.of(RegistryTypes.COMMAND_COMPLETION_PROVIDER, location).asDefaultedReference(Sponge::game);
9398
}

0 commit comments

Comments
 (0)