diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-08-09 04:05:31 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-08-09 04:05:31 +0800 |
| commit | 3dbafdf0250d4837f8028e6c636606d9fcb35836 (patch) | |
| tree | 693f9699c9e433480d45c90ceab7b42f902f20cb /runtime/src/main/java/me/shedaniel/rei/plugin | |
| parent | 9462ba3450c2f897593c95b07da22ae2f0e19d0b (diff) | |
| parent | cacb4b646a0a96869cdb69dd08deb9d9900b35fa (diff) | |
| download | RoughlyEnoughItems-3dbafdf0250d4837f8028e6c636606d9fcb35836.tar.gz RoughlyEnoughItems-3dbafdf0250d4837f8028e6c636606d9fcb35836.tar.bz2 RoughlyEnoughItems-3dbafdf0250d4837f8028e6c636606d9fcb35836.zip | |
Merge remote-tracking branch 'shedaniel/9.x-1.19' into 11.x-1.19.4
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/plugin')
2 files changed, 3 insertions, 13 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java index 3d6348539..bb04d5f9e 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/FilteredStacksVisibilityHandler.java @@ -57,7 +57,7 @@ public class FilteredStacksVisibilityHandler implements DisplayVisibilityPredica @Override public EventResult handleDisplay(DisplayCategory<?> category, Display display) { if (checkHiddenStacks) { - return visible.computeBooleanIfAbsent(display, displayPredicate) ? EventResult.pass() : EventResult.interruptFalse(); + return visible.computeIfAbsent(display, displayPredicate) ? EventResult.pass() : EventResult.interruptFalse(); } return EventResult.pass(); diff --git a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/PluginStageExecutionWatcher.java b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/PluginStageExecutionWatcher.java index 539d7ab76..f579ebdad 100644 --- a/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/PluginStageExecutionWatcher.java +++ b/runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/PluginStageExecutionWatcher.java @@ -69,13 +69,10 @@ public class PluginStageExecutionWatcher implements HintProvider { @Override public void startReload() { - for (ReloadStage stage : ReloadStage.values()) { - startReload(stage); - } } @Override - public void startReload(ReloadStage stage) { + public void preStage(ReloadStage stage) { synchronized (allStages) { if (manager == PluginManager.getInstance() && stage.ordinal() == 0) { allStages.clear(); @@ -85,14 +82,7 @@ public class PluginStageExecutionWatcher implements HintProvider { } @Override - public void endReload() { - for (ReloadStage stage : ReloadStage.values()) { - endReload(stage); - } - } - - @Override - public void endReload(ReloadStage stage) { + public void postStage(ReloadStage stage) { synchronized (allStages) { data().finishedStages.add(stage); } |