From 85a5be84ec370245ca9780c149102c3e155bc60e Mon Sep 17 00:00:00 2001 From: UnlikePaladin <36827970+UnlikePaladin@users.noreply.github.com> Date: Sat, 4 Nov 2023 19:41:10 -0600 Subject: [PATCH] Fixed error in data gen on forge servers --- .../pfm/mixin/forge/PFMMinecraftServerMixin.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java index cfa665508..5b41dfccd 100644 --- a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java +++ b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java @@ -21,13 +21,10 @@ @Mixin(MinecraftServer.class) public class PFMMinecraftServerMixin { - @Inject(method = "lambda$reloadResources$15", at = @At(value = "RETURN"), cancellable = true, remap = false) + @Inject(method = "lambda$reloadResources$15", at = @At(value = "RETURN"), remap = false) private void createReload(CallbackInfoReturnable> cir) { - PFMRuntimeResources.RESOURCE_PACK_LIST = new ArrayList<>(cir.getReturnValue()); List resourcePacks = new ArrayList<>(cir.getReturnValue()); - PackResourceMetadata packResourceMetadata = new PackResourceMetadata(new LiteralText("pfm-runtime-resources"), SharedConstants.getGameVersion().getPackVersion(PackType.RESOURCE)); - resourcePacks.add(new PathPackRPWrapper(Suppliers.memoize(() -> { - PFMRuntimeResources.prepareAndRunResourceGen(false); return PFMRuntimeResources.ASSETS_PACK;}), packResourceMetadata)); - cir.setReturnValue(ImmutableList.copyOf(resourcePacks)); + resourcePacks.removeIf(pack -> pack instanceof PathPackRPWrapper); + PFMRuntimeResources.RESOURCE_PACK_LIST = resourcePacks; } }