Skip to content

Commit 5c9f033

Browse files
gabizougabizou
committed
feat(minecraft): update content to 1.21.5
Generator previously would consider these variants as part of World, but the Game/Engine is suitable enough as is.
1 parent c3d36c2 commit 5c9f033

File tree

4 files changed

+44
-46
lines changed

4 files changed

+44
-46
lines changed

‎src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ public class AxolotlVariants {
4545

4646
public static final DefaultedRegistryReference<AxolotlVariant> WILD = AxolotlVariants.key(ResourceKey.sponge("wild"));
4747

48-
4948
private static DefaultedRegistryReference<AxolotlVariant> key(final ResourceKey location) {
5049
return RegistryKey.of(RegistryTypes.AXOLOTL_VARIANT, location).asDefaultedReference(Sponge::game);
5150
}
52-
5351
}

‎src/main/java/org/spongepowered/api/data/type/CatTypes.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,51 +25,51 @@
2525
package org.spongepowered.api.data.type;
2626

2727
import org.spongepowered.api.ResourceKey;
28+
import org.spongepowered.api.Sponge;
29+
import org.spongepowered.api.registry.DefaultedRegistryReference;
2830
import org.spongepowered.api.registry.Registry;
2931
import org.spongepowered.api.registry.RegistryKey;
30-
import org.spongepowered.api.registry.RegistryReference;
3132
import org.spongepowered.api.registry.RegistryScope;
3233
import org.spongepowered.api.registry.RegistryScopes;
3334
import org.spongepowered.api.registry.RegistryTypes;
34-
import org.spongepowered.api.world.server.ServerWorld;
3535

