fix #13

Author: brachy84

src/main/java/com/cleanroommc/neverenoughanimations/NEA.java

@@ -88,11 +88,6 @@ public void onGuiOpen(GuiOpenEvent event) {
         ItemHoverAnimation.onGuiOpen(event);
         ItemMoveAnimation.onGuiOpen(event);
         ItemPickupThrowAnimation.onGuiOpen(event);
-        if (event.getGui() != null) {
-            LOGGER.info("Opening screen {}", event.getGui().getClass());
-        } else {
-            LOGGER.info("Closing screen");
-        }
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST, receiveCanceled = true)
@@ -131,10 +126,17 @@ public void onGuiBackgroundDrawn(GuiScreenEvent.BackgroundDrawnEvent event) {
         }
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void mouseInput(GuiScreenEvent.MouseInputEvent.Pre event) {
-        if (Mouse.getEventButton() >= 0) {
-            LOGGER.info("Mouse Input: button {}, pressed {}, ", Mouse.getEventButton(), Mouse.getEventButtonState());
+        if (OpeningAnimation.isAnimatingClose(event.getGui())) {
+            event.setCanceled(true);
+        }
+    }
+
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    public void mouseInput(GuiScreenEvent.KeyboardInputEvent.Pre event) {
+        if (OpeningAnimation.isAnimatingClose(event.getGui())) {
+            event.setCanceled(true);
         }
     }
 
@@ -151,10 +153,12 @@ public static int getMouseY() {
     }
 
     public static float getCurrentOpenAnimationValue() {
+        // only works while rendering gui
         return openAnimationValue;
     }
 
     public static boolean isCurrentGuiAnimating() {
+        // only works while rendering gui
         return currentDrawnScreen != null && openAnimationValue < 1f;
     }
 

src/main/java/com/cleanroommc/neverenoughanimations/NEAConfig.java

@@ -1,9 +1,7 @@
 package com.cleanroommc.neverenoughanimations;
 
-import com.cleanroommc.neverenoughanimations.api.IAnimatedScreen;
 import com.cleanroommc.neverenoughanimations.util.Interpolation;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.common.config.Config;
 
 @Config(modid = Tags.MODID)
@@ -48,11 +46,17 @@ public class NEAConfig {
     @Config.Name("Opening/Closing animation time")
     @Config.SlidingOption
     @Config.RangeInt(min = 0, max = 1000)
-    @Config.Comment("How many millieseconds it takes until the gui is fully opened. 0 to disable.")
-    public static int openingAnimationTime = 60;
+    @Config.Comment("How many millieseconds it takes until the gui is fully opened. 0 to disable. 200 and lower is recommended.")
+    public static int openingAnimationTime = 90;
     @Config.Name("Opening/Closing animation easing curve")
     public static Interpolation openingAnimationCurve = Interpolation.SINE_OUT;
 
+    @Config.Name("Opening/Closing start/end scale")
+    @Config.SlidingOption
+    @Config.RangeDouble(min = 0.0, max = 1.0)
+    @Config.Comment("The scale at which the opening animation starts. What looks good depends on the animation time. Rule of thumb is the shorter the animation time, the larger the start scale.")
+    public static float openingStartScale = 0.9f;
+
     @Config.Name("Gui class animation blacklist")
     @Config.Comment({"Add class names (works with * at the end) which should be blacklisted from any animations.",
             "This is used to prevent visual issues with certain mods."})

src/main/java/com/cleanroommc/neverenoughanimations/animations/OpeningAnimation.java

@@ -6,7 +6,6 @@
 import com.cleanroommc.neverenoughanimations.util.Interpolations;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraftforge.client.event.GuiOpenEvent;
 
@@ -32,6 +31,7 @@ public static boolean onGuiOpen(GuiOpenEvent event) {
 
     private static IAnimatedScreen lastGui;
     private static IAnimatedScreen animatedGui;
+    //private static boolean oldAllowAllInteractions = false;
     private static long startTime = 0;
     private static boolean shouldCloseLast = false;
 
@@ -43,6 +43,8 @@ public static void animate(IAnimatedScreen container, boolean open) {
         if (!open) {
             startTime = -startTime;
             Minecraft.getMinecraft().setIngameFocus();
+            //oldAllowAllInteractions = ((GuiScreen) container).allowUserInput;
+            //((GuiScreen) container).allowUserInput = true;
         }
     }
 
@@ -51,7 +53,7 @@ public static float getScale(GuiScreen screen) {
     }
 
     public static float getScale(IAnimatedScreen container) {
-        float min = 0.75f, max = 1f;
+        float min = NEAConfig.openingStartScale, max = 1f;
         return Interpolations.lerp(min, max, getValue(container));
     }
 
@@ -82,20 +84,37 @@ public static boolean handleScale(GuiScreen screen, boolean translateToPanel) {
         return screen instanceof IAnimatedScreen animatedScreen && handleScale(animatedScreen, translateToPanel);
     }
 
-    public static boolean handleScale(IAnimatedScreen container, boolean translateToPanel) {
-        float scale = getScale(container);
+    public static boolean handleScale(IAnimatedScreen screen, boolean translateToPanel) {
+        float scale = getScale(screen);
         if (scale == 1 || NEAConfig.moveAnimationTime == 0) return false;
-        if (translateToPanel) GlStateManager.translate(container.nea$getX(), container.nea$getY(), 0);
-        GlStateManager.translate(container.nea$getWidth() / 2f, container.nea$getHeight() / 2f, 0);
+        if (translateToPanel) GlStateManager.translate(screen.nea$getX(), screen.nea$getY(), 0);
+        GlStateManager.translate(screen.nea$getWidth() / 2f, screen.nea$getHeight() / 2f, 0);
         GlStateManager.scale(scale, scale, 1f);
-        GlStateManager.translate(-container.nea$getWidth() / 2f, -container.nea$getHeight() / 2f, 0);
-        if (translateToPanel) GlStateManager.translate(-container.nea$getX(), -container.nea$getY(), 0);
-        // GlStateManager.color(1f, 1f, 1f, scale);
+        GlStateManager.translate(-screen.nea$getWidth() / 2f, -screen.nea$getHeight() / 2f, 0);
+        if (translateToPanel) GlStateManager.translate(-screen.nea$getX(), -screen.nea$getY(), 0);
         return true;
     }
 
+    public static boolean isAnimating(GuiScreen screen) {
+        return screen instanceof IAnimatedScreen animatedScreen && isAnimating(animatedScreen);
+    }
+
+    public static boolean isAnimating(IAnimatedScreen screen) {
+        return getValue(screen) < 1f;
+    }
+
+    public static boolean isAnimatingClose(GuiScreen screen) {
+        return screen instanceof IAnimatedScreen animatedScreen && isAnimatingClose(animatedScreen);
+    }
+
+    public static boolean isAnimatingClose(IAnimatedScreen screen) {
+        return isAnimating(screen) && startTime < 0;
+    }
+
     public static void checkGuiToClose() {
         if (shouldCloseLast && lastGui != null) {
+            //((GuiScreen) lastGui).allowUserInput = oldAllowAllInteractions;
+            //oldAllowAllInteractions = false;
             Minecraft.getMinecraft().displayGuiScreen(null);
             shouldCloseLast = false;
             lastGui = null;

src/main/java/com/cleanroommc/neverenoughanimations/core/mixin/MinecraftMixin.java

@@ -23,4 +23,12 @@ public void timer(CallbackInfo ci) {
             NEA.onFrameTick();
         }
     }
+
+    // TODO maybe allow opening other uis while the current one is closing
+    /*@WrapOperation(method = "runTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiScreen;handleInput()V"))
+    public void cancelInteraction(GuiScreen instance, Operation<Void> original) {
+        if (!OpeningAnimation.isAnimatingClose(instance)) {
+            original.call(instance);
+        }
+    }*/
 }