refactor + fix regression

docs/src/progress/renderertodo.md

@@ -785,6 +785,8 @@ Remove legacy UI handling of positioning -- entirely reliant on yoga now
 Framebuffer position drilling
 Redesign inventory menu
 Remove deprecated ui constructors
+Refactor menus to package under client
+Fix buffered scrollable regression in above work
 
 
 # TODO

src/main/java/electrosphere/client/ui/menu/MenuGenerators.java

@@ -1,14 +1,14 @@
-package electrosphere.menu;
+package electrosphere.client.ui.menu;
 
 import java.util.List;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsKeybind;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.engine.Globals;
 import electrosphere.engine.loadingthreads.LoadingThread;
 import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
 import electrosphere.entity.scene.SceneGenerator;
-import electrosphere.menu.mainmenu.MenuGeneratorsKeybind;
-import electrosphere.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.net.NetUtils;
 import electrosphere.renderer.ui.components.InputMacros;
 import electrosphere.renderer.ui.elements.Button;

src/main/java/electrosphere/client/ui/menu/WindowStrings.java

@@ -1,4 +1,4 @@
-package electrosphere.menu;
+package electrosphere.client.ui.menu;
 
 /**
  * Strings that identify different windows

src/main/java/electrosphere/client/ui/menu/WindowUtils.java

@@ -1,9 +1,9 @@
-package electrosphere.menu;
+package electrosphere.client.ui.menu;
 
+import electrosphere.client.ui.menu.ingame.MenuGeneratorsInventory;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
-import electrosphere.menu.ingame.MenuGeneratorsInventory;
-import electrosphere.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.renderer.ui.components.PlayerInventoryWindow;
 import electrosphere.renderer.ui.elements.Label;
 import electrosphere.renderer.ui.elements.Window;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiAI.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import electrosphere.engine.Globals;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiAudio.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import org.joml.Vector3d;
 

src/main/java/electrosphere/client/ui/menu/debug/ImGuiControls.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import electrosphere.engine.Globals;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiEntityMacros.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiLogger.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import electrosphere.engine.Globals;
 import electrosphere.logger.Logger;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiPlayerEntity.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import org.ode4j.ode.DBody;
 

src/main/java/electrosphere/client/ui/menu/debug/ImGuiRenderer.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import electrosphere.engine.Globals;
 import electrosphere.renderer.pipelines.PostProcessingPipeline;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiUIFramework.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;

src/main/java/electrosphere/client/ui/menu/debug/ImGuiUtils.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 /**
  * Utilities for dealing with imgui

src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.debug;
+package electrosphere.client.ui.menu.debug;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,7 +1,9 @@
-package electrosphere.menu.ingame;
+package electrosphere.client.ui.menu.ingame;
 
 import org.joml.Vector3f;
 
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
@@ -14,8 +16,6 @@ import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.game.data.creature.type.CreatureData;
 import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorStaticMorph;

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

@@ -1,10 +1,10 @@
-package electrosphere.menu.ingame;
+package electrosphere.client.ui.menu.ingame;
 
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.components.PlayerInventoryWindow;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Window;

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

@@ -1,4 +1,4 @@
-package electrosphere.menu.ingame;
+package electrosphere.client.ui.menu.ingame;
 
 import java.util.Random;
 
@@ -6,6 +6,8 @@ import org.joml.Vector3d;
 import org.joml.Vector3f;
 
 import electrosphere.client.entity.camera.CameraEntityUtils;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.collision.CollisionEngine;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
@@ -21,8 +23,6 @@ import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.game.data.item.type.Item;
 import electrosphere.game.data.units.UnitDefinition;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.light.DirectionalLight;
 import electrosphere.renderer.light.LightManager;
 import electrosphere.renderer.ui.elements.Button;

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

@@ -1,14 +1,14 @@
-package electrosphere.menu.ingame;
+package electrosphere.client.ui.menu.ingame;
 
 import java.util.List;
 import java.util.function.Consumer;
 
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.game.data.voxel.VoxelData;
 import electrosphere.game.data.voxel.VoxelType;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsDemo.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.mainmenu;
+package electrosphere.client.ui.menu.mainmenu;
 
 import electrosphere.renderer.ui.elements.FormElement;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsKeybind.java

@@ -1,8 +1,8 @@
-package electrosphere.menu.mainmenu;
+package electrosphere.client.ui.menu.mainmenu;
 
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.Control;
 import electrosphere.engine.Globals;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.FormElement;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java

@@ -1,14 +1,14 @@
-package electrosphere.menu.mainmenu;
+package electrosphere.client.ui.menu.mainmenu;
 
 import java.util.List;
 
+import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.ingame.MenuGeneratorsTerrainEditing;
 import electrosphere.engine.Globals;
 import electrosphere.engine.loadingthreads.LoadingThread;
 import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
 import electrosphere.entity.scene.SceneFile;
 import electrosphere.game.data.voxel.VoxelType;
-import electrosphere.menu.WindowUtils;
-import electrosphere.menu.ingame.MenuGeneratorsTerrainEditing;
 import electrosphere.renderer.ui.components.InputMacros;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsMultiplayer.java

@@ -1,8 +1,8 @@
-package electrosphere.menu.mainmenu;
+package electrosphere.client.ui.menu.mainmenu;
 
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.components.CharacterCustomizer;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.FormElement;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsTitleMenu.java

@@ -1,10 +1,10 @@
-package electrosphere.menu.mainmenu;
+package electrosphere.client.ui.menu.mainmenu;
 
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.loadingthreads.LoadingThread;
 import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java

@@ -1,4 +1,4 @@
-package electrosphere.menu.mainmenu;
+package electrosphere.client.ui.menu.mainmenu;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -7,6 +7,7 @@ import java.util.List;
 import org.joml.Vector3f;
 
 import electrosphere.client.entity.camera.CameraEntityUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.Entity;
@@ -15,7 +16,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.actor.ActorUtils;
 import electrosphere.renderer.ui.components.CharacterCustomizer;
 import electrosphere.renderer.ui.components.EquipmentInventoryPanel;

src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java

@@ -1,12 +1,12 @@
-package electrosphere.menu.tutorial;
+package electrosphere.client.ui.menu.tutorial;
 
 import org.graalvm.polyglot.HostAccess.Export;
 
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
 import electrosphere.engine.Globals;
 import electrosphere.game.data.tutorial.TutorialHint;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Label;
 import electrosphere.renderer.ui.elements.TextBox;

src/main/java/electrosphere/controls/ControlHandler.java

@@ -77,6 +77,10 @@ import electrosphere.client.entity.camera.CameraEntityUtils;
 import electrosphere.client.entity.crosshair.Crosshair;
 import electrosphere.client.item.ItemActions;
 import electrosphere.client.terrain.editing.TerrainEditing;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.debug.ImGuiWindowMacros;
+import electrosphere.client.ui.menu.ingame.MenuGeneratorsInGame;
 import electrosphere.collision.CollisionEngine;
 import electrosphere.controls.Control.ControlMethod;
 import electrosphere.controls.Control.ControlType;
@@ -97,10 +101,6 @@ import electrosphere.entity.state.movement.sprint.ClientSprintTree;
 import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
-import electrosphere.menu.debug.ImGuiWindowMacros;
-import electrosphere.menu.ingame.MenuGeneratorsInGame;
 import electrosphere.renderer.ui.components.PlayerInventoryWindow;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.renderer.ui.events.ClickEvent;

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

@@ -23,6 +23,7 @@ import electrosphere.client.sim.ClientSimulation;
 import electrosphere.client.terrain.cells.DrawCellManager;
 import electrosphere.client.terrain.cells.VoxelTextureAtlas;
 import electrosphere.client.terrain.manager.ClientTerrainManager;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.collision.CollisionEngine;
 import electrosphere.collision.CollisionWorldData;
 import electrosphere.controls.CameraHandler;
@@ -47,7 +48,6 @@ import electrosphere.game.data.voxel.VoxelType;
 import electrosphere.game.server.structure.virtual.StructureManager;
 import electrosphere.game.server.world.MacroData;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.WindowUtils;
 import electrosphere.net.client.ClientNetworking;
 import electrosphere.net.config.NetConfig;
 import electrosphere.net.monitor.NetMonitor;

src/main/java/electrosphere/engine/Main.java

@@ -9,6 +9,7 @@ import org.ode4j.ode.OdeHelper;
 
 import electrosphere.audio.AudioEngine;
 import electrosphere.audio.VirtualAudioSourceManager;
+import electrosphere.client.ui.menu.debug.ImGuiWindowMacros;
 import electrosphere.controls.ControlHandler;
 import electrosphere.controls.ControlHandler.ControlsState;
 import electrosphere.engine.cli.CLIParser;
@@ -17,7 +18,6 @@ import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
 import electrosphere.engine.time.Timekeeper;
 import electrosphere.game.server.world.MacroData;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.debug.ImGuiWindowMacros;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.server.MainServerFunctions;
 import electrosphere.server.simulation.MacroSimulation;

src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java

@@ -11,6 +11,10 @@ import electrosphere.client.fluid.cells.FluidCellManager;
 import electrosphere.client.foliagemanager.ClientFoliageManager;
 import electrosphere.client.sim.ClientSimulation;
 import electrosphere.client.terrain.cells.DrawCellManager;
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsMultiplayer;
 import electrosphere.controls.ControlHandler;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
@@ -21,10 +25,6 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
-import electrosphere.menu.mainmenu.MenuGeneratorsMultiplayer;
 import electrosphere.net.NetUtils;
 import electrosphere.net.client.ClientNetworking;
 import electrosphere.renderer.actor.Actor;

src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java

@@ -3,13 +3,13 @@ package electrosphere.engine.loadingthreads;
 import java.util.concurrent.TimeUnit;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.scene.SceneGenerator;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.renderer.ui.elements.Window;

src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java

@@ -3,14 +3,14 @@ package electrosphere.engine.loadingthreads;
 import java.util.concurrent.TimeUnit;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsLevelEditor.LevelDescription;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.scene.SceneFile;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
-import electrosphere.menu.mainmenu.MenuGeneratorsLevelEditor.LevelDescription;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.renderer.ui.elements.Window;

src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java

@@ -3,12 +3,12 @@ package electrosphere.engine.loadingthreads;
 import java.util.concurrent.TimeUnit;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.ServerConnectionHandler;
 import electrosphere.renderer.ui.elements.Window;

src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java

@@ -1,11 +1,11 @@
 package electrosphere.engine.loadingthreads;
 
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.engine.threads.LabeledThread.ThreadLabel;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
-import electrosphere.menu.mainmenu.MenuGeneratorsTitleMenu;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.server.datacell.RealmManager;
 

src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java

@@ -5,12 +5,12 @@ import java.util.concurrent.TimeUnit;
 import org.joml.Vector3d;
 
 import electrosphere.auth.AuthenticationManager;
+import electrosphere.client.ui.menu.MenuGenerators;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.MenuGenerators;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.net.parser.net.message.TerrainMessage;
 import electrosphere.net.server.player.Player;
 import electrosphere.renderer.ui.elements.Window;

src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java

@@ -2,13 +2,13 @@ package electrosphere.entity.state.inventory;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.menu.WindowUtils;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.net.server.protocol.InventoryProtocol;
 

src/main/java/electrosphere/renderer/pipelines/ImGuiPipeline.java

@@ -3,8 +3,8 @@ package electrosphere.renderer.pipelines;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import electrosphere.client.ui.menu.debug.ImGuiWindowMacros;
 import electrosphere.engine.Globals;
-import electrosphere.menu.debug.ImGuiWindowMacros;
 import electrosphere.renderer.OpenGLState;
 import electrosphere.renderer.RenderPipelineState;
 import electrosphere.renderer.ui.imgui.ImGuiWindow;

src/main/java/electrosphere/renderer/ui/components/EquipmentInventoryPanel.java

@@ -3,6 +3,8 @@ package electrosphere.renderer.ui.components;
 import java.util.List;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.Entity;
@@ -13,8 +15,6 @@ import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.creature.type.equip.EquipPoint;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/renderer/ui/components/NaturalInventoryPanel.java

@@ -1,6 +1,8 @@
 package electrosphere.renderer.ui.components;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.Entity;
@@ -10,8 +12,6 @@ import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/renderer/ui/components/PlayerInventoryWindow.java

@@ -1,12 +1,12 @@
 package electrosphere.renderer.ui.components;
 
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.inventory.InventoryUtils;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaJustification;

src/main/java/electrosphere/renderer/ui/elements/ScrollableContainer.java

@@ -56,6 +56,8 @@ public class ScrollableContainer extends BufferedStandardDrawableContainerElemen
      */
     private ScrollableContainer(){
         super();
+        this.setMinWidth(DEFAULT_WIDTH);
+        this.setMinHeight(DEFAULT_HEIGHT);
     }
 
     /**

src/main/java/electrosphere/script/ScriptEngine.java

@@ -13,10 +13,10 @@ import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Source.Builder;
 import org.graalvm.polyglot.Value;
 
+import electrosphere.client.ui.menu.tutorial.TutorialMenus;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.logger.LoggerInterface;
-import electrosphere.menu.tutorial.TutorialMenus;
 import electrosphere.script.translation.JSServerUtils;
 import electrosphere.util.FileUtils;
 import electrosphere.util.math.MathUtils;

src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java

@@ -5,10 +5,10 @@ import static org.junit.jupiter.api.Assertions.*;
 import org.junit.jupiter.api.AfterEach;
 
 import electrosphere.test.annotations.IntegrationTest;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elementtypes.Element;
 import electrosphere.test.testutils.EngineInit;
 

src/test/java/electrosphere/menu/WindowUtilsTests.java

@@ -2,6 +2,7 @@ package electrosphere.menu;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.ui.ElementService;

src/test/java/electrosphere/renderer/ui/MainMenuTests.java

@@ -2,8 +2,8 @@ package electrosphere.renderer.ui;
 
 import org.junit.jupiter.api.Disabled;
 
-import electrosphere.menu.WindowUtils;
-import electrosphere.menu.mainmenu.MenuGeneratorsUITesting;
+import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.client.ui.menu.mainmenu.MenuGeneratorsUITesting;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/UIExtensionTests.java

@@ -8,9 +8,9 @@ import org.junit.jupiter.api.extension.ExtendWith;
 
 import static electrosphere.test.testutils.Assertions.*;
 
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
 import electrosphere.engine.Main;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.extensions.StateCleanupCheckerExtension;

src/test/java/electrosphere/renderer/ui/elements/BitmapCharacterTests.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.ui.elements;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
-import electrosphere.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/ButtonTests.java

@@ -1,5 +1,5 @@
 package electrosphere.renderer.ui.elements;
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/ImagePanelTests.java

@@ -1,5 +1,5 @@
 package electrosphere.renderer.ui.elements;
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/LabelTests.java

@@ -1,5 +1,5 @@
 package electrosphere.renderer.ui.elements;
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/SliderTests.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.ui.elements;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.renderer.ui.events.ValueChangeEvent;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;

src/test/java/electrosphere/renderer/ui/elements/StringCarouselTests.java

@@ -2,7 +2,7 @@ package electrosphere.renderer.ui.elements;
 
 import java.util.Arrays;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.renderer.ui.events.ValueChangeEvent;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;

src/test/java/electrosphere/renderer/ui/elements/TestBoxTests.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.ui.elements;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/TestInputTests.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.ui.elements;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/ToggleInputTests.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.ui.elements;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/renderer/ui/elements/WindowTest.java

@@ -1,9 +1,9 @@
 package electrosphere.renderer.ui.elements;
 
 import electrosphere.test.annotations.IntegrationTest;
+import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.engine.Globals;
-import electrosphere.menu.WindowStrings;
-import electrosphere.menu.WindowUtils;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaJustification;
 import electrosphere.test.template.UITestTemplate;

src/test/java/electrosphere/renderer/ui/elements/WordTests.java

@@ -1,6 +1,6 @@
 package electrosphere.renderer.ui.elements;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.test.template.UITestTemplate;
 import electrosphere.test.testutils.TestEngineUtils;

src/test/java/electrosphere/test/template/UITestTemplate.java

@@ -5,7 +5,7 @@ import java.io.File;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import electrosphere.menu.WindowUtils;
+import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.test.template.extensions.StateCleanupCheckerExtension;
 import electrosphere.test.template.extensions.UIExtension;