From 2c16f7ac096f1c4fe3f2a7df561fec0277d26a54 Mon Sep 17 00:00:00 2001 From: Leo40Git <7997354+Leo40Git@users.noreply.github.com> Date: Fri, 25 Jun 2021 15:06:26 +0300 Subject: [PATCH] Requested changes PendingParticleProvider -> DeferredParticleProvider parameter constructor -> provider --- .../architectury/registry/ParticleFactories.java | 4 ++-- .../registry/fabric/ParticleFactoriesImpl.java | 5 +++-- .../registry/forge/ParticleFactoriesImpl.java | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/me/shedaniel/architectury/registry/ParticleFactories.java b/common/src/main/java/me/shedaniel/architectury/registry/ParticleFactories.java index 724174bd..73352c53 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/ParticleFactories.java +++ b/common/src/main/java/me/shedaniel/architectury/registry/ParticleFactories.java @@ -44,12 +44,12 @@ public final class ParticleFactories { } @ExpectPlatform - public static void register(ParticleType type, PendingParticleProvider constructor) { + public static void register(ParticleType type, DeferredParticleProvider provider) { throw new AssertionError(); } @FunctionalInterface - public interface PendingParticleProvider { + public interface DeferredParticleProvider { ParticleProvider create(ExtendedSpriteSet spriteSet); } } diff --git a/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/ParticleFactoriesImpl.java b/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/ParticleFactoriesImpl.java index b261c426..66b25230 100644 --- a/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/ParticleFactoriesImpl.java +++ b/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 void register(ParticleType type, ParticleFactories.PendingParticleProvider constructor) { - ParticleFactoryRegistry.getInstance().register(type, provider -> constructor.create(new ExtendedSpriteSetImpl(provider))); + public static void register(ParticleType type, ParticleFactories.DeferredParticleProvider provider) { + ParticleFactoryRegistry.getInstance().register(type, spriteProvider -> + provider.create(new ExtendedSpriteSetImpl(spriteProvider))); } } diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleFactoriesImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleFactoriesImpl.java index 58f21f5b..7de4bbe6 100644 --- a/forge/src/main/java/me/shedaniel/architectury/registry/forge/ParticleFactoriesImpl.java +++ b/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 void _register(ParticleType type, ParticleFactories.PendingParticleProvider constructor) { - Minecraft.getInstance().particleEngine.register(type, arg -> - constructor.create(new ExtendedSpriteSetImpl(Minecraft.getInstance().particleEngine, arg))); + private static void _register(ParticleType type, ParticleFactories.DeferredParticleProvider provider) { + Minecraft.getInstance().particleEngine.register(type, spriteSet -> + provider.create(new ExtendedSpriteSetImpl(Minecraft.getInstance().particleEngine, spriteSet))); } public static void register(ParticleType type, ParticleProvider provider) { @@ -88,11 +88,11 @@ public class ParticleFactoriesImpl { deferred.add(() -> _register(type, provider)); } - public static void register(ParticleType type, ParticleFactories.PendingParticleProvider constructor) { + public static void register(ParticleType type, ParticleFactories.DeferredParticleProvider provider) { if (deferred == null) - _register(type, constructor); + _register(type, provider); else - deferred.add(() -> _register(type, constructor)); + deferred.add(() -> _register(type, provider)); } @SubscribeEvent