Skip to content

Commit 6a848fd

Browse files
committed
Correct generic bounds for types
1 parent 5101979 commit 6a848fd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/main/java/org/spongepowered/api/registry/RegistryTypes.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
import org.spongepowered.api.effect.potion.PotionEffectType;
8888
import org.spongepowered.api.effect.sound.SoundType;
8989
import org.spongepowered.api.effect.sound.music.MusicDisc;
90+
import org.spongepowered.api.entity.Entity;
9091
import org.spongepowered.api.entity.EntityCategory;
9192
import org.spongepowered.api.entity.EntityType;
9293
import org.spongepowered.api.entity.ai.goal.GoalExecutorType;
@@ -112,6 +113,7 @@
112113
import org.spongepowered.api.item.inventory.menu.ClickType;
113114
import org.spongepowered.api.item.inventory.query.QueryType;
114115
import org.spongepowered.api.item.potion.PotionType;
116+
import org.spongepowered.api.item.recipe.Recipe;
115117
import org.spongepowered.api.item.recipe.RecipeType;
116118
import org.spongepowered.api.map.color.MapColorType;
117119
import org.spongepowered.api.map.color.MapShade;
@@ -184,7 +186,7 @@ public final class RegistryTypes {
184186

185187
public static final DefaultedRegistryType<EntityCategory> ENTITY_CATEGORY = RegistryTypes.spongeKeyInGame("mob_category");
186188

187-
public static final DefaultedRegistryType<EntityType<@NonNull ?>> ENTITY_TYPE = RegistryTypes.minecraftKeyInGame("entity_type");
189+
public static final DefaultedRegistryType<EntityType<@NonNull ? extends Entity>> ENTITY_TYPE = RegistryTypes.minecraftKeyInGame("entity_type");
188190

189191
public static final DefaultedRegistryType<FluidType> FLUID_TYPE = RegistryTypes.minecraftKeyInGame("fluid");
190192

@@ -196,7 +198,7 @@ public final class RegistryTypes {
196198

197199
public static final DefaultedRegistryType<PotionType> POTION_TYPE = RegistryTypes.minecraftKeyInGame("potion");
198200

199-
public static final DefaultedRegistryType<RecipeType<@NonNull ?>> RECIPE_TYPE = RegistryTypes.minecraftKeyInGame("recipe_type");
201+
public static final DefaultedRegistryType<RecipeType<@NonNull ? extends Recipe>> RECIPE_TYPE = RegistryTypes.minecraftKeyInGame("recipe_type");
200202

201203
public static final DefaultedRegistryType<SoundType> SOUND_TYPE = RegistryTypes.minecraftKeyInGame("sound_event");
202204

0 commit comments

Comments
 (0)