diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index 67a2af65..a55efb6d 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -371,13 +371,13 @@ public class Slider extends GameObject { float followCircleScale = 1f + (tickExpandTime / (float) TICK_EXPAND_TIME) * 0.1f; float followAlpha = 1f; if (followCircleActive && followExpandTime < FOLLOW_EXPAND_TIME) { - followExpandTime += DisplayContainer.instance.renderDelta; + followExpandTime += displayContainer.renderDelta; followCircleScale *= 0.5f; float progress = AnimationEquation.OUT_QUAD.calc((float) followExpandTime / FOLLOW_EXPAND_TIME); followCircleScale = followCircleScale + followCircleScale * progress; followAlpha = progress; } else if (!followCircleActive) { - followExpandTime -= DisplayContainer.instance.renderDelta; + followExpandTime -= displayContainer.renderDelta; if (followExpandTime > FOLLOW_SHRINK_TIME) { followExpandTime = FOLLOW_SHRINK_TIME; } diff --git a/src/yugecin/opsudance/core/DisplayContainer.java b/src/yugecin/opsudance/core/DisplayContainer.java index bf225498..a185910b 100644 --- a/src/yugecin/opsudance/core/DisplayContainer.java +++ b/src/yugecin/opsudance/core/DisplayContainer.java @@ -65,9 +65,6 @@ import static yugecin.opsudance.options.Options.*; */ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListener { - @Deprecated - public static DisplayContainer instance; // TODO d remove this - @Inject private SkinService skinService; @@ -131,7 +128,6 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen this.instanceContainer = instanceContainer; this.cursor = new Cursor(); drawCursor = true; - instance = this; outTransitionListener = new TransitionFinishedListener() { @Override