feature: make FocusManager as Injectable service and inject it in Nui.

fix: Fix DI Loading NUI as  transient service instead singleton

Author: DarkWeird

engine/src/main/java/org/destinationsol/CoreService.java

@@ -21,6 +21,8 @@
 import org.terasology.gestalt.di.ServiceRegistry;
 import org.terasology.gestalt.di.scanners.StandardScanner;
 import org.terasology.gestalt.entitysystem.component.management.ComponentManager;
+import org.terasology.nui.FocusManager;
+import org.terasology.nui.FocusManagerImpl;
 import org.terasology.nui.reflection.WidgetLibrary;
 import org.terasology.reflection.copy.CopyStrategyLibrary;
 import org.terasology.reflection.reflect.ReflectFactory;
@@ -50,15 +52,17 @@ public CoreService(SolApplication application) {
         this.with(MenuLayout.class).lifetime(Lifetime.Singleton);
 
         this.with(NUIManager.class).lifetime(Lifetime.Singleton);
+        this.with(FocusManager.class).lifetime(Lifetime.Singleton).use(FocusManagerImpl.class);
         this.with(MenuBackgroundManager.class).lifetime(Lifetime.Singleton);
 
         this.with(ReflectFactory.class).lifetime(Lifetime.Singleton).use(ReflectionReflectFactory.class);
         this.with(CopyStrategyLibrary.class).lifetime(Lifetime.Singleton);
 
         this.with(WidgetLibrary.class).lifetime(Lifetime.Singleton);
         this.with(SolInputManager.class).lifetime(Lifetime.Singleton);
+
         this.registerScanner(new StandardScanner("org.destinationsol.assets"));
-        this.registerScanner(new StandardScanner("org.destinationsol.ui.nui"));
+        this.registerScanner(new StandardScanner("org.destinationsol.ui.nui.screens"));
 
         // TODO seems this is should be GameService before game
         this.with(Console.class).lifetime(Lifetime.Singleton).use(ConsoleImpl.class);

engine/src/main/java/org/destinationsol/assets/ui/UISkinFormat.java

@@ -46,7 +46,7 @@ public class UISkinFormat extends AbstractAssetFileFormat<UISkinData> {
 
     private static final Logger logger = LoggerFactory.getLogger(UISkinFormat.class);
     private Gson gson;
-    private ClassLibrary<UIWidget> widgetClassLibrary;
+    private static ClassLibrary<UIWidget> widgetClassLibrary;
 
     @Inject
     public UISkinFormat(WidgetLibrary widgetClassLibrary) {

engine/src/main/java/org/destinationsol/ui/nui/NUIManager.java

@@ -138,10 +138,16 @@ public class NUIManager {
      * @param options used to initialise the UI scale with its previously-saved value
      */
     @Inject
-    public NUIManager(SolApplication solApplication, Context context, CommonDrawer commonDrawer, GameOptions options, UiDrawer uiDrawer) {
+    public NUIManager(SolApplication solApplication,
+                      Context context,
+                      CommonDrawer commonDrawer,
+                      GameOptions options,
+                      UiDrawer uiDrawer,
+                      FocusManager focusManager) {
         NUIInputProcessor.CONSUME_INPUT = false;
         this.context = context;
         this.uiDrawer = uiDrawer;
+        this.focusManager = focusManager;
 
         // TODO: Re-enable tabbing when it works
         TabbingManager.tabForwardInput = Keyboard.Key.NONE;
@@ -152,7 +158,6 @@ public NUIManager(SolApplication solApplication, Context context, CommonDrawer c
         keyboard = new LibGDXKeyboardDevice();
         canvasRenderer = new LibGDXCanvasRenderer(Gdx.graphics.getWidth(), Gdx.graphics.getHeight(),
                 commonDrawer.getSpriteBatch(), new ShapeRenderer(), false, true);
-        focusManager = new FocusManagerImpl();
         whiteTexture = Assets.getDSTexture(WHITE_TEXTURE_URN).getUiTexture();
         skin = Assets.getSkin(DEFAULT_SKIN_URN);
 
@@ -313,10 +318,6 @@ public NUIScreenLayer createScreen(String uri) {
         if (rootWidget instanceof NUIScreenLayer) {
             NUIScreenLayer screen = (NUIScreenLayer) rootWidget;
             if (!alreadyLoaded) {
-                // Populate all @In annotated fields in the screen class with values from the context.
-                InjectionHelper.inject(screen, context);
-                screen.setFocusManager(focusManager);
-                screen.setNuiManager(this);
                 screen.initialise();
             }
             return screen;

engine/src/main/java/org/destinationsol/ui/nui/NUIScreenLayer.java

@@ -26,6 +26,7 @@
 import org.terasology.nui.UIWidget;
 import org.terasology.nui.events.NUIKeyEvent;
 
+import javax.inject.Inject;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -177,7 +178,8 @@ protected boolean escapeCloses() {
      * Primary usage is in {@link NUIManager#pushScreen}
      * @param focusManager the focus manager to use.
      */
-    void setFocusManager(FocusManager focusManager) {
+    @Inject
+    public void setFocusManager(FocusManager focusManager) {
         this.focusManager = focusManager;
     }
 
@@ -193,7 +195,8 @@ protected FocusManager getFocusManager() {
      * Sets the game's NUI Manager.
      * @param nuiManager the game's NUI Manager
      */
-    void setNuiManager(NUIManager nuiManager) {
+    @Inject
+    public void setNuiManager(NUIManager nuiManager) {
         this.nuiManager = nuiManager;
     }