From 78978c7f54286eb731a1c997e128864e75edce90 Mon Sep 17 00:00:00 2001 From: austin Date: Tue, 17 Sep 2024 19:09:33 -0400 Subject: [PATCH] refactor + fix regression --- docs/src/progress/renderertodo.md | 2 ++ .../{ => client/ui}/menu/MenuGenerators.java | 6 +++--- .../electrosphere/{ => client/ui}/menu/WindowStrings.java | 2 +- .../electrosphere/{ => client/ui}/menu/WindowUtils.java | 6 +++--- .../electrosphere/{ => client/ui}/menu/debug/ImGuiAI.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiAudio.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiControls.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiEntityMacros.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiLogger.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiPlayerEntity.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiRenderer.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiUIFramework.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiUtils.java | 2 +- .../{ => client/ui}/menu/debug/ImGuiWindowMacros.java | 2 +- .../{ => client/ui}/menu/ingame/MenuGeneratorsInGame.java | 6 +++--- .../ui}/menu/ingame/MenuGeneratorsInventory.java | 6 +++--- .../ui}/menu/ingame/MenuGeneratorsLevelEditor.java | 6 +++--- .../ui}/menu/ingame/MenuGeneratorsTerrainEditing.java | 6 +++--- .../{ => client/ui}/menu/mainmenu/MenuGeneratorsDemo.java | 2 +- .../ui}/menu/mainmenu/MenuGeneratorsKeybind.java | 4 ++-- .../ui}/menu/mainmenu/MenuGeneratorsLevelEditor.java | 6 +++--- .../ui}/menu/mainmenu/MenuGeneratorsMultiplayer.java | 6 +++--- .../ui}/menu/mainmenu/MenuGeneratorsTitleMenu.java | 6 +++--- .../ui}/menu/mainmenu/MenuGeneratorsUITesting.java | 4 ++-- .../{ => client/ui}/menu/tutorial/TutorialMenus.java | 6 +++--- src/main/java/electrosphere/controls/ControlHandler.java | 8 ++++---- src/main/java/electrosphere/engine/Globals.java | 2 +- src/main/java/electrosphere/engine/Main.java | 2 +- .../engine/loadingthreads/ClientLoading.java | 8 ++++---- .../engine/loadingthreads/DebugSPWorldLoading.java | 6 +++--- .../engine/loadingthreads/LevelEditorLoading.java | 8 ++++---- .../electrosphere/engine/loadingthreads/LevelLoading.java | 6 +++--- .../engine/loadingthreads/MainMenuLoading.java | 6 +++--- .../engine/loadingthreads/ViewportLoading.java | 6 +++--- .../entity/state/inventory/ClientInventoryState.java | 2 +- .../electrosphere/renderer/pipelines/ImGuiPipeline.java | 2 +- .../renderer/ui/components/EquipmentInventoryPanel.java | 4 ++-- .../renderer/ui/components/NaturalInventoryPanel.java | 4 ++-- .../renderer/ui/components/PlayerInventoryWindow.java | 4 ++-- .../renderer/ui/elements/ScrollableContainer.java | 2 ++ src/main/java/electrosphere/script/ScriptEngine.java | 2 +- .../engine/loadingthreads/ViewportLoadingTests.java | 4 ++-- src/test/java/electrosphere/menu/WindowUtilsTests.java | 1 + .../java/electrosphere/renderer/ui/MainMenuTests.java | 4 ++-- .../java/electrosphere/renderer/ui/UIExtensionTests.java | 2 +- .../renderer/ui/elements/BitmapCharacterTests.java | 2 +- .../electrosphere/renderer/ui/elements/ButtonTests.java | 2 +- .../renderer/ui/elements/ImagePanelTests.java | 2 +- .../electrosphere/renderer/ui/elements/LabelTests.java | 2 +- .../electrosphere/renderer/ui/elements/SliderTests.java | 2 +- .../renderer/ui/elements/StringCarouselTests.java | 2 +- .../electrosphere/renderer/ui/elements/TestBoxTests.java | 2 +- .../renderer/ui/elements/TestInputTests.java | 2 +- .../renderer/ui/elements/ToggleInputTests.java | 2 +- .../electrosphere/renderer/ui/elements/WindowTest.java | 4 ++-- .../electrosphere/renderer/ui/elements/WordTests.java | 2 +- .../java/electrosphere/test/template/UITestTemplate.java | 2 +- 57 files changed, 104 insertions(+), 99 deletions(-) rename src/main/java/electrosphere/{ => client/ui}/menu/MenuGenerators.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/WindowStrings.java (97%) rename src/main/java/electrosphere/{ => client/ui}/menu/WindowUtils.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiAI.java (97%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiAudio.java (99%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiControls.java (96%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiEntityMacros.java (99%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiLogger.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiPlayerEntity.java (99%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiRenderer.java (97%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiUIFramework.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiUtils.java (63%) rename src/main/java/electrosphere/{ => client/ui}/menu/debug/ImGuiWindowMacros.java (99%) rename src/main/java/electrosphere/{ => client/ui}/menu/ingame/MenuGeneratorsInGame.java (99%) rename src/main/java/electrosphere/{ => client/ui}/menu/ingame/MenuGeneratorsInventory.java (92%) rename src/main/java/electrosphere/{ => client/ui}/menu/ingame/MenuGeneratorsLevelEditor.java (99%) rename src/main/java/electrosphere/{ => client/ui}/menu/ingame/MenuGeneratorsTerrainEditing.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/mainmenu/MenuGeneratorsDemo.java (95%) rename src/main/java/electrosphere/{ => client/ui}/menu/mainmenu/MenuGeneratorsKeybind.java (96%) rename src/main/java/electrosphere/{ => client/ui}/menu/mainmenu/MenuGeneratorsLevelEditor.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/mainmenu/MenuGeneratorsMultiplayer.java (94%) rename src/main/java/electrosphere/{ => client/ui}/menu/mainmenu/MenuGeneratorsTitleMenu.java (97%) rename src/main/java/electrosphere/{ => client/ui}/menu/mainmenu/MenuGeneratorsUITesting.java (98%) rename src/main/java/electrosphere/{ => client/ui}/menu/tutorial/TutorialMenus.java (95%) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index b78bbc14..1d4b1f02 100644 --- a/docs/src/progress/renderertodo.md +++ b/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 diff --git a/src/main/java/electrosphere/menu/MenuGenerators.java b/src/main/java/electrosphere/client/ui/menu/MenuGenerators.java similarity index 98% rename from src/main/java/electrosphere/menu/MenuGenerators.java rename to src/main/java/electrosphere/client/ui/menu/MenuGenerators.java index 0cb87f45..903232a4 100644 --- a/src/main/java/electrosphere/menu/MenuGenerators.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/WindowStrings.java b/src/main/java/electrosphere/client/ui/menu/WindowStrings.java similarity index 97% rename from src/main/java/electrosphere/menu/WindowStrings.java rename to src/main/java/electrosphere/client/ui/menu/WindowStrings.java index b03c24ab..c2b0d568 100644 --- a/src/main/java/electrosphere/menu/WindowStrings.java +++ b/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 diff --git a/src/main/java/electrosphere/menu/WindowUtils.java b/src/main/java/electrosphere/client/ui/menu/WindowUtils.java similarity index 98% rename from src/main/java/electrosphere/menu/WindowUtils.java rename to src/main/java/electrosphere/client/ui/menu/WindowUtils.java index bf30feb9..df3ae956 100644 --- a/src/main/java/electrosphere/menu/WindowUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiAI.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiAI.java similarity index 97% rename from src/main/java/electrosphere/menu/debug/ImGuiAI.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiAI.java index 29999df2..4fe24a41 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiAI.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiAudio.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiAudio.java similarity index 99% rename from src/main/java/electrosphere/menu/debug/ImGuiAudio.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiAudio.java index 9fff72a0..074ead52 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiAudio.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiControls.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiControls.java similarity index 96% rename from src/main/java/electrosphere/menu/debug/ImGuiControls.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiControls.java index a9ee39b3..40434503 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiControls.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiEntityMacros.java similarity index 99% rename from src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiEntityMacros.java index 234ca7ed..a36e4b63 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiLogger.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiLogger.java similarity index 98% rename from src/main/java/electrosphere/menu/debug/ImGuiLogger.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiLogger.java index d03b4e6f..1572e40a 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiLogger.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiPlayerEntity.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiPlayerEntity.java similarity index 99% rename from src/main/java/electrosphere/menu/debug/ImGuiPlayerEntity.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiPlayerEntity.java index ef31fd56..51291a41 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiPlayerEntity.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiRenderer.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiRenderer.java similarity index 97% rename from src/main/java/electrosphere/menu/debug/ImGuiRenderer.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiRenderer.java index f417cc8d..fb42380a 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiRenderer.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiUIFramework.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiUIFramework.java similarity index 98% rename from src/main/java/electrosphere/menu/debug/ImGuiUIFramework.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiUIFramework.java index 59d889ec..da262cd4 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiUIFramework.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/debug/ImGuiUtils.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiUtils.java similarity index 63% rename from src/main/java/electrosphere/menu/debug/ImGuiUtils.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiUtils.java index b4620093..793dfd9a 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiUtils.java +++ b/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 diff --git a/src/main/java/electrosphere/menu/debug/ImGuiWindowMacros.java b/src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java similarity index 99% rename from src/main/java/electrosphere/menu/debug/ImGuiWindowMacros.java rename to src/main/java/electrosphere/client/ui/menu/debug/ImGuiWindowMacros.java index 83eb8ee3..31891ef7 100644 --- a/src/main/java/electrosphere/menu/debug/ImGuiWindowMacros.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsInGame.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java similarity index 99% rename from src/main/java/electrosphere/menu/ingame/MenuGeneratorsInGame.java rename to src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java index e62d158a..7ba45daf 100644 --- a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsInGame.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsInventory.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java similarity index 92% rename from src/main/java/electrosphere/menu/ingame/MenuGeneratorsInventory.java rename to src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java index e92f78f9..997e3b90 100644 --- a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsInventory.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java similarity index 99% rename from src/main/java/electrosphere/menu/ingame/MenuGeneratorsLevelEditor.java rename to src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java index 7dace098..1295d753 100644 --- a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsLevelEditor.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsTerrainEditing.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java similarity index 98% rename from src/main/java/electrosphere/menu/ingame/MenuGeneratorsTerrainEditing.java rename to src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java index 0ced16b4..ddc0a955 100644 --- a/src/main/java/electrosphere/menu/ingame/MenuGeneratorsTerrainEditing.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsDemo.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsDemo.java similarity index 95% rename from src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsDemo.java rename to src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsDemo.java index 24601dea..27ae4d34 100644 --- a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsDemo.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsKeybind.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsKeybind.java similarity index 96% rename from src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsKeybind.java rename to src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsKeybind.java index 0301702d..0c366f9f 100644 --- a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsKeybind.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java similarity index 98% rename from src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsLevelEditor.java rename to src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java index 1ff3731f..c43f2bd8 100644 --- a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsLevelEditor.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsMultiplayer.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsMultiplayer.java similarity index 94% rename from src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsMultiplayer.java rename to src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsMultiplayer.java index 65cffde5..4f04bb10 100644 --- a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsMultiplayer.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsTitleMenu.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsTitleMenu.java similarity index 97% rename from src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsTitleMenu.java rename to src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsTitleMenu.java index fef1b6c7..aada3d87 100644 --- a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsTitleMenu.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsUITesting.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java similarity index 98% rename from src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsUITesting.java rename to src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java index c3829c9f..f6c0325b 100644 --- a/src/main/java/electrosphere/menu/mainmenu/MenuGeneratorsUITesting.java +++ b/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; diff --git a/src/main/java/electrosphere/menu/tutorial/TutorialMenus.java b/src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java similarity index 95% rename from src/main/java/electrosphere/menu/tutorial/TutorialMenus.java rename to src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java index 48f6cecc..1889575e 100644 --- a/src/main/java/electrosphere/menu/tutorial/TutorialMenus.java +++ b/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; diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java index c6659403..e705080a 100644 --- a/src/main/java/electrosphere/controls/ControlHandler.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index 9a9532aa..c601a751 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java index 0851f348..17a2a1e1 100644 --- a/src/main/java/electrosphere/engine/Main.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java index e937ea0e..9da36f63 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java index 15c7620c..eb862b13 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java index 0ef1b00b..7ad077a4 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java index a67c1455..9780e4c8 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java b/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java index 9196c172..e45944d4 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java b/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java index 685b7d7e..a9b6a056 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/ViewportLoading.java +++ b/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; diff --git a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java index 405a92d8..c3aba1a4 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java +++ b/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; diff --git a/src/main/java/electrosphere/renderer/pipelines/ImGuiPipeline.java b/src/main/java/electrosphere/renderer/pipelines/ImGuiPipeline.java index 107ffa14..e03b2994 100644 --- a/src/main/java/electrosphere/renderer/pipelines/ImGuiPipeline.java +++ b/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; diff --git a/src/main/java/electrosphere/renderer/ui/components/EquipmentInventoryPanel.java b/src/main/java/electrosphere/renderer/ui/components/EquipmentInventoryPanel.java index fd6ca6d8..baaf652c 100644 --- a/src/main/java/electrosphere/renderer/ui/components/EquipmentInventoryPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/renderer/ui/components/NaturalInventoryPanel.java b/src/main/java/electrosphere/renderer/ui/components/NaturalInventoryPanel.java index 11c75ffb..7e11b3e0 100644 --- a/src/main/java/electrosphere/renderer/ui/components/NaturalInventoryPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/renderer/ui/components/PlayerInventoryWindow.java b/src/main/java/electrosphere/renderer/ui/components/PlayerInventoryWindow.java index 690dfb6f..9cb195c6 100644 --- a/src/main/java/electrosphere/renderer/ui/components/PlayerInventoryWindow.java +++ b/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; diff --git a/src/main/java/electrosphere/renderer/ui/elements/ScrollableContainer.java b/src/main/java/electrosphere/renderer/ui/elements/ScrollableContainer.java index c06c26d9..c0179c09 100644 --- a/src/main/java/electrosphere/renderer/ui/elements/ScrollableContainer.java +++ b/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); } /** diff --git a/src/main/java/electrosphere/script/ScriptEngine.java b/src/main/java/electrosphere/script/ScriptEngine.java index ea536f42..82c25c08 100644 --- a/src/main/java/electrosphere/script/ScriptEngine.java +++ b/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; diff --git a/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java b/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java index 6a14b2a6..90ec25bf 100644 --- a/src/test/java/electrosphere/engine/loadingthreads/ViewportLoadingTests.java +++ b/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; diff --git a/src/test/java/electrosphere/menu/WindowUtilsTests.java b/src/test/java/electrosphere/menu/WindowUtilsTests.java index 1cb6a3c1..61fc9ba0 100644 --- a/src/test/java/electrosphere/menu/WindowUtilsTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/MainMenuTests.java b/src/test/java/electrosphere/renderer/ui/MainMenuTests.java index 762cc263..e6b0f27c 100644 --- a/src/test/java/electrosphere/renderer/ui/MainMenuTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/UIExtensionTests.java b/src/test/java/electrosphere/renderer/ui/UIExtensionTests.java index ce577b8b..719caeaf 100644 --- a/src/test/java/electrosphere/renderer/ui/UIExtensionTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/BitmapCharacterTests.java b/src/test/java/electrosphere/renderer/ui/elements/BitmapCharacterTests.java index 7b68ba6f..00c28b13 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/BitmapCharacterTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/ButtonTests.java b/src/test/java/electrosphere/renderer/ui/elements/ButtonTests.java index d486e88e..413a7168 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/ButtonTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/ImagePanelTests.java b/src/test/java/electrosphere/renderer/ui/elements/ImagePanelTests.java index 5648ae3a..a312a1e3 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/ImagePanelTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/LabelTests.java b/src/test/java/electrosphere/renderer/ui/elements/LabelTests.java index 07c156a3..d16bae96 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/LabelTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/SliderTests.java b/src/test/java/electrosphere/renderer/ui/elements/SliderTests.java index 89b60b72..f0d9b8db 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/SliderTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/StringCarouselTests.java b/src/test/java/electrosphere/renderer/ui/elements/StringCarouselTests.java index 4b84c1c9..a6082f10 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/StringCarouselTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/TestBoxTests.java b/src/test/java/electrosphere/renderer/ui/elements/TestBoxTests.java index ae1374b6..b562e8d4 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/TestBoxTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/TestInputTests.java b/src/test/java/electrosphere/renderer/ui/elements/TestInputTests.java index 917ff048..698309ca 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/TestInputTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/ToggleInputTests.java b/src/test/java/electrosphere/renderer/ui/elements/ToggleInputTests.java index 99d68649..d84b5fa6 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/ToggleInputTests.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java b/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java index 55a91311..25c5a8c8 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/WindowTest.java +++ b/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; diff --git a/src/test/java/electrosphere/renderer/ui/elements/WordTests.java b/src/test/java/electrosphere/renderer/ui/elements/WordTests.java index 05a95140..d534e922 100644 --- a/src/test/java/electrosphere/renderer/ui/elements/WordTests.java +++ b/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; diff --git a/src/test/java/electrosphere/test/template/UITestTemplate.java b/src/test/java/electrosphere/test/template/UITestTemplate.java index 487e7aca..ea85220c 100644 --- a/src/test/java/electrosphere/test/template/UITestTemplate.java +++ b/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;