Merge branch 'Moulberry:master' into master

1 files changed, 22 insertions, 0 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinLoadingScreenRenderer.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinLoadingScreenRenderer.java
new file mode 100644
index 00000000..3366f569
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinLoadingScreenRenderer.java
@@ -0,0 +1,22 @@
+package io.github.moulberry.notenoughupdates.mixins;
+
+import io.github.moulberry.notenoughupdates.miscfeatures.FancyPortals;
+import net.minecraft.client.LoadingScreenRenderer;
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LoadingScreenRenderer.class)
+public class MixinLoadingScreenRenderer {
+
+    @Inject(method="setLoadingProgress", at=@At(value = "HEAD"), cancellable = true)
+    public void setLoadingProgress(int progress, CallbackInfo ci) {
+        if(progress < 0 && !FancyPortals.shouldRenderLoadingScreen()) {
+            ci.cancel();
+        }
+    }
+
+}