Skip to content

Fix client hang on shutdown from non-daemon thread pools #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deanxbox wants to merge 1 commit into
base: 26.2
Choose a base branch
from
Open

Fix client hang on shutdown from non-daemon thread pools #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/main/java/net/frozenblock/lib/cape/api/CapeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors;
import net.frozenblock.lib.FrozenLibConstants;
import net.frozenblock.lib.cape.client.api.ClientCapeUtil;
import net.frozenblock.lib.cape.impl.Cape;
Expand All @@ -46,6 +45,7 @@
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Util;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Unmodifiable;

Expand Down Expand Up @@ -125,7 +125,7 @@ public static void registerCapesFromURL(String urlString) {
} catch (IOException ignored) {}
return Optional.empty();
},
Executors.newCachedThreadPool()
Util.nonCriticalIoPool().forName("registerCapesFromURL")
).whenComplete((value, throwable) -> {
value.ifPresent(string -> CAPE_REPOS.add((String) string));
});
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/net/frozenblock/lib/platform/api/registry/DeferredActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import net.minecraft.core.Holder;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.entity.schedule.Activity;

public class DeferredActivity implements DeferredHolder<Activity, Activity> {
Expand Down
1 change: 0 additions & 1 deletion ...n/src/main/java/net/frozenblock/lib/platform/api/registry/DeferredSimpleParticleType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package net.frozenblock.lib.platform.api.registry;

import net.minecraft.core.Holder;
import net.minecraft.core.particles.ParticleOptions;
import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.particles.SimpleParticleType;
import net.minecraft.resources.Identifier;
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/net/frozenblock/lib/resource/client/api/pack/ModResourcePackApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.zip.ZipFile;
Expand All @@ -58,6 +57,7 @@
import net.minecraft.network.codec.ByteBufCodecs;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.util.StringRepresentable;
import net.minecraft.util.Util;
import org.apache.commons.io.FileUtils;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
Expand Down Expand Up @@ -230,7 +230,7 @@ public static void downloadResourcePack(PackDownloadInfo downloadInfo, boolean h
return failToast;
}
},
Executors.newCachedThreadPool()
Util.nonCriticalIoPool().forName("downloadModResourcePack")
).whenComplete((value, throwable) -> {
value.ifPresent(failToast -> ((ToastInfo)failToast).addToast());
});
Expand Down