diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-08-09 05:17:45 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-08-09 05:17:45 +0800 |
| commit | 978cdd8e9d8ab7d792fe8cadf356dc97394d174e (patch) | |
| tree | f2f4b0ab08ab64be00932ae1cd6ee498625b8b6b /runtime/src/main/java/me/shedaniel/rei/plugin | |
| parent | d5dc1d2c65d18b0a6d8ffedef350ff3434a0c7bf (diff) | |
| parent | 3dbafdf0250d4837f8028e6c636606d9fcb35836 (diff) | |
| download | RoughlyEnoughItems-978cdd8e9d8ab7d792fe8cadf356dc97394d174e.tar.gz RoughlyEnoughItems-978cdd8e9d8ab7d792fe8cadf356dc97394d174e.tar.bz2 RoughlyEnoughItems-978cdd8e9d8ab7d792fe8cadf356dc97394d174e.zip | |
Merge branch '11.x-1.19.4' into 12.x-1.20
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 62ed09b6c..8ffd782b1 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); } |