diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-11-19 19:31:16 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-11-19 19:31:16 +0800 |
| commit | d27702349f1ee0dd4222e08dbd133ad7a80589b5 (patch) | |
| tree | ffdeedef13867bd96e3bd78dffb26f7fd38ff250 | |
| parent | 2a4cb0445d3dca1ef67bb8875ac93c2b04fa9b48 (diff) | |
| download | RoughlyEnoughItems-d27702349f1ee0dd4222e08dbd133ad7a80589b5.tar.gz RoughlyEnoughItems-d27702349f1ee0dd4222e08dbd133ad7a80589b5.tar.bz2 RoughlyEnoughItems-d27702349f1ee0dd4222e08dbd133ad7a80589b5.zip | |
Fix opening the config menu before going into the world.
Signed-off-by: shedaniel <daniel@shedaniel.me>
| -rw-r--r-- | RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/TransformingScreen.java | 5 | ||||
| -rw-r--r-- | gradle.properties | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/TransformingScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/TransformingScreen.java index ec00862d8..e8c2e615c 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/TransformingScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/TransformingScreen.java @@ -29,7 +29,10 @@ import me.shedaniel.clothconfig2.api.ScissorsScreen; import me.shedaniel.math.Rectangle; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.DeathScreen; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import org.jetbrains.annotations.Nullable; import java.util.function.BooleanSupplier; @@ -45,7 +48,7 @@ public class TransformingScreen extends DelegateScreen implements ScissorsScreen private boolean translatingLast; public TransformingScreen(boolean translatingLast, Screen parent, Screen lastScreen, Runnable init, DoubleSupplier xTransformer, DoubleSupplier yTransformer, BooleanSupplier finished) { - super(parent); + super(Minecraft.getInstance().level == null && parent == null ? new TitleScreen() : parent); this.translatingLast = translatingLast; this.lastScreen = lastScreen; this.init = init; diff --git a/gradle.properties b/gradle.properties index bcbae891a..0da2c4e27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx3G -mod_version=5.8.6 +mod_version=5.8.7 supported_version=1.16.2/3/4 minecraft_version=1.16.4 fabricloader_version=0.10.6+build.214 |