imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-27 19:47:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

[ci skip] Fix #340 (#341)

Browse Source
This commit is contained in:
shedaniel
2022-10-23 01:02:39 +08:00
committed by GitHub
parent 0138323e7d
commit d26471de0e
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/dev/architectury/registry/ReloadListenerRegistry.java
View File

@@ -20,15 +20,28 @@
package dev.architectury.registry;
import dev.architectury.injectables.annotations.ExpectPlatform;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.resources.PreparableReloadListener;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;
public final class ReloadListenerRegistry {
private ReloadListenerRegistry() {
}
@ExpectPlatform
public static void register(PackType type, PreparableReloadListener listener) {
register(type, listener, null);
}
public static void register(PackType type, PreparableReloadListener listener, @Nullable ResourceLocation listenerId) {
register(type, listener, listenerId, List.of());
}
@ExpectPlatform
public static void register(PackType type, PreparableReloadListener listener, @Nullable ResourceLocation listenerId, Collection<ResourceLocation> dependencies) {
throw new AssertionError();
}
}

11
fabric/src/main/java/dev/architectury/registry/fabric/ReloadListenerRegistryImpl.java
View File

@@ -29,17 +29,19 @@ import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.profiling.ProfilerFiller;
import org.apache.commons.lang3.StringUtils;
import javax.annotation.Nullable;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
public class ReloadListenerRegistryImpl {
private static final SecureRandom RANDOM = new SecureRandom();
public static void register(PackType type, PreparableReloadListener listener) {
public static void register(PackType type, PreparableReloadListener listener, @Nullable ResourceLocation listenerId, Collection<ResourceLocation> dependencies) {
var bytes = new byte[8];
RANDOM.nextBytes(bytes);
var id = new ResourceLocation("architectury:reload_" + StringUtils.leftPad(Math.abs(Longs.fromByteArray(bytes)) + "", 19, '0'));
var id = listenerId != null ? listenerId : new ResourceLocation("architectury:reload_" + StringUtils.leftPad(Math.abs(Longs.fromByteArray(bytes)) + "", 19, '0'));
ResourceManagerHelper.get(type).registerReloadListener(new IdentifiableResourceReloadListener() {
@Override
public ResourceLocation getFabricId() {
@@ -51,6 +53,11 @@ public class ReloadListenerRegistryImpl {
return listener.getName();
}
@Override
public Collection<ResourceLocation> getFabricDependencies() {
return dependencies;
}
@Override
public CompletableFuture<Void> reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, ProfilerFiller profilerFiller, ProfilerFiller profilerFiller2, Executor executor, Executor executor2) {
return listener.reload(preparationBarrier, resourceManager, profilerFiller, profilerFiller2, executor, executor2);

5
forge/src/main/java/dev/architectury/registry/forge/ReloadListenerRegistryImpl.java
View File

@@ -22,6 +22,7 @@ package dev.architectury.registry.forge;
import com.google.common.collect.Lists;
import dev.architectury.forge.ArchitecturyForge;
import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.resources.PreparableReloadListener;
import net.minecraft.server.packs.resources.ReloadableResourceManager;
@@ -31,13 +32,15 @@ import net.minecraftforge.event.AddReloadListenerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.List;
@Mod.EventBusSubscriber(modid = ArchitecturyForge.MOD_ID)
public class ReloadListenerRegistryImpl {
private static List<PreparableReloadListener> serverDataReloadListeners = Lists.newArrayList();
public static void register(PackType type, PreparableReloadListener listener) {
public static void register(PackType type, PreparableReloadListener listener, @Nullable ResourceLocation listenerId, Collection<ResourceLocation> dependencies) {
if (type == PackType.SERVER_DATA) {
serverDataReloadListeners.add(listener);
} else if (type == PackType.CLIENT_RESOURCES) {