more generics fixes

Up-Mods · Feb 28, 2024 · ddbfa0e · ddbfa0e
1 parent 45af240
commit ddbfa0e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/.../main/java/dev/upcraft/sparkweave/api/client/event/RegisterBlockEntityRenderersEvent.java b/.../main/java/dev/upcraft/sparkweave/api/client/event/RegisterBlockEntityRenderersEvent.java
@@ -9,7 +9,7 @@
 
 public interface RegisterBlockEntityRenderersEvent {
 
-	<T extends BlockEntity> void registerRenderer(Supplier<BlockEntityType<? extends T>> blockEntityType, BlockEntityRendererProvider<T> blockEntityRendererProvider);
+	<T extends BlockEntity> void registerRenderer(Supplier<BlockEntityType<T>> blockEntityType, BlockEntityRendererProvider<T> blockEntityRendererProvider);
 
 	Event<Callback> EVENT = Event.create(Callback.class, callbacks -> event -> {
 		for (Callback callback : callbacks) {

diff --git a/...n/src/main/java/dev/upcraft/sparkweave/api/client/event/RegisterEntityRenderersEvent.java b/...n/src/main/java/dev/upcraft/sparkweave/api/client/event/RegisterEntityRenderersEvent.java
@@ -9,7 +9,7 @@
 
 public interface RegisterEntityRenderersEvent {
 
-	<T extends Entity> void registerRenderer(Supplier<EntityType<? extends T>> entityType, EntityRendererProvider<T> entityRendererProvider);
+	<T extends Entity> void registerRenderer(Supplier<EntityType<T>> entityType, EntityRendererProvider<T> entityRendererProvider);
 
 	Event<Callback> EVENT = Event.create(Callback.class, callbacks -> event -> {
 		for (Callback callback : callbacks) {

diff --git a/...src/main/java/dev/upcraft/sparkweave/api/client/event/RegisterParticleFactoriesEvent.java b/...src/main/java/dev/upcraft/sparkweave/api/client/event/RegisterParticleFactoriesEvent.java
@@ -16,10 +16,10 @@ public interface RegisterParticleFactoriesEvent {
 		}
 	});
 
-	<T extends ParticleOptions> void registerSpecial(Supplier<ParticleType<T>> type, ParticleProvider<T> provider);
+	<OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSpecial(Supplier<TYPE> type, ParticleProvider<OPT> provider);
 
 	// copying from ParticleEngine because fabric does not expose this method
-	default <T extends ParticleOptions> void registerSprite(Supplier<ParticleType<T>> type, ParticleProvider.Sprite<T> sprite) {
+	default <OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSprite(Supplier<TYPE> type, ParticleProvider.Sprite<OPT> sprite) {
 		registerSpriteSet(type, spriteSet -> (t, level, x, y, z, velocityX, velocityY, velocityZ) -> {
 			var particle = sprite.createParticle(t, level, x, y, z, velocityX, velocityY, velocityZ);
 			if (particle != null) {
@@ -30,7 +30,7 @@ default <T extends ParticleOptions> void registerSprite(Supplier<ParticleType<T>
 		});
 	}
 
-	<T extends ParticleOptions> void registerSpriteSet(Supplier<ParticleType<T>> type, SpriteParticleRegistration<T> registration);
+	<OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSpriteSet(Supplier<TYPE> type, SpriteParticleRegistration<OPT> registration);
 
 	@FunctionalInterface
 	interface Callback {

diff --git a/...ava/dev/upcraft/sparkweave/neoforge/impl/registry/RegisterParticleFactoriesEventImpl.java b/...ava/dev/upcraft/sparkweave/neoforge/impl/registry/RegisterParticleFactoriesEventImpl.java
@@ -12,17 +12,17 @@ public record RegisterParticleFactoriesEventImpl(
 	RegisterParticleProvidersEvent event) implements RegisterParticleFactoriesEvent {
 
 	@Override
-	public <T extends ParticleOptions> void registerSpecial(Supplier<ParticleType<T>> type, ParticleProvider<T> provider) {
+	public <OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSpecial(Supplier<TYPE> type, ParticleProvider<OPT> provider) {
 		event.registerSpecial(type.get(), provider);
 	}
 
 	@Override
-	public <T extends ParticleOptions> void registerSpriteSet(Supplier<ParticleType<T>> type, SpriteParticleRegistration<T> registration) {
+	public <OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSpriteSet(Supplier<TYPE> type, SpriteParticleRegistration<OPT> registration) {
 		event.registerSpriteSet(type.get(), registration);
 	}
 
 	@Override
-	public <T extends ParticleOptions> void registerSprite(Supplier<ParticleType<T>> type, ParticleProvider.Sprite<T> sprite) {
+	public <OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSprite(Supplier<TYPE> type, ParticleProvider.Sprite<OPT> sprite) {
 		event.registerSprite(type.get(), sprite);
 	}
 }
diff --git a/...main/java/dev/upcraft/sparkweave/neoforge/mixin/internal/RegisterRenderersEventMixin.java b/...main/java/dev/upcraft/sparkweave/neoforge/mixin/internal/RegisterRenderersEventMixin.java
@@ -29,11 +29,11 @@ public abstract class RegisterRenderersEventMixin implements RegisterEntityRende
 	@Shadow
 	public abstract <T extends Entity> void registerEntityRenderer(EntityType<? extends T> entityType, EntityRendererProvider<T> entityRendererProvider);
 
-	public <T extends BlockEntity> void registerBlockEntityRenderer$registerRenderer(Supplier<BlockEntityType<? extends T>> blockEntityType, BlockEntityRendererProvider<T> blockEntityRendererProvider) {
+	public <T extends BlockEntity> void registerBlockEntityRenderer$registerRenderer(Supplier<BlockEntityType<T>> blockEntityType, BlockEntityRendererProvider<T> blockEntityRendererProvider) {
 		this.registerBlockEntityRenderer(blockEntityType.get(), blockEntityRendererProvider);
 	}
 
-	public <T extends Entity> void registerEntityRenderers$registerRenderer(Supplier<EntityType<? extends T>> entityType, EntityRendererProvider<T> entityRendererProvider) {
+	public <T extends Entity> void registerEntityRenderers$registerRenderer(Supplier<EntityType<T>> entityType, EntityRendererProvider<T> entityRendererProvider) {
 		this.registerEntityRenderer(entityType.get(), entityRendererProvider);
 	}
 }
diff --git a/...ava/dev/upcraft/sparkweave/quilt/impl/registry/RegisterBlockEntityRenderersEventImpl.java b/...ava/dev/upcraft/sparkweave/quilt/impl/registry/RegisterBlockEntityRenderersEventImpl.java
@@ -11,7 +11,7 @@
 public class RegisterBlockEntityRenderersEventImpl implements RegisterBlockEntityRenderersEvent {
 
 	@Override
-	public <T extends BlockEntity> void registerRenderer(Supplier<BlockEntityType<? extends T>> blockEntityType, BlockEntityRendererProvider<T> blockEntityRendererProvider) {
+	public <T extends BlockEntity> void registerRenderer(Supplier<BlockEntityType<T>> blockEntityType, BlockEntityRendererProvider<T> blockEntityRendererProvider) {
 		BlockEntityRenderers.register(blockEntityType.get(), blockEntityRendererProvider);
 	}
 }
diff --git a/...ain/java/dev/upcraft/sparkweave/quilt/impl/registry/RegisterEntityRenderersEventImpl.java b/...ain/java/dev/upcraft/sparkweave/quilt/impl/registry/RegisterEntityRenderersEventImpl.java
@@ -11,7 +11,7 @@
 public class RegisterEntityRenderersEventImpl implements RegisterEntityRenderersEvent {
 
 	@Override
-	public <T extends Entity> void registerRenderer(Supplier<EntityType<? extends T>> entityType, EntityRendererProvider<T> entityRendererProvider) {
+	public <T extends Entity> void registerRenderer(Supplier<EntityType<T>> entityType, EntityRendererProvider<T> entityRendererProvider) {
 		EntityRendererRegistry.register(entityType.get(), entityRendererProvider);
 	}
 }
diff --git a/...n/java/dev/upcraft/sparkweave/quilt/impl/registry/RegisterParticleFactoriesEventImpl.java b/...n/java/dev/upcraft/sparkweave/quilt/impl/registry/RegisterParticleFactoriesEventImpl.java
@@ -11,12 +11,12 @@
 public class RegisterParticleFactoriesEventImpl implements RegisterParticleFactoriesEvent {
 
 	@Override
-	public <T extends ParticleOptions> void registerSpecial(Supplier<ParticleType<T>> type, ParticleProvider<T> provider) {
+	public <OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSpecial(Supplier<TYPE> type, ParticleProvider<OPT> provider) {
 		ParticleFactoryRegistry.getInstance().register(type.get(), provider);
 	}
 
 	@Override
-	public <T extends ParticleOptions> void registerSpriteSet(Supplier<ParticleType<T>> type, SpriteParticleRegistration<T> registration) {
+	public <OPT extends ParticleOptions, TYPE extends ParticleType<OPT>> void registerSpriteSet(Supplier<TYPE> type, SpriteParticleRegistration<OPT> registration) {
 		ParticleFactoryRegistry.getInstance().register(type.get(), registration::create);
 	}
 }