From bfe4e236e88a04549c960b1201285ab580109464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Wed, 12 Mar 2025 06:32:33 -0700 Subject: [PATCH] fix: SplashUtil now lists contributors again --- .../client/mixin/self/MixinSplashUtil.java | 35 ------------------- .../pridecraft/joy/fabric/FabricPivot.java | 13 +++++++ .../gay/pridecraft/joy/client/SplashUtil.java | 9 ++++- .../gay/pridecraft/joy/data/VanillaPivot.java | 12 +++++++ .../main/java/gay/pridecraft/joy/Pivot.java | 5 +++ 5 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 fabric/src/client/java/gay/pridecraft/joy/fabric/client/mixin/self/MixinSplashUtil.java diff --git a/fabric/src/client/java/gay/pridecraft/joy/fabric/client/mixin/self/MixinSplashUtil.java b/fabric/src/client/java/gay/pridecraft/joy/fabric/client/mixin/self/MixinSplashUtil.java deleted file mode 100644 index 1f277d0..0000000 --- a/fabric/src/client/java/gay/pridecraft/joy/fabric/client/mixin/self/MixinSplashUtil.java +++ /dev/null @@ -1,35 +0,0 @@ -package gay.pridecraft.joy.fabric.client.mixin.self; - -import gay.pridecraft.joy.client.SplashUtil; -import gay.pridecraft.joy.fabric.FabricUtil; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import java.util.List; -import java.util.stream.Stream; - -/** - * @author Ampflower - * @since 1.0.0 - **/ -@Mixin(SplashUtil.class) -public class MixinSplashUtil { - /** - * @author Ampflower - * @reason Quick & dirty hack. - */ - @Overwrite(remap = false) - private static List makeContributors() { - final var metadata = FabricUtil.joyContainer.getMetadata(); - - final var authors = metadata.getAuthors() - .stream() - .map(person -> "Joy, made by " + person.getName() + "!"); - - final var contributors = metadata.getContributors() - .stream() - .map(person -> "Joy, aided by " + person.getName() + "!"); - - return Stream.concat(authors, contributors).toList(); - } -} diff --git a/fabric/src/main/java/gay/pridecraft/joy/fabric/FabricPivot.java b/fabric/src/main/java/gay/pridecraft/joy/fabric/FabricPivot.java index 4f43162..7e99f20 100644 --- a/fabric/src/main/java/gay/pridecraft/joy/fabric/FabricPivot.java +++ b/fabric/src/main/java/gay/pridecraft/joy/fabric/FabricPivot.java @@ -5,6 +5,7 @@ import gay.pridecraft.joy.JoyUtil; import gay.pridecraft.joy.Pivot; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes; +import net.fabricmc.loader.api.metadata.Person; import net.minecraft.item.ItemGroup; import net.minecraft.particle.SimpleParticleType; import net.minecraft.registry.Registry; @@ -12,6 +13,8 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.registry.entry.RegistryEntry; import org.slf4j.Logger; +import java.util.stream.Stream; + /** * @author Ampflower * @since 1.0.0 @@ -38,4 +41,14 @@ public class FabricPivot implements Pivot { public SimpleParticleType createSimpleParticle() { return FabricParticleTypes.simple(); } + + @Override + public Stream authors() { + return FabricUtil.joyContainer.getMetadata().getAuthors().stream().map(Person::getName); + } + + @Override + public Stream contributors() { + return FabricUtil.joyContainer.getMetadata().getContributors().stream().map(Person::getName); + } } diff --git a/xplat/src/client/java/gay/pridecraft/joy/client/SplashUtil.java b/xplat/src/client/java/gay/pridecraft/joy/client/SplashUtil.java index 1f26d15..40e7202 100644 --- a/xplat/src/client/java/gay/pridecraft/joy/client/SplashUtil.java +++ b/xplat/src/client/java/gay/pridecraft/joy/client/SplashUtil.java @@ -2,6 +2,7 @@ package gay.pridecraft.joy.client; import com.mojang.logging.LogUtils; import gay.pridecraft.joy.JoyUtil; +import gay.pridecraft.joy.Pivot; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import org.slf4j.Logger; @@ -46,7 +47,13 @@ public final class SplashUtil { } private static List makeContributors() { - return List.of(); + final var authors = Pivot.INSTANCE.authors() + .map(person -> "Joy, made by " + person + "!"); + + final var contributors = Pivot.INSTANCE.contributors() + .map(person -> "Joy, aided by " + person + "!"); + + return Stream.concat(authors, contributors).toList(); } public static List prepare(ResourceManager manager) { diff --git a/xplat/src/datagen/java/gay/pridecraft/joy/data/VanillaPivot.java b/xplat/src/datagen/java/gay/pridecraft/joy/data/VanillaPivot.java index 9da37b2..dc8b6f8 100644 --- a/xplat/src/datagen/java/gay/pridecraft/joy/data/VanillaPivot.java +++ b/xplat/src/datagen/java/gay/pridecraft/joy/data/VanillaPivot.java @@ -11,6 +11,8 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.registry.entry.RegistryEntry; import org.slf4j.Logger; +import java.util.stream.Stream; + /** * @author Ampflower * @since 1.0.0 @@ -38,4 +40,14 @@ public class VanillaPivot implements Pivot { public SimpleParticleType createSimpleParticle() { return FabricParticleTypes.simple(); } + + @Override + public Stream authors() { + return Stream.empty(); + } + + @Override + public Stream contributors() { + return Stream.empty(); + } } diff --git a/xplat/src/main/java/gay/pridecraft/joy/Pivot.java b/xplat/src/main/java/gay/pridecraft/joy/Pivot.java index c90baa6..58a13f4 100644 --- a/xplat/src/main/java/gay/pridecraft/joy/Pivot.java +++ b/xplat/src/main/java/gay/pridecraft/joy/Pivot.java @@ -16,6 +16,7 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.registry.entry.RegistryEntry; import java.util.ServiceLoader; +import java.util.stream.Stream; /** @@ -41,6 +42,10 @@ public interface Pivot { return INSTANCE.createSimpleParticle(); } + Stream authors(); + + Stream contributors(); + @SuppressWarnings("unchecked") static Registry getRegistry(RegistryKey> key) { return (Registry) Registries.REGISTRIES.getOrEmpty(key.getValue()).orElseThrow();