TheCloud/joy
1
0
Fork 0
mirror of https://github.com/Pridecraft-Studios/joy.git synced 2025-08-02 22:15:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: SplashUtil now lists contributors again

Browse Source
This commit is contained in:
Ampflower 🌺 2025-03-12 06:32:33 -07:00
parent 9a5665cfed
commit bfe4e236e8
No known key found for this signature in database
GPG Key ID: FC0397C90D508D7F
5 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fabric/src/client/java/gay/pridecraft/joy/fabric/client/mixin/self/MixinSplashUtil.java
View File

@ -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<String> 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();
}
}

13
fabric/src/main/java/gay/pridecraft/joy/fabric/FabricPivot.java
View File

@ -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<String> authors() {
return FabricUtil.joyContainer.getMetadata().getAuthors().stream().map(Person::getName);
}
@Override
public Stream<String> contributors() {
return FabricUtil.joyContainer.getMetadata().getContributors().stream().map(Person::getName);
}
}

9
xplat/src/client/java/gay/pridecraft/joy/client/SplashUtil.java
View File

@ -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<String> 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<String> prepare(ResourceManager manager) {

12
xplat/src/datagen/java/gay/pridecraft/joy/data/VanillaPivot.java
View File

@ -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<String> authors() {
return Stream.empty();
}
@Override
public Stream<String> contributors() {
return Stream.empty();
}
}

5
xplat/src/main/java/gay/pridecraft/joy/Pivot.java
View File

@ -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<String> authors();
Stream<String> contributors();
@SuppressWarnings("unchecked")
static <V> Registry<V> getRegistry(RegistryKey<Registry<V>> key) {
return (Registry<V>) Registries.REGISTRIES.getOrEmpty(key.getValue()).orElseThrow();