Skip to content

[resource loader] don't swallow errors thrown in resource reload event listeners #76

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
rhysdh540 wants to merge 1 commit into
base: gen2
Choose a base branch
from
Open

[resource loader] don't swallow errors thrown in resource reload event listeners #76

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
8 changes: 6 additions & 2 deletions ...r/src/main/java/net/ornithemc/osl/resource/loader/api/resource/reload/ResourceReload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@ public interface ResourceReload {
* @return a new resource reload.
*/
static ResourceReload start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, CompletableFuture<?> initialTask) {
return start(manager, reloaders, backgroundExecutor, mainThreadExecutor, initialTask, () -> {});
}

static ResourceReload start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, CompletableFuture<?> initialTask, Runnable finalTask) {
if (ResourceLoader.LOGGER.isDebugEnabled()) {
return ProfiledResourceReload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, initialTask);
return ProfiledResourceReload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, initialTask, finalTask);
} else {
return SimpleResourceReload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, initialTask);
return SimpleResourceReload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, initialTask, finalTask);
}
}

Expand Down
6 changes: 1 addition & 5 deletions .../ornithemc/osl/resource/loader/impl/resource/manager/SimpleReloadableResourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,12 @@ private ResourceReload startReload(Executor backgroundExecutor, Executor mainThr
}
});

ResourceReload reload = ResourceReload.start(this, reloaders, backgroundExecutor, mainThreadExecutor, initialTask);

reload.result().thenRun(() -> {
return ResourceReload.start(this, reloaders, backgroundExecutor, mainThreadExecutor, initialTask, () -> {
if (this.type == ResourceType.CLIENT_ASSETS) {
ClientResourceLoaderEvents.END_RESOURCE_RELOAD.invoker().accept(this, context);
} else if (this.type == ResourceType.SERVER_DATA) {
ServerResourceLoaderEvents.END_RESOURCE_RELOAD.invoker().accept(this, context);
}
});

return reload;
}
}
4 changes: 2 additions & 2 deletions ...n/java/net/ornithemc/osl/resource/loader/impl/resource/reload/ProfiledResourceReload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

public class ProfiledResourceReload extends SimpleResourceReload<ProfiledResourceReload.ProfileResult> {

public static ResourceReload start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, CompletableFuture<?> initialTask) {
public static ResourceReload start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, CompletableFuture<?> initialTask, Runnable finalTask) {
ProfiledResourceReload reload = new ProfiledResourceReload();
reload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, TASK_FACTORY, initialTask);
reload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, TASK_FACTORY, initialTask, finalTask);
return reload;
}

Expand Down
11 changes: 7 additions & 4 deletions ...ain/java/net/ornithemc/osl/resource/loader/impl/resource/reload/SimpleResourceReload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

public class SimpleResourceReload<R> implements ResourceReload {

public static ResourceReload start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, CompletableFuture<?> initialTask) {
public static ResourceReload start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, CompletableFuture<?> initialTask, Runnable finalTask) {
SimpleResourceReload<Void> reload = new SimpleResourceReload<>();
reload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, TaskFactory.SIMPLE, initialTask);
reload.start(manager, reloaders, backgroundExecutor, mainThreadExecutor, TaskFactory.SIMPLE, initialTask, finalTask);
return reload;
}

Expand All @@ -40,11 +40,14 @@ public static ResourceReload start(ResourceManager manager, List<ResourceReloade
private int reloaderCount;
private CompletableFuture<List<R>> result;

void start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, TaskFactory<R> taskFactory, CompletableFuture<?> initialTask) {
void start(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, TaskFactory<R> taskFactory, CompletableFuture<?> initialTask, Runnable finalTask) {
this.runningReloaders.addAll(reloaders);
this.reloaderCount = reloaders.size();

this.result = this.startTasks(manager, reloaders, backgroundExecutor, mainThreadExecutor, taskFactory, initialTask);
this.result = this.startTasks(manager, reloaders, backgroundExecutor, mainThreadExecutor, taskFactory, initialTask).thenApplyAsync(results -> {
finalTask.run();
return results;
}, mainThreadExecutor);
}

CompletableFuture<List<R>> startTasks(ResourceManager manager, List<ResourceReloader> reloaders, Executor backgroundExecutor, Executor mainThreadExecutor, TaskFactory<R> taskFactory, CompletableFuture<?> initialTask) {
Expand Down