Skip to content

Commit 3111cd4

Browse files
ZidaneDaniel Naylor
authored andcommitted
Toss field usage, due to server lifecycle.
We could keep it for GAME scope but then it is so inconsistent... Signed-off-by: Chris Sanders <[email protected]>
1 parent 6f72877 commit 3111cd4

File tree

15 files changed

+15
-45
lines changed

15 files changed

+15
-45
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class BlockTypes {
4242

4343
// @formatter:off
44-
public static final Registry<BlockType> REGISTRY = BlockTypes.registry();
45-
4644
public static final DefaultedRegistryReference<BlockType> ACACIA_BUTTON = BlockTypes.key(ResourceKey.minecraft("acacia_button"));
4745

4846
public static final DefaultedRegistryReference<BlockType> ACACIA_DOOR = BlockTypes.key(ResourceKey.minecraft("acacia_door"));
@@ -1573,7 +1571,7 @@ public final class BlockTypes {
15731571
private BlockTypes() {
15741572
}
15751573

1576-
private static Registry<BlockType> registry() {
1574+
public static Registry<BlockType> registry() {
15771575
return Sponge.game().registries().registry(RegistryTypes.BLOCK_TYPE);
15781576
}
15791577

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class BlockEntityTypes {
4242

4343
// @formatter:off
44-
public static final Registry<BlockEntityType> REGISTRY = BlockEntityTypes.registry();
45-
4644
public static final DefaultedRegistryReference<BlockEntityType> BANNER = BlockEntityTypes.key(ResourceKey.minecraft("banner"));
4745

4846
public static final DefaultedRegistryReference<BlockEntityType> BARREL = BlockEntityTypes.key(ResourceKey.minecraft("barrel"));
@@ -113,7 +111,7 @@ public final class BlockEntityTypes {
113111
private BlockEntityTypes() {
114112
}
115113

116-
private static Registry<BlockEntityType> registry() {
114+
public static Registry<BlockEntityType> registry() {
117115
return Sponge.game().registries().registry(RegistryTypes.BLOCK_ENTITY_TYPE);
118116
}
119117

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class ArtTypes {
4242

4343
// @formatter:off
44-
public static final Registry<ArtType> REGISTRY = ArtTypes.registry();
45-
4644
public static final DefaultedRegistryReference<ArtType> ALBAN = ArtTypes.key(ResourceKey.minecraft("alban"));
4745

4846
public static final DefaultedRegistryReference<ArtType> AZTEC = ArtTypes.key(ResourceKey.minecraft("aztec"));
@@ -99,7 +97,7 @@ public final class ArtTypes {
9997
private ArtTypes() {
10098
}
10199

102-
private static Registry<ArtType> registry() {
100+
public static Registry<ArtType> registry() {
103101
return Sponge.game().registries().registry(RegistryTypes.ART_TYPE);
104102
}
105103

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class ProfessionTypes {
4242

4343
// @formatter:off
44-
public static final Registry<ProfessionType> REGISTRY = ProfessionTypes.registry();
45-
4644
public static final DefaultedRegistryReference<ProfessionType> ARMORER = ProfessionTypes.key(ResourceKey.minecraft("armorer"));
4745

4846
public static final DefaultedRegistryReference<ProfessionType> BUTCHER = ProfessionTypes.key(ResourceKey.minecraft("butcher"));
@@ -77,7 +75,7 @@ public final class ProfessionTypes {
7775
private ProfessionTypes() {
7876
}
7977

80-
private static Registry<ProfessionType> registry() {
78+
public static Registry<ProfessionType> registry() {
8179
return Sponge.game().registries().registry(RegistryTypes.PROFESSION_TYPE);
8280
}
8381

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class VillagerTypes {
4242

4343
// @formatter:off
44-
public static final Registry<VillagerType> REGISTRY = VillagerTypes.registry();
45-
4644
public static final DefaultedRegistryReference<VillagerType> DESERT = VillagerTypes.key(ResourceKey.minecraft("desert"));
4745

4846
public static final DefaultedRegistryReference<VillagerType> JUNGLE = VillagerTypes.key(ResourceKey.minecraft("jungle"));
@@ -61,7 +59,7 @@ public final class VillagerTypes {
6159
private VillagerTypes() {
6260
}
6361

64-
private static Registry<VillagerType> registry() {
62+
public static Registry<VillagerType> registry() {
6563
return Sponge.game().registries().registry(RegistryTypes.VILLAGER_TYPE);
6664
}
6765

src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class ParticleTypes {
4242

4343
// @formatter:off
44-
public static final Registry<ParticleType> REGISTRY = ParticleTypes.registry();
45-
4644
public static final DefaultedRegistryReference<ParticleType> AMBIENT_ENTITY_EFFECT = ParticleTypes.key(ResourceKey.minecraft("ambient_entity_effect"));
4745

4846
public static final DefaultedRegistryReference<ParticleType> ANGRY_VILLAGER = ParticleTypes.key(ResourceKey.minecraft("angry_villager"));
@@ -191,7 +189,7 @@ public final class ParticleTypes {
191189
private ParticleTypes() {
192190
}
193191

194-
private static Registry<ParticleType> registry() {
192+
public static Registry<ParticleType> registry() {
195193
return Sponge.game().registries().registry(RegistryTypes.PARTICLE_TYPE);
196194
}
197195

src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class PotionEffectTypes {
4242

4343
// @formatter:off
44-
public static final Registry<PotionEffectType> REGISTRY = PotionEffectTypes.registry();
45-
4644
public static final DefaultedRegistryReference<PotionEffectType> ABSORPTION = PotionEffectTypes.key(ResourceKey.minecraft("absorption"));
4745

4846
public static final DefaultedRegistryReference<PotionEffectType> BAD_OMEN = PotionEffectTypes.key(ResourceKey.minecraft("bad_omen"));
@@ -111,7 +109,7 @@ public final class PotionEffectTypes {
111109
private PotionEffectTypes() {
112110
}
113111

114-
private static Registry<PotionEffectType> registry() {
112+
public static Registry<PotionEffectType> registry() {
115113
return Sponge.game().registries().registry(RegistryTypes.POTION_EFFECT_TYPE);
116114
}
117115

src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class SoundTypes {
4242

4343
// @formatter:off
44-
public static final Registry<SoundType> REGISTRY = SoundTypes.registry();
45-
4644
public static final DefaultedRegistryReference<SoundType> AMBIENT_BASALT_DELTAS_ADDITIONS = SoundTypes.key(ResourceKey.minecraft("ambient.basalt_deltas.additions"));
4745

4846
public static final DefaultedRegistryReference<SoundType> AMBIENT_BASALT_DELTAS_LOOP = SoundTypes.key(ResourceKey.minecraft("ambient.basalt_deltas.loop"));
@@ -2031,7 +2029,7 @@ public final class SoundTypes {
20312029
private SoundTypes() {
20322030
}
20332031

2034-
private static Registry<SoundType> registry() {
2032+
public static Registry<SoundType> registry() {
20352033
return Sponge.game().registries().registry(RegistryTypes.SOUND_TYPE);
20362034
}
20372035

src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class AttributeTypes {
4242

4343
// @formatter:off
44-
public static final Registry<RangedAttributeType> REGISTRY = AttributeTypes.registry();
45-
4644
public static final DefaultedRegistryReference<RangedAttributeType> GENERIC_ARMOR = AttributeTypes.key(ResourceKey.minecraft("generic.armor"));
4745

4846
public static final DefaultedRegistryReference<RangedAttributeType> GENERIC_ARMOR_TOUGHNESS = AttributeTypes.key(ResourceKey.minecraft("generic.armor_toughness"));
@@ -73,7 +71,7 @@ public final class AttributeTypes {
7371
private AttributeTypes() {
7472
}
7573

76-
private static Registry<RangedAttributeType> registry() {
74+
public static Registry<RangedAttributeType> registry() {
7775
return Sponge.game().registries().registry(RegistryTypes.ATTRIBUTE_TYPE);
7876
}
7977

src/main/java/org/spongepowered/api/fluid/FluidTypes.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
public final class FluidTypes {
4242

4343
// @formatter:off
44-
public static final Registry<FluidType> REGISTRY = FluidTypes.registry();
45-
4644
public static final DefaultedRegistryReference<FluidType> EMPTY = FluidTypes.key(ResourceKey.minecraft("empty"));
4745

4846
public static final DefaultedRegistryReference<FluidType> FLOWING_LAVA = FluidTypes.key(ResourceKey.minecraft("flowing_lava"));
@@ -57,7 +55,7 @@ public final class FluidTypes {
5755
private FluidTypes() {
5856
}
5957

60-
private static Registry<FluidType> registry() {
58+
public static Registry<FluidType> registry() {
6159
return Sponge.game().registries().registry(RegistryTypes.FLUID_TYPE);
6260
}
6361

0 commit comments

Comments
 (0)