Skip to content

Commit b2e2eb4

Browse files
committed
Rerun generators
1 parent 7abe65b commit b2e2eb4

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
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/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_VARIANT);
64+
public static Registry<WolfVariant> registry() {
65+
return Sponge.server().registry(RegistryTypes.WOLF_VARIANT);
6666
}
6767

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

src/main/java/org/spongepowered/api/entity/EntityTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ public final class EntityTypes {
469469
private EntityTypes() {
470470
}
471471

472-
public static Registry<EntityType<? extends Entity>> registry() {
472+
public static Registry<EntityType<?>> registry() {
473473
return Sponge.game().registry(RegistryTypes.ENTITY_TYPE);
474474
}
475475

src/main/java/org/spongepowered/api/item/recipe/RecipeTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public final class RecipeTypes {
6161
private RecipeTypes() {
6262
}
6363

64-
public static Registry<RecipeType<? extends Recipe<?>>> registry() {
64+
public static Registry<RecipeType<?>> registry() {
6565
return Sponge.game().registry(RegistryTypes.RECIPE_TYPE);
6666
}
6767

src/main/java/org/spongepowered/api/item/recipe/smithing/TrimMaterials.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
import org.spongepowered.api.registry.RegistryScopes;
3434
import org.spongepowered.api.registry.RegistryTypes;
3535

36+
/**
37+
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
38+
*/
3639
@SuppressWarnings("unused")
3740
@RegistryScopes(scopes = RegistryScope.ENGINE)
3841
public final class TrimMaterials {

src/main/java/org/spongepowered/api/item/recipe/smithing/TrimPatterns.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
import org.spongepowered.api.registry.RegistryScopes;
3434
import org.spongepowered.api.registry.RegistryTypes;
3535

36+
/**
37+
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
38+
*/
3639
@SuppressWarnings("unused")
3740
@RegistryScopes(scopes = RegistryScope.ENGINE)
3841
public final class TrimPatterns {

0 commit comments

Comments
 (0)