3636
/**
3737
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
3838
*/
3939
@SuppressWarnings("unused")
40-
@RegistryScopes(scopes = RegistryScope.WORLD)
40+
@RegistryScopes(scopes = RegistryScope.ENGINE)
4141
public final class CatTypes {
4242

43-
public static final RegistryReference<CatType> ALL_BLACK = CatTypes.key(ResourceKey.minecraft("all_black"));
43+
public static final DefaultedRegistryReference<CatType> ALL_BLACK = CatTypes.key(ResourceKey.minecraft("all_black"));
4444

45-
public static final RegistryReference<CatType> BLACK = CatTypes.key(ResourceKey.minecraft("black"));
45+
public static final DefaultedRegistryReference<CatType> BLACK = CatTypes.key(ResourceKey.minecraft("black"));
4646

47-
public static final RegistryReference<CatType> BRITISH_SHORTHAIR = CatTypes.key(ResourceKey.minecraft("british_shorthair"));
47+
public static final DefaultedRegistryReference<CatType> BRITISH_SHORTHAIR = CatTypes.key(ResourceKey.minecraft("british_shorthair"));
4848

49-
public static final RegistryReference<CatType> CALICO = CatTypes.key(ResourceKey.minecraft("calico"));
49+
public static final DefaultedRegistryReference<CatType> CALICO = CatTypes.key(ResourceKey.minecraft("calico"));
5050

51-
public static final RegistryReference<CatType> JELLIE = CatTypes.key(ResourceKey.minecraft("jellie"));
51+
public static final DefaultedRegistryReference<CatType> JELLIE = CatTypes.key(ResourceKey.minecraft("jellie"));
5252

53-
public static final RegistryReference<CatType> PERSIAN = CatTypes.key(ResourceKey.minecraft("persian"));
53+
public static final DefaultedRegistryReference<CatType> PERSIAN = CatTypes.key(ResourceKey.minecraft("persian"));
5454

55-
public static final RegistryReference<CatType> RAGDOLL = CatTypes.key(ResourceKey.minecraft("ragdoll"));
55+
public static final DefaultedRegistryReference<CatType> RAGDOLL = CatTypes.key(ResourceKey.minecraft("ragdoll"));
5656

57-
public static final RegistryReference<CatType> RED = CatTypes.key(ResourceKey.minecraft("red"));
57+
public static final DefaultedRegistryReference<CatType> RED = CatTypes.key(ResourceKey.minecraft("red"));
5858

59-
public static final RegistryReference<CatType> SIAMESE = CatTypes.key(ResourceKey.minecraft("siamese"));
59+
public static final DefaultedRegistryReference<CatType> SIAMESE = CatTypes.key(ResourceKey.minecraft("siamese"));
6060

61-
public static final RegistryReference<CatType> TABBY = CatTypes.key(ResourceKey.minecraft("tabby"));
61+
public static final DefaultedRegistryReference<CatType> TABBY = CatTypes.key(ResourceKey.minecraft("tabby"));
6262

63-
public static final RegistryReference<CatType> WHITE = CatTypes.key(ResourceKey.minecraft("white"));
63+
public static final DefaultedRegistryReference<CatType> WHITE = CatTypes.key(ResourceKey.minecraft("white"));
6464

6565
private CatTypes() {
6666
}
6767

68-
public static Registry<CatType> registry(final ServerWorld world) {
69-
return world.registry(RegistryTypes.CAT_TYPE);
68+
public static Registry<CatType> registry() {
69+
return Sponge.server().registry(RegistryTypes.CAT_TYPE);
7070
}
7171

72-
private static RegistryReference<CatType> key(final ResourceKey location) {
73-
return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asReference();
72+
private static DefaultedRegistryReference<CatType> key(final ResourceKey location) {
73+
return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asDefaultedReference(Sponge::server);
7474
}
7575
}

‎src/main/java/org/spongepowered/api/data/type/FrogTypes.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@
2525
package org.spongepowered.api.data.type;
2626

2727
import org.spongepowered.api.ResourceKey;
28+
import org.spongepowered.api.Sponge;
29+
import org.spongepowered.api.registry.DefaultedRegistryReference;
2830
import org.spongepowered.api.registry.Registry;
2931
import org.spongepowered.api.registry.RegistryKey;
30-
import org.spongepowered.api.registry.RegistryReference;
3132
import org.spongepowered.api.registry.RegistryScope;
3233
import org.spongepowered.api.registry.RegistryScopes;
3334
import org.spongepowered.api.registry.RegistryTypes;
34-
import org.spongepowered.api.world.server.ServerWorld;
3535

3636
/**
3737
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
3838
*/
3939
@SuppressWarnings("unused")
40-
@RegistryScopes(scopes = RegistryScope.WORLD)
40+
@RegistryScopes(scopes = RegistryScope.ENGINE)
4141
public final class FrogTypes {
4242

43-
public static final RegistryReference<FrogType> COLD = FrogTypes.key(ResourceKey.minecraft("cold"));
43+
public static final DefaultedRegistryReference<FrogType> COLD = FrogTypes.key(ResourceKey.minecraft("cold"));
4444

45-
public static final RegistryReference<FrogType> TEMPERATE = FrogTypes.key(ResourceKey.minecraft("temperate"));
45+
public static final DefaultedRegistryReference<FrogType> TEMPERATE = FrogTypes.key(ResourceKey.minecraft("temperate"));
4646

47-
public static final RegistryReference<FrogType> WARM = FrogTypes.key(ResourceKey.minecraft("warm"));
47+
public static final DefaultedRegistryReference<FrogType> WARM = FrogTypes.key(ResourceKey.minecraft("warm"));
4848

4949
private FrogTypes() {
5050
}
5151

52-
public static Registry<FrogType> registry(final ServerWorld world) {
53-
return world.registry(RegistryTypes.FROG_TYPE);
52+
public static Registry<FrogType> registry() {
53+
return Sponge.server().registry(RegistryTypes.FROG_TYPE);
5454
}
5555

56-
private static RegistryReference<FrogType> key(final ResourceKey location) {
57-
return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asReference();
56+
private static DefaultedRegistryReference<FrogType> key(final ResourceKey location) {
57+
return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asDefaultedReference(Sponge::server);
5858
}
5959
}

‎src/main/java/org/spongepowered/api/data/type/WolfVariants.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,47 +25,47 @@
2525
package org.spongepowered.api.data.type;
2626

2727
import org.spongepowered.api.ResourceKey;
28+
import org.spongepowered.api.Sponge;
29+
import org.spongepowered.api.registry.DefaultedRegistryReference;
2830
import org.spongepowered.api.registry.Registry;
2931
import org.spongepowered.api.registry.RegistryKey;
30-
import org.spongepowered.api.registry.RegistryReference;
3132
import org.spongepowered.api.registry.RegistryScope;
3233
import org.spongepowered.api.registry.RegistryScopes;
3334
import org.spongepowered.api.registry.RegistryTypes;
34-
import org.spongepowered.api.world.server.ServerWorld;
3535

3636
/**
3737
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
3838
*/
3939
@SuppressWarnings("unused")
40-
@RegistryScopes(scopes = RegistryScope.WORLD)
40+
@RegistryScopes(scopes = RegistryScope.ENGINE)
4141
public final class WolfVariants {
4242

43-
public static final RegistryReference<WolfVariant> ASHEN = WolfVariants.key(ResourceKey.minecraft("ashen"));
43+
public static final DefaultedRegistryReference<WolfVariant> ASHEN = WolfVariants.key(ResourceKey.minecraft("ashen"));
4444

45-
public static final RegistryReference<WolfVariant> BLACK = WolfVariants.key(ResourceKey.minecraft("black"));
45+
public static final DefaultedRegistryReference<WolfVariant> BLACK = WolfVariants.key(ResourceKey.minecraft("black"));
4646

47-
public static final RegistryReference<WolfVariant> CHESTNUT = WolfVariants.key(ResourceKey.minecraft("chestnut"));
47+
public static final DefaultedRegistryReference<WolfVariant> CHESTNUT = WolfVariants.key(ResourceKey.minecraft("chestnut"));
4848

49-
public static final RegistryReference<WolfVariant> PALE = WolfVariants.key(ResourceKey.minecraft("pale"));
49+
public static final DefaultedRegistryReference<WolfVariant> PALE = WolfVariants.key(ResourceKey.minecraft("pale"));
5050

51-
public static final RegistryReference<WolfVariant> RUSTY = WolfVariants.key(ResourceKey.minecraft("rusty"));
51+
public static final DefaultedRegistryReference<WolfVariant> RUSTY = WolfVariants.key(ResourceKey.minecraft("rusty"));
5252

53-
public static final RegistryReference<WolfVariant> SNOWY = WolfVariants.key(ResourceKey.minecraft("snowy"));
53+
public static final DefaultedRegistryReference<WolfVariant> SNOWY = WolfVariants.key(ResourceKey.minecraft("snowy"));
5454

55-
public static final RegistryReference<WolfVariant> SPOTTED = WolfVariants.key(ResourceKey.minecraft("spotted"));
55+
public static final DefaultedRegistryReference<WolfVariant> SPOTTED = WolfVariants.key(ResourceKey.minecraft("spotted"));
5656

57-
public static final RegistryReference<WolfVariant> STRIPED = WolfVariants.key(ResourceKey.minecraft("striped"));
57+
public static final DefaultedRegistryReference<WolfVariant> STRIPED = WolfVariants.key(ResourceKey.minecraft("striped"));
5858

59-
public static final RegistryReference<WolfVariant> WOODS = WolfVariants.key(ResourceKey.minecraft("woods"));
59+
public static final DefaultedRegistryReference<WolfVariant> WOODS = WolfVariants.key(ResourceKey.minecraft("woods"));
6060

6161
private WolfVariants() {
6262
}
6363

64-
public static Registry<WolfVariant> registry(final ServerWorld world) {
65-
return world.registry(RegistryTypes.WOLF_VAIRANT);
64+
public static Registry<WolfVariant> registry() {
65+
return Sponge.server().registry(RegistryTypes.WOLF_VAIRANT);
6666
}
6767

68-
private static RegistryReference<WolfVariant> key(final ResourceKey location) {
69-
return RegistryKey.of(RegistryTypes.WOLF_VAIRANT, location).asReference();
68+
private static DefaultedRegistryReference<WolfVariant> key(final ResourceKey location) {
69+
return RegistryKey.of(RegistryTypes.WOLF_VAIRANT, location).asDefaultedReference(Sponge::server);
7070
}
7171
}

0 commit comments

Comments
 (0)