Explorar el Código

Requested changes

PendingParticleProvider -> DeferredParticleProvider
parameter constructor -> provider
Leo40Git hace 4 años
padre
commit
2c16f7ac09

+ 2 - 2
common/src/main/java/me/shedaniel/architectury/registry/ParticleFactories.java

@@ -44,12 +44,12 @@ public final class ParticleFactories {
     }
 
     @ExpectPlatform
-    public static <T extends ParticleOptions> void register(ParticleType<T> type, PendingParticleProvider<T> constructor) {
+    public static <T extends ParticleOptions> void register(ParticleType<T> type, DeferredParticleProvider<T> provider) {
         throw new AssertionError();
     }
 
     @FunctionalInterface
-    public interface PendingParticleProvider<T extends ParticleOptions> {
+    public interface DeferredParticleProvider<T extends ParticleOptions> {
         ParticleProvider<T> create(ExtendedSpriteSet spriteSet);
     }
 }

+ 3 - 2
fabric/src/main/java/me/shedaniel/architectury/registry/fabric/ParticleFactoriesImpl.java

@@ -64,7 +64,8 @@ public class ParticleFactoriesImpl {
         ParticleFactoryRegistry.getInstance().register(type, provider);
     }
 
-    public static <T extends ParticleOptions> void register(ParticleType<T> type, ParticleFactories.PendingParticleProvider<T> constructor) {
-        ParticleFactoryRegistry.getInstance().register(type, provider -> constructor.create(new ExtendedSpriteSetImpl(provider)));
+    public static <T extends ParticleOptions> void register(ParticleType<T> type, ParticleFactories.DeferredParticleProvider<T> provider) {
+        ParticleFactoryRegistry.getInstance().register(type, spriteProvider ->
+                provider.create(new ExtendedSpriteSetImpl(spriteProvider)));
     }
 }

+ 6 - 6
forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleFactoriesImpl.java

@@ -76,9 +76,9 @@ public class ParticleFactoriesImpl {
         Minecraft.getInstance().particleEngine.register(type, provider);
     }
 
-    private static <T extends ParticleOptions> void _register(ParticleType<T> type, ParticleFactories.PendingParticleProvider<T> constructor) {
-        Minecraft.getInstance().particleEngine.register(type, arg ->
-                constructor.create(new ExtendedSpriteSetImpl(Minecraft.getInstance().particleEngine, arg)));
+    private static <T extends ParticleOptions> void _register(ParticleType<T> type, ParticleFactories.DeferredParticleProvider<T> provider) {
+        Minecraft.getInstance().particleEngine.register(type, spriteSet ->
+                provider.create(new ExtendedSpriteSetImpl(Minecraft.getInstance().particleEngine, spriteSet)));
     }
 
     public static <T extends ParticleOptions> void register(ParticleType<T> type, ParticleProvider<T> provider) {
@@ -88,11 +88,11 @@ public class ParticleFactoriesImpl {
             deferred.add(() -> _register(type, provider));
     }
 
-    public static <T extends ParticleOptions> void register(ParticleType<T> type, ParticleFactories.PendingParticleProvider<T> constructor) {
+    public static <T extends ParticleOptions> void register(ParticleType<T> type, ParticleFactories.DeferredParticleProvider<T> provider) {
         if (deferred == null)
-            _register(type, constructor);
+            _register(type, provider);
         else
-            deferred.add(() -> _register(type, constructor));
+            deferred.add(() -> _register(type, provider));
     }
 
     @SubscribeEvent