work

src/main/java/electrosphere/client/ClientState.java

@@ -182,6 +182,11 @@ public class ClientState {
     //edit(6/1/21):    :upside_down_smile:
     public ArrayList<Vector3f> skyboxColors = new ArrayList<Vector3f>();
 
+    /**
+     * The number of open inventories
+     */
+    public int openInventoriesCount = 0;
+
     /**
      * Constructor
      */

src/main/java/electrosphere/client/ui/menu/ingame/InventoryMainWindow.java

@@ -54,7 +54,7 @@ public class InventoryMainWindow {
                 }
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(true);
                 //
-                Globals.openInventoriesCount++;
+                Globals.clientState.openInventoriesCount++;
             } else if(Globals.elementService.getWindow(WindowStrings.WINDOW_CHARACTER) != null){
                 Globals.elementService.closeWindow(WindowStrings.WINDOW_CHARACTER);
                 WindowUtils.clearTooltips();
@@ -80,7 +80,7 @@ public class InventoryMainWindow {
                 }
                 Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(true);
                 //
-                Globals.openInventoriesCount++;
+                Globals.clientState.openInventoriesCount++;
             } else if(Globals.elementService.getWindow(WindowStrings.WINDOW_INVENTORY_TARGET) != null){
                 Globals.elementService.closeWindow(WindowStrings.WINDOW_INVENTORY_TARGET);
                 WindowUtils.clearTooltips();

src/main/java/electrosphere/engine/EngineState.java

@@ -4,6 +4,7 @@ import java.lang.management.ManagementFactory;
 
 import electrosphere.engine.service.ServiceManager;
 import electrosphere.engine.signal.SignalSystem;
+import electrosphere.engine.signal.sync.MainThreadSignalService;
 import electrosphere.engine.threads.ThreadManager;
 import electrosphere.engine.time.Timekeeper;
 import electrosphere.logger.LoggerInterface;
@@ -38,6 +39,11 @@ public class EngineState {
      */
     public SignalSystem signalSystem;
 
+    /**
+     * Service for sending signals to the main thread
+     */
+    public final MainThreadSignalService mainThreadSignalService;
+
     /**
      * Engine-wide flags
      */
@@ -56,6 +62,7 @@ public class EngineState {
         this.threadManager = new ThreadManager();
         this.threadManager.init();
         this.signalSystem = (SignalSystem)this.serviceManager.registerService(new SignalSystem());
+        this.mainThreadSignalService = (MainThreadSignalService)this.serviceManager.registerService(new MainThreadSignalService());
     }
 
     /**

src/main/java/electrosphere/engine/Globals.java

@@ -18,7 +18,6 @@ import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.assetmanager.AssetManager;
 import electrosphere.engine.os.fs.FileWatcherService;
 import electrosphere.engine.profiler.Profiler;
-import electrosphere.engine.signal.sync.MainThreadSignalService;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.config.NetConfig;
 import electrosphere.net.monitor.NetMonitor;
@@ -72,17 +71,6 @@ public class Globals {
      * The audio engine
      */
     public static AudioEngine audioEngine;
-
-
-    //
-    //Profiler
-    //
-    public static Profiler profiler;
-
-    //
-    //Authentication manager
-    //
-    public static AuthenticationManager authenticationManager;
     
     
     //
@@ -104,7 +92,14 @@ public class Globals {
     public static int WINDOW_HEIGHT;
     
     
-    
+    //
+    //Engine-adjacent stuff to move into engine state eventually
+    //
+    public static AuthenticationManager authenticationManager;
+    public static AssetManager assetManager;
+    public static ScriptEngine scriptEngine;
+    public static FileWatcherService fileWatcherService;   
+
     
     //
     //Renderer-adjacent data I need to move into config at some point
@@ -114,6 +109,21 @@ public class Globals {
     public static ShaderOptionMap shaderOptionMap;
     public static FontManager fontManager;
     public static CameraHandler cameraHandler = new CameraHandler();
+
+    //
+    //Renderer-adjacent data I need to move to rendering engine at some point
+    //
+    public static VoxelTextureAtlas voxelTextureAtlas = new VoxelTextureAtlas();
+    public static BlockTextureAtlas blockTextureAtlas = new BlockTextureAtlas();
+    public static ElementService elementService;
+    public static InstanceManager clientInstanceManager = new InstanceManager();
+    public static ParticleService particleService;  
+
+    //
+    //To compress into a single "performance" object
+    //
+    public static Profiler profiler;
+    public static NetMonitor netMonitor;
     
     
     //
@@ -123,46 +133,6 @@ public class Globals {
     public static VisualShader terrainShaderProgram;
     public static VisualShader blockShader;
     
-    //
-    // Particle stuff
-    //
-    public static ParticleService particleService;    
-    
-    
-    //
-    //Engine - Main managers/variables
-    //
-
-    //manages all models loaded into memory
-    public static AssetManager assetManager;
-    
-    //script engine
-    public static ScriptEngine scriptEngine;
-
-    //services
-    public static MainThreadSignalService mainThreadSignalService;
-
-    //instanced actor manager
-    public static InstanceManager clientInstanceManager = new InstanceManager();
-    
-    //chunk stuff
-    public static VoxelTextureAtlas voxelTextureAtlas = new VoxelTextureAtlas();
-    public static BlockTextureAtlas blockTextureAtlas = new BlockTextureAtlas();
-
-    //manager for all widgets currently being drawn to screen
-    public static ElementService elementService;
-    public static int openInventoriesCount = 0;
-
-    //services
-    public static FileWatcherService fileWatcherService;
-
-
-
-    //
-    // Debugging tools
-    //
-    public static NetMonitor netMonitor;
-    
     
     /**
      * Inits globals
@@ -212,7 +182,6 @@ public class Globals {
         Globals.elementService = (ElementService)Globals.engineState.serviceManager.registerService(new ElementService());
         Globals.particleService = (ParticleService)Globals.engineState.serviceManager.registerService(new ParticleService());
         Globals.scriptEngine = (ScriptEngine)Globals.engineState.serviceManager.registerService(new ScriptEngine());
-        Globals.mainThreadSignalService = (MainThreadSignalService)Globals.engineState.serviceManager.registerService(new MainThreadSignalService());
         Globals.fileWatcherService = (FileWatcherService)Globals.engineState.serviceManager.registerService(new FileWatcherService());
         Globals.engineState.serviceManager.instantiate();
         //

src/main/java/electrosphere/engine/signal/SynchronousSignalHandling.java

@@ -12,7 +12,7 @@ public class SynchronousSignalHandling {
      */
     public static void runMainThreadSignalHandlers(){
         Globals.scriptEngine.handleAllSignals();
-        Globals.mainThreadSignalService.handleAllSignals();
+        Globals.engineState.mainThreadSignalService.handleAllSignals();
     }
 
 }