diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-05-16 16:21:55 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-05-16 16:21:55 +0800 |
| commit | 189f02afbe5d49a093bf31bee5c42433dc547c55 (patch) | |
| tree | 78f9bbb4689d6a1fa5525919ac86a96a66c52659 /runtime/src/main/java/me/shedaniel/rei/impl/client | |
| parent | c4cbda6b11f6dbb1148f729dfaf5577e2f639b4f (diff) | |
| parent | 4e24411029bb5e21cbc91696503bab600cc7cd51 (diff) | |
| download | RoughlyEnoughItems-189f02afbe5d49a093bf31bee5c42433dc547c55.tar.gz RoughlyEnoughItems-189f02afbe5d49a093bf31bee5c42433dc547c55.tar.bz2 RoughlyEnoughItems-189f02afbe5d49a093bf31bee5c42433dc547c55.zip | |
Merge remote-tracking branch 'origin/6.x' into 6.x-1.17
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/impl/client')
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java index 94196c19e..cadbe569c 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java @@ -49,7 +49,7 @@ public class ReloadPluginsEntry extends AbstractConfigListEntry<Unit> { private AbstractWidget buttonWidget = new Button(0, 0, 0, 20, NarratorChatListener.NO_TITLE, button -> RoughlyEnoughItemsCore.reloadPlugins(null)) { @Override public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { - if (PluginManager.areAnyPluginsReloading()) { + if (PluginManager.areAnyReloading()) { Screen screen = Minecraft.getInstance().screen; Minecraft.getInstance().setScreen(new ConfigReloadingScreen(() -> Minecraft.getInstance().setScreen(screen))); } else { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java index 17fede258..52a531acf 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/ConfigReloadingScreen.java @@ -48,7 +48,7 @@ public class ConfigReloadingScreen extends Screen { @Override public void render(PoseStack matrices, int int_1, int int_2, float float_1) { this.renderDirtBackground(0); - if (!PluginManager.areAnyPluginsReloading()) { + if (!PluginManager.areAnyReloading()) { parent.run(); } drawCenteredString(matrices, this.font, I18n.get("text.rei.config.is.reloading"), this.width / 2, this.height / 2 - 50, 16777215); |