From 94a9e316b62f8ff9ff0c5028befdf06f46fd0c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Mon, 22 Mar 2021 15:42:24 +0100 Subject: [PATCH] Refactor :api structure Refactored API structure to following packages: * `api` - contains essential API classes * `lib` - contains ready-to-use snippets implemented on `api` * `util` - contains utility classes * `internal` - contains internal classes that are not supposed to be used by user --- .../com/bartlomiejpluta/base/api/ai/AI.java | 8 +++ .../com/bartlomiejpluta/base/api/ai/NPC.java | 7 +++ .../base/api/animation/Animation.java | 27 ++++++++++ .../animation/AnimationDelegate.java | 18 +++---- .../base/api/camera/Camera.java | 12 +++++ .../base/api/context/Context.java | 53 +++++++++++++++++++ .../base/api/{game => }/entity/Entity.java | 14 ++--- .../api/{game => }/entity/EntityDelegate.java | 16 +++--- .../bartlomiejpluta/base/api/game/ai/AI.java | 8 --- .../bartlomiejpluta/base/api/game/ai/NPC.java | 7 --- .../base/api/game/animation/Animation.java | 27 ---------- .../base/api/game/camera/Camera.java | 12 ----- .../base/api/game/context/Context.java | 53 ------------------- .../base/api/game/gui/base/Paint.java | 4 -- .../api/game/gui/component/Container.java | 4 -- .../base/api/game/map/handler/MapHandler.java | 18 ------- .../base/api/game/map/layer/base/Layer.java | 12 ----- .../game/map/layer/object/PassageAbility.java | 6 --- .../base/api/game/rule/Rule.java | 9 ---- .../base/api/game/runner/GameRunner.java | 13 ----- .../api/{game => }/gui/base/BaseWidget.java | 4 +- .../base/api/{game => }/gui/base/Color.java | 2 +- .../base/api/{game => }/gui/base/GUI.java | 12 ++--- .../base/api/{game => }/gui/base/Image.java | 2 +- .../base/api/{game => }/gui/base/LineCap.java | 2 +- .../base/api/gui/base/Paint.java | 4 ++ .../api/{game => }/gui/base/SizeMode.java | 2 +- .../base/api/{game => }/gui/base/Widget.java | 6 +-- .../{game => }/gui/base/WindingDirection.java | 2 +- .../gui/component/AbsoluteLayout.java | 10 ++-- .../gui/component/BaseComponent.java | 8 +-- .../gui/component/BaseContainer.java | 8 +-- .../gui/component/BorderLayout.java | 10 ++-- .../{game => }/gui/component/Component.java | 4 +- .../gui/component/ComponentWrapper.java | 8 +-- .../base/api/gui/component/Container.java | 4 ++ .../api/{game => }/gui/component/HLayout.java | 8 +-- .../gui/component/HOptionChoice.java | 12 ++--- .../gui/component/HScrollableLayout.java | 18 +++---- .../{game => }/gui/component/ImageView.java | 12 ++--- .../api/{game => }/gui/component/Label.java | 10 ++-- .../api/{game => }/gui/component/VLayout.java | 8 +-- .../gui/component/VOptionChoice.java | 12 ++--- .../gui/component/VScrollableLayout.java | 18 +++---- .../api/{game => }/gui/window/BaseWindow.java | 14 ++--- .../{game => }/gui/window/DisplayMode.java | 2 +- .../api/{game => }/gui/window/Inflatable.java | 2 +- .../base/api/{game => }/gui/window/Ref.java | 2 +- .../api/{game => }/gui/window/Window.java | 6 +-- .../{game => }/gui/window/WindowManager.java | 12 ++--- .../{game => }/gui/window/WindowPosition.java | 2 +- .../base/api/{game => }/image/Image.java | 6 +-- .../base/api/{game => }/input/Input.java | 2 +- .../base/api/{game => }/input/InputEvent.java | 2 +- .../base/api/{game => }/input/Key.java | 2 +- .../base/api/{game => }/input/KeyAction.java | 2 +- .../base/api/{game => }/input/KeyEvent.java | 2 +- .../api/{game => }/input/KeyEventHandler.java | 2 +- .../base/api/internal/render/Renderable.java | 8 --- .../base/api/map/handler/MapHandler.java | 18 +++++++ .../base/api/map/layer/base/Layer.java | 12 +++++ .../map/layer/color/ColorLayer.java | 8 +-- .../map/layer/image/ImageLayer.java | 6 +-- .../map/layer/image/ImageLayerMode.java | 2 +- .../map/layer/object/ObjectLayer.java | 10 ++-- .../api/map/layer/object/PassageAbility.java | 6 +++ .../{game => }/map/layer/tile/TileLayer.java | 4 +- .../api/{game => }/map/model/GameMap.java | 10 ++-- .../base/api/{game => }/move/Direction.java | 2 +- .../base/api/{game => }/move/Movable.java | 2 +- .../base/api/{game => }/move/Movement.java | 2 +- .../base/api/{game => }/rule/BaseRule.java | 4 +- .../bartlomiejpluta/base/api/rule/Rule.java | 9 ++++ .../base/api/runner/GameRunner.java | 13 +++++ .../base/api/{game => }/screen/Screen.java | 2 +- .../snippet/animation/AnimationRunner.java | 9 ---- .../base/api/util/path/PathSegment.java | 8 --- .../base/{api => }/internal/gc/Cleanable.java | 2 +- .../{api => }/internal/gc/Disposable.java | 2 +- .../{api => }/internal/logic/Updatable.java | 2 +- .../{api => }/internal/object/Placeable.java | 2 +- .../base/internal/render/Renderable.java | 8 +++ .../internal/render/ShaderManager.java | 4 +- .../internal/render/ShaderProgram.java | 4 +- .../{api => }/internal/render/Uniform.java | 2 +- .../snippet => lib}/ai/FollowEntityAI.java | 14 ++--- .../{api/snippet => lib}/ai/FollowPathAI.java | 14 ++--- .../base/{api/snippet => lib}/ai/NoopAI.java | 6 +-- .../snippet => lib}/ai/RandomMovementAI.java | 10 ++-- .../base/lib/animation/AnimationRunner.java | 9 ++++ .../animation/DelayedAnimation.java | 12 ++--- .../animation/RandomAnimationsRunner.java | 6 +-- .../animation/SimpleAnimationRunner.java | 10 ++-- .../base/{api => }/util/math/MathUtil.java | 2 +- .../base/{api => }/util/path/MoveSegment.java | 8 +-- .../base/{api => }/util/path/NPCPath.java | 6 +-- .../base/{api => }/util/path/Path.java | 6 +-- .../{api => }/util/path/PathExecutor.java | 6 +-- .../{api => }/util/path/PathProgress.java | 2 +- .../base/util/path/PathSegment.java | 8 +++ .../base/{api => }/util/path/RunSegment.java | 6 +-- .../base/{api => }/util/path/TurnSegment.java | 8 +-- .../base/{api => }/util/path/WaitSegment.java | 6 +-- .../util/pathfinder/AstarPathFinder.java | 4 +- .../{api => }/util/pathfinder/PathFinder.java | 4 +- .../{api => }/util/profiler/FPSProfiler.java | 2 +- .../{api => }/util/profiler/TimeProfiler.java | 2 +- .../resources/java_templates/game_runner.ftl | 8 +-- .../resources/java_templates/map_handler.ftl | 10 ++-- .../context/manager/ContextManager.java | 2 +- .../manager/DefaultContextManager.java | 4 +- .../engine/context/model/DefaultContext.java | 22 ++++---- .../engine/core/engine/DefaultGameEngine.java | 4 +- .../base/engine/core/engine/GameEngine.java | 2 +- .../core/gl/object/material/Material.java | 8 +-- .../base/engine/core/gl/object/mesh/Mesh.java | 10 ++-- .../core/gl/object/texture/Texture.java | 2 +- .../gl/object/texture/TextureManager.java | 2 +- .../core/gl/render/DefaultRenderer.java | 8 +-- .../base/engine/core/gl/render/Renderer.java | 8 +-- .../shader/manager/DefaultShaderManager.java | 6 +-- .../gl/shader/program/GLShaderProgram.java | 4 +- .../gc/DefaultOffHeapGarbageCollector.java | 2 +- .../base/engine/gui/render/NanoVGColor.java | 4 +- .../base/engine/gui/render/NanoVGGUI.java | 16 +++--- .../base/engine/gui/render/NanoVGImage.java | 2 +- .../base/engine/gui/render/NanoVGPaint.java | 4 +- .../base/engine/gui/widget/ScreenWidget.java | 10 ++-- .../gui/xml/inflater/DefaultInflater.java | 18 +++---- .../engine/gui/xml/inflater/Inflater.java | 8 +-- .../base/engine/logic/DefaultGameLogic.java | 8 +-- .../base/engine/logic/GameLogic.java | 6 +-- .../base/engine/ui/event/GLFWKeyEvent.java | 6 +-- .../base/engine/ui/manager/ScreenManager.java | 2 +- .../base/engine/ui/model/GLFWInput.java | 8 +-- .../base/engine/ui/model/GLFWScreen.java | 2 +- .../base/engine/util/mesh/MeshManager.java | 2 +- .../animation/manager/AnimationManager.java | 2 +- .../manager/DefaultAnimationManager.java | 2 +- .../world/animation/model/AnimatedSprite.java | 8 +-- .../animation/model/DefaultAnimation.java | 16 +++--- .../engine/world/camera/DefaultCamera.java | 6 +-- .../config/EntitySpriteConfiguration.java | 2 +- .../entity/manager/DefaultEntityManager.java | 4 +- .../world/entity/manager/EntityManager.java | 4 +- .../world/entity/model/DefaultEntity.java | 10 ++-- .../image/manager/DefaultImageManager.java | 4 +- .../world/image/manager/ImageManager.java | 4 +- .../world/image/model/DefaultImage.java | 2 +- .../world/map/layer/base/BaseLayer.java | 14 ++--- .../map/layer/color/DefaultColorLayer.java | 12 ++--- .../map/layer/image/DefaultImageLayer.java | 14 ++--- .../map/layer/object/DefaultObjectLayer.java | 20 +++---- .../map/layer/tile/DefaultTileLayer.java | 10 ++-- .../world/map/manager/DefaultMapManager.java | 4 +- .../engine/world/map/manager/MapManager.java | 6 +-- .../world/map/model/DefaultGameMap.java | 28 +++++----- .../map/serial/ProtobufMapDeserializer.java | 4 +- .../world/movement/DefaultMovement.java | 4 +- .../engine/world/movement/MovableSprite.java | 10 ++-- .../base/engine/world/object/Model.java | 2 +- .../base/engine/world/object/Sprite.java | 8 +-- .../world/tileset/manager/TileSetManager.java | 2 +- 163 files changed, 642 insertions(+), 642 deletions(-) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/ai/AI.java create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/ai/NPC.java create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/animation/AnimationDelegate.java (88%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/camera/Camera.java create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/entity/Entity.java (54%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/entity/EntityDelegate.java (89%) delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/ai/AI.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/ai/NPC.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/animation/Animation.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/camera/Camera.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Paint.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Container.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/map/handler/MapHandler.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/base/Layer.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/PassageAbility.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/rule/Rule.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/game/runner/GameRunner.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/BaseWidget.java (98%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/Color.java (91%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/GUI.java (89%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/Image.java (56%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/LineCap.java (58%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/SizeMode.java (53%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/Widget.java (90%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/base/WindingDirection.java (57%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/AbsoluteLayout.java (82%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/BaseComponent.java (78%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/BaseContainer.java (91%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/BorderLayout.java (94%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/Component.java (65%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/ComponentWrapper.java (79%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/HLayout.java (79%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/HOptionChoice.java (84%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/HScrollableLayout.java (84%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/ImageView.java (84%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/Label.java (90%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/VLayout.java (79%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/VOptionChoice.java (84%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/component/VScrollableLayout.java (84%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/BaseWindow.java (80%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/DisplayMode.java (53%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/Inflatable.java (61%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/Ref.java (83%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/Window.java (65%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/WindowManager.java (92%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/gui/window/WindowPosition.java (72%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/image/Image.java (57%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/input/Input.java (77%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/input/InputEvent.java (61%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/input/Key.java (97%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/input/KeyAction.java (54%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/input/KeyEvent.java (65%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/input/KeyEventHandler.java (61%) delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Renderable.java create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/map/handler/MapHandler.java create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/map/layer/color/ColorLayer.java (55%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/map/layer/image/ImageLayer.java (61%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/map/layer/image/ImageLayerMode.java (53%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/map/layer/object/ObjectLayer.java (65%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/PassageAbility.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/map/layer/tile/TileLayer.java (63%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/map/model/GameMap.java (53%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/move/Direction.java (96%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/move/Movable.java (90%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/move/Movement.java (79%) rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/rule/BaseRule.java (84%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/rule/Rule.java create mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/runner/GameRunner.java rename api/src/main/java/com/bartlomiejpluta/base/api/{game => }/screen/Screen.java (87%) delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/AnimationRunner.java delete mode 100644 api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathSegment.java rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/gc/Cleanable.java (50%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/gc/Disposable.java (50%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/logic/Updatable.java (52%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/object/Placeable.java (92%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/internal/render/Renderable.java rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/render/ShaderManager.java (92%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/render/ShaderProgram.java (89%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/internal/render/Uniform.java (76%) rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/ai/FollowEntityAI.java (76%) rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/ai/FollowPathAI.java (72%) rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/ai/NoopAI.java (52%) rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/ai/RandomMovementAI.java (75%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationRunner.java rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/animation/DelayedAnimation.java (62%) rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/animation/RandomAnimationsRunner.java (96%) rename api/src/main/java/com/bartlomiejpluta/base/{api/snippet => lib}/animation/SimpleAnimationRunner.java (89%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/math/MathUtil.java (92%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/MoveSegment.java (78%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/NPCPath.java (51%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/Path.java (83%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/PathExecutor.java (86%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/PathProgress.java (67%) create mode 100644 api/src/main/java/com/bartlomiejpluta/base/util/path/PathSegment.java rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/RunSegment.java (70%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/TurnSegment.java (65%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/path/WaitSegment.java (73%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/pathfinder/AstarPathFinder.java (98%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/pathfinder/PathFinder.java (58%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/profiler/FPSProfiler.java (97%) rename api/src/main/java/com/bartlomiejpluta/base/{api => }/util/profiler/TimeProfiler.java (95%) diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/ai/AI.java b/api/src/main/java/com/bartlomiejpluta/base/api/ai/AI.java new file mode 100644 index 00000000..b5971866 --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/ai/AI.java @@ -0,0 +1,8 @@ +package com.bartlomiejpluta.base.api.ai; + +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; + +@FunctionalInterface +public interface AI { + void nextActivity(ObjectLayer layer, float dt); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/ai/NPC.java b/api/src/main/java/com/bartlomiejpluta/base/api/ai/NPC.java new file mode 100644 index 00000000..44d96e49 --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/ai/NPC.java @@ -0,0 +1,7 @@ +package com.bartlomiejpluta.base.api.ai; + +import com.bartlomiejpluta.base.api.entity.Entity; + +public interface NPC extends Entity { + AI getStrategy(); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java b/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java new file mode 100644 index 00000000..b3e4331c --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/animation/Animation.java @@ -0,0 +1,27 @@ +package com.bartlomiejpluta.base.api.animation; + +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.move.Movable; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.Renderable; +import com.bartlomiejpluta.base.util.path.Path; + +public interface Animation extends Placeable, Movable, Renderable, Updatable { + + void setAnimationSpeed(float speed); + + Integer getRepeat(); + + void setRepeat(Integer repeat); + + void followPath(Path path, Integer repeat, boolean finishOnEnd, boolean finishOnFail); + + void onAdd(Layer layer); + + void onFinish(Layer layer); + + void finish(); + + boolean finished(); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/animation/AnimationDelegate.java b/api/src/main/java/com/bartlomiejpluta/base/api/animation/AnimationDelegate.java similarity index 88% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/animation/AnimationDelegate.java rename to api/src/main/java/com/bartlomiejpluta/base/api/animation/AnimationDelegate.java index 88fb9706..b9150c6e 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/animation/AnimationDelegate.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/animation/AnimationDelegate.java @@ -1,13 +1,13 @@ -package com.bartlomiejpluta.base.api.game.animation; +package com.bartlomiejpluta.base.api.animation; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movement; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; -import com.bartlomiejpluta.base.api.util.path.Path; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movement; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; +import com.bartlomiejpluta.base.util.path.Path; import org.joml.Matrix4fc; import org.joml.Vector2fc; import org.joml.Vector2ic; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/camera/Camera.java b/api/src/main/java/com/bartlomiejpluta/base/api/camera/Camera.java new file mode 100644 index 00000000..09251732 --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/camera/Camera.java @@ -0,0 +1,12 @@ +package com.bartlomiejpluta.base.api.camera; + +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; +import org.joml.Matrix4fc; + +public interface Camera extends Placeable { + Matrix4fc computeViewModelMatrix(Matrix4fc modelMatrix); + + void render(Screen screen, ShaderManager shaderManager); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java new file mode 100644 index 00000000..ffdff2ac --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/context/Context.java @@ -0,0 +1,53 @@ +package com.bartlomiejpluta.base.api.context; + +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.image.Image; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.runner.GameRunner; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.gc.Disposable; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.render.Renderable; + +public interface Context extends Updatable, Renderable, Disposable { + GameRunner getGameRunner(); + + Screen getScreen(); + + Camera getCamera(); + + Input getInput(); + + String getProjectName(); + + void openMap(String mapUid); + + void closeMap(); + + Entity createEntity(String entitySetUid); + + Animation createAnimation(String animationUid); + + Image getImage(String imageUid); + + GUI newGUI(); + + boolean isRunning(); + + void close(); + + boolean isPaused(); + + void pause(); + + void resume(); + + boolean togglePause(); + + void init(Screen screen, Input input, Camera camera); + + void input(Input input); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Entity.java b/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java similarity index 54% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Entity.java rename to api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java index 460c22c4..c9027120 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/entity/Entity.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/entity/Entity.java @@ -1,11 +1,11 @@ -package com.bartlomiejpluta.base.api.game.entity; +package com.bartlomiejpluta.base.api.entity; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movable; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movable; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.Renderable; public interface Entity extends Placeable, Movable, Renderable, Updatable { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/entity/EntityDelegate.java b/api/src/main/java/com/bartlomiejpluta/base/api/entity/EntityDelegate.java similarity index 89% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/entity/EntityDelegate.java rename to api/src/main/java/com/bartlomiejpluta/base/api/entity/EntityDelegate.java index 9fbc2036..9f295200 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/entity/EntityDelegate.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/entity/EntityDelegate.java @@ -1,12 +1,12 @@ -package com.bartlomiejpluta.base.api.game.entity; +package com.bartlomiejpluta.base.api.entity; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movement; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movement; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import org.joml.Matrix4fc; import org.joml.Vector2fc; import org.joml.Vector2ic; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/ai/AI.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/ai/AI.java deleted file mode 100644 index 16bb3945..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/ai/AI.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bartlomiejpluta.base.api.game.ai; - -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; - -@FunctionalInterface -public interface AI { - void nextActivity(ObjectLayer layer, float dt); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/ai/NPC.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/ai/NPC.java deleted file mode 100644 index e9ef101c..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/ai/NPC.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bartlomiejpluta.base.api.game.ai; - -import com.bartlomiejpluta.base.api.game.entity.Entity; - -public interface NPC extends Entity { - AI getStrategy(); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/animation/Animation.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/animation/Animation.java deleted file mode 100644 index 00931735..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/animation/Animation.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.bartlomiejpluta.base.api.game.animation; - -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.game.move.Movable; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; -import com.bartlomiejpluta.base.api.util.path.Path; - -public interface Animation extends Placeable, Movable, Renderable, Updatable { - - void setAnimationSpeed(float speed); - - Integer getRepeat(); - - void setRepeat(Integer repeat); - - void followPath(Path path, Integer repeat, boolean finishOnEnd, boolean finishOnFail); - - void onAdd(Layer layer); - - void onFinish(Layer layer); - - void finish(); - - boolean finished(); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/camera/Camera.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/camera/Camera.java deleted file mode 100644 index a74c798e..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/camera/Camera.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bartlomiejpluta.base.api.game.camera; - -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; -import org.joml.Matrix4fc; - -public interface Camera extends Placeable { - Matrix4fc computeViewModelMatrix(Matrix4fc modelMatrix); - - void render(Screen screen, ShaderManager shaderManager); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java deleted file mode 100644 index e1514d61..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.bartlomiejpluta.base.api.game.context; - -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.runner.GameRunner; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; - -public interface Context extends Updatable, Renderable, Disposable { - GameRunner getGameRunner(); - - Screen getScreen(); - - Camera getCamera(); - - Input getInput(); - - String getProjectName(); - - void openMap(String mapUid); - - void closeMap(); - - Entity createEntity(String entitySetUid); - - Animation createAnimation(String animationUid); - - Image getImage(String imageUid); - - GUI newGUI(); - - boolean isRunning(); - - void close(); - - boolean isPaused(); - - void pause(); - - void resume(); - - boolean togglePause(); - - void init(Screen screen, Input input, Camera camera); - - void input(Input input); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Paint.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Paint.java deleted file mode 100644 index 3b57b486..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Paint.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bartlomiejpluta.base.api.game.gui.base; - -public interface Paint { -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Container.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Container.java deleted file mode 100644 index b03c1fe2..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Container.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bartlomiejpluta.base.api.game.gui.component; - -public interface Container extends Component { -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/handler/MapHandler.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/map/handler/MapHandler.java deleted file mode 100644 index eebd5643..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/handler/MapHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bartlomiejpluta.base.api.game.map.handler; - -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.screen.Screen; - -public interface MapHandler { - void onCreate(Context context, GameMap map); - - void onOpen(Context context, GameMap map); - - void input(Input input); - - void update(Context context, GameMap map, float dt); - - void postRender(Screen screen); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/base/Layer.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/base/Layer.java deleted file mode 100644 index 3412d777..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/base/Layer.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bartlomiejpluta.base.api.game.map.layer.base; - -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; - -public interface Layer extends Renderable, Updatable { - GameMap getMap(); - - void pushAnimation(Animation animation); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/PassageAbility.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/PassageAbility.java deleted file mode 100644 index 98fecb39..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/PassageAbility.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bartlomiejpluta.base.api.game.map.layer.object; - -public enum PassageAbility { - BLOCK, - ALLOW -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/rule/Rule.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/rule/Rule.java deleted file mode 100644 index 6c20dfb7..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/rule/Rule.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bartlomiejpluta.base.api.game.rule; - -import com.bartlomiejpluta.base.api.game.entity.Entity; - -public interface Rule { - boolean when(Entity entity); - - void then(Entity entity); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/runner/GameRunner.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/runner/GameRunner.java deleted file mode 100644 index 858dcb68..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/runner/GameRunner.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bartlomiejpluta.base.api.game.runner; - -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; - -public interface GameRunner extends Disposable { - void init(Context context); - - void input(Input input); - - void update(float dt); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/BaseWidget.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/BaseWidget.java similarity index 98% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/BaseWidget.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/BaseWidget.java index e7cee78f..b4245f94 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/BaseWidget.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/BaseWidget.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; +import com.bartlomiejpluta.base.api.input.KeyEvent; public abstract class BaseWidget implements Widget { protected Widget parent; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Color.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Color.java similarity index 91% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Color.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Color.java index cf498399..3ef48687 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Color.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Color.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; public interface Color { void setRGB(float red, float green, float blue); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/GUI.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/GUI.java similarity index 89% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/GUI.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/GUI.java index 2cae68d6..05f2d347 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/GUI.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/GUI.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; -import com.bartlomiejpluta.base.api.game.gui.component.Component; -import com.bartlomiejpluta.base.api.game.gui.window.Window; -import com.bartlomiejpluta.base.api.game.input.KeyEventHandler; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; +import com.bartlomiejpluta.base.api.gui.component.Component; +import com.bartlomiejpluta.base.api.gui.window.Window; +import com.bartlomiejpluta.base.api.input.KeyEventHandler; +import com.bartlomiejpluta.base.internal.gc.Disposable; +import com.bartlomiejpluta.base.internal.render.Renderable; public interface GUI extends Renderable, Disposable, KeyEventHandler { int ALIGN_LEFT = 1 << 0; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Image.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Image.java similarity index 56% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Image.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Image.java index be3a63bc..923c6685 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Image.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Image.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; public interface Image { int getWidth(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/LineCap.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/LineCap.java similarity index 58% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/LineCap.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/LineCap.java index e4ca53d3..3ca611c2 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/LineCap.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/LineCap.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; public enum LineCap { BUTT, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java new file mode 100644 index 00000000..614d4229 --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Paint.java @@ -0,0 +1,4 @@ +package com.bartlomiejpluta.base.api.gui.base; + +public interface Paint { +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/SizeMode.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/SizeMode.java similarity index 53% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/SizeMode.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/SizeMode.java index 9dbdced4..32c3b267 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/SizeMode.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/SizeMode.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; public enum SizeMode { AUTO, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Widget.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Widget.java similarity index 90% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Widget.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Widget.java index d239a64d..34ca16d3 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/Widget.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/Widget.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; -import com.bartlomiejpluta.base.api.game.input.KeyEventHandler; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.input.KeyEventHandler; +import com.bartlomiejpluta.base.api.screen.Screen; public interface Widget extends KeyEventHandler { Widget getParent(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/WindingDirection.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/WindingDirection.java similarity index 57% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/WindingDirection.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/base/WindingDirection.java index 6afb20db..21fb1229 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/base/WindingDirection.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/base/WindingDirection.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.base; +package com.bartlomiejpluta.base.api.gui.base; public enum WindingDirection { CLOCKWISE, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/AbsoluteLayout.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/AbsoluteLayout.java similarity index 82% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/AbsoluteLayout.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/AbsoluteLayout.java index 0dccf31d..056932e4 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/AbsoluteLayout.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/AbsoluteLayout.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.screen.Screen; public class AbsoluteLayout extends BaseContainer { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BaseComponent.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseComponent.java similarity index 78% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BaseComponent.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseComponent.java index b8d26cfe..a0f5fe17 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BaseComponent.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseComponent.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.BaseWidget; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.BaseWidget; +import com.bartlomiejpluta.base.api.gui.base.GUI; import static java.util.Collections.emptyList; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BaseContainer.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseContainer.java similarity index 91% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BaseContainer.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseContainer.java index 694d4aaa..7b2f5a04 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BaseContainer.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BaseContainer.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.input.KeyEvent; import java.util.LinkedList; import java.util.List; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BorderLayout.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BorderLayout.java similarity index 94% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BorderLayout.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BorderLayout.java index 2f1fd8db..6fb31866 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/BorderLayout.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/BorderLayout.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.screen.Screen; public class BorderLayout extends BaseContainer { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Component.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Component.java similarity index 65% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Component.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Component.java index 7c126007..39d8a8cf 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Component.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Component.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.gui.base.Widget; +import com.bartlomiejpluta.base.api.gui.base.Widget; public interface Component extends Widget { Iterable getChildren(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/ComponentWrapper.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ComponentWrapper.java similarity index 79% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/ComponentWrapper.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ComponentWrapper.java index aeff9855..5569f105 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/ComponentWrapper.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ComponentWrapper.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.screen.Screen; import static java.util.Objects.requireNonNull; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java new file mode 100644 index 00000000..3214fc4a --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Container.java @@ -0,0 +1,4 @@ +package com.bartlomiejpluta.base.api.gui.component; + +public interface Container extends Component { +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HLayout.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HLayout.java similarity index 79% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HLayout.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HLayout.java index f67b765a..fce4cb03 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HLayout.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HLayout.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.screen.Screen; public class HLayout extends BaseContainer { protected float offsetX = 0.0f; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HOptionChoice.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HOptionChoice.java similarity index 84% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HOptionChoice.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HOptionChoice.java index 41d55144..b22c6fbc 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HOptionChoice.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HOptionChoice.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.input.Key; -import com.bartlomiejpluta.base.api.game.input.KeyAction; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.input.Key; +import com.bartlomiejpluta.base.api.input.KeyAction; +import com.bartlomiejpluta.base.api.input.KeyEvent; import java.util.EnumSet; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HScrollableLayout.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HScrollableLayout.java similarity index 84% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HScrollableLayout.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HScrollableLayout.java index 46b729d9..26847e40 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/HScrollableLayout.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/HScrollableLayout.java @@ -1,14 +1,14 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.input.Key; -import com.bartlomiejpluta.base.api.game.input.KeyAction; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.input.Key; +import com.bartlomiejpluta.base.api.input.KeyAction; +import com.bartlomiejpluta.base.api.input.KeyEvent; +import com.bartlomiejpluta.base.api.screen.Screen; -import static com.bartlomiejpluta.base.api.util.math.MathUtil.clamp; +import static com.bartlomiejpluta.base.util.math.MathUtil.clamp; import static java.lang.Math.*; public class HScrollableLayout extends HLayout { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/ImageView.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ImageView.java similarity index 84% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/ImageView.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ImageView.java index d502e7ea..a8e45029 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/ImageView.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/ImageView.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.Image; -import com.bartlomiejpluta.base.api.game.gui.base.Paint; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.Image; +import com.bartlomiejpluta.base.api.gui.base.Paint; +import com.bartlomiejpluta.base.api.screen.Screen; public class ImageView extends BaseComponent { private final Paint paint; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Label.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Label.java similarity index 90% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Label.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Label.java index c42269ae..22d75b8d 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/Label.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/Label.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.Color; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.Color; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.screen.Screen; import static java.util.Objects.requireNonNull; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VLayout.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VLayout.java similarity index 79% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VLayout.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VLayout.java index 5b111fe9..03caf795 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VLayout.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VLayout.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.screen.Screen; public class VLayout extends BaseContainer { protected float offsetX = 0.0f; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VOptionChoice.java similarity index 84% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VOptionChoice.java index 1ff5860c..d6f50580 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VOptionChoice.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.input.Key; -import com.bartlomiejpluta.base.api.game.input.KeyAction; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.input.Key; +import com.bartlomiejpluta.base.api.input.KeyAction; +import com.bartlomiejpluta.base.api.input.KeyEvent; import java.util.EnumSet; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VScrollableLayout.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VScrollableLayout.java similarity index 84% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VScrollableLayout.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VScrollableLayout.java index 79fefbb2..1398a603 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VScrollableLayout.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/component/VScrollableLayout.java @@ -1,14 +1,14 @@ -package com.bartlomiejpluta.base.api.game.gui.component; +package com.bartlomiejpluta.base.api.gui.component; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.input.Key; -import com.bartlomiejpluta.base.api.game.input.KeyAction; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.input.Key; +import com.bartlomiejpluta.base.api.input.KeyAction; +import com.bartlomiejpluta.base.api.input.KeyEvent; +import com.bartlomiejpluta.base.api.screen.Screen; -import static com.bartlomiejpluta.base.api.util.math.MathUtil.clamp; +import static com.bartlomiejpluta.base.util.math.MathUtil.clamp; import static java.lang.Math.*; public class VScrollableLayout extends VLayout { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/BaseWindow.java similarity index 80% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/BaseWindow.java index a12774d8..6943d1e2 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/BaseWindow.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/BaseWindow.java @@ -1,11 +1,11 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.BaseWidget; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.component.Component; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.BaseWidget; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.component.Component; +import com.bartlomiejpluta.base.api.input.KeyEvent; +import com.bartlomiejpluta.base.api.screen.Screen; import static java.util.Objects.requireNonNull; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DisplayMode.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/DisplayMode.java similarity index 53% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DisplayMode.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/DisplayMode.java index b657b39f..f8abacfe 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/DisplayMode.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/DisplayMode.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; public enum DisplayMode { DISPLAY_STACK, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Inflatable.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Inflatable.java similarity index 61% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Inflatable.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Inflatable.java index 4e2e04dd..76f4a428 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Inflatable.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Inflatable.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; public interface Inflatable { default void onInflate() { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Ref.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Ref.java similarity index 83% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Ref.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Ref.java index 7d826c96..81f9eb79 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Ref.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Ref.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Window.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Window.java similarity index 65% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Window.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Window.java index 99811cd2..0732a2b6 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/Window.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/Window.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; -import com.bartlomiejpluta.base.api.game.gui.base.Widget; -import com.bartlomiejpluta.base.api.game.gui.component.Component; +import com.bartlomiejpluta.base.api.gui.base.Widget; +import com.bartlomiejpluta.base.api.gui.component.Component; public interface Window extends Widget { void setContent(Component component); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/WindowManager.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowManager.java similarity index 92% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/WindowManager.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowManager.java index 40c63c3c..127beb16 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/WindowManager.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowManager.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; -import com.bartlomiejpluta.base.api.game.gui.base.BaseWidget; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.gui.base.BaseWidget; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.input.KeyEvent; +import com.bartlomiejpluta.base.api.screen.Screen; import java.util.Deque; import java.util.LinkedList; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/WindowPosition.java b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowPosition.java similarity index 72% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/WindowPosition.java rename to api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowPosition.java index 3ae18e31..cfa01dcb 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/window/WindowPosition.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/gui/window/WindowPosition.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.gui.window; +package com.bartlomiejpluta.base.api.gui.window; public enum WindowPosition { TOP, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/image/Image.java b/api/src/main/java/com/bartlomiejpluta/base/api/image/Image.java similarity index 57% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/image/Image.java rename to api/src/main/java/com/bartlomiejpluta/base/api/image/Image.java index d3f89334..ddfb60d6 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/image/Image.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/image/Image.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.game.image; +package com.bartlomiejpluta.base.api.image; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.Renderable; public interface Image extends Placeable, Renderable { int getPrimaryWidth(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/Input.java b/api/src/main/java/com/bartlomiejpluta/base/api/input/Input.java similarity index 77% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/input/Input.java rename to api/src/main/java/com/bartlomiejpluta/base/api/input/Input.java index 356e3bfa..ad06a6a9 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/Input.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/input/Input.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.input; +package com.bartlomiejpluta.base.api.input; public interface Input { boolean isKeyPressed(Key key); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/InputEvent.java b/api/src/main/java/com/bartlomiejpluta/base/api/input/InputEvent.java similarity index 61% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/input/InputEvent.java rename to api/src/main/java/com/bartlomiejpluta/base/api/input/InputEvent.java index 5d9c7e49..cbb7037b 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/InputEvent.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/input/InputEvent.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.input; +package com.bartlomiejpluta.base.api.input; public interface InputEvent { boolean isConsumed(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/Key.java b/api/src/main/java/com/bartlomiejpluta/base/api/input/Key.java similarity index 97% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/input/Key.java rename to api/src/main/java/com/bartlomiejpluta/base/api/input/Key.java index 01175f4e..b6983ee1 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/Key.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/input/Key.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.input; +package com.bartlomiejpluta.base.api.input; public enum Key { KEY_SPACE, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyAction.java b/api/src/main/java/com/bartlomiejpluta/base/api/input/KeyAction.java similarity index 54% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyAction.java rename to api/src/main/java/com/bartlomiejpluta/base/api/input/KeyAction.java index 7a2e816c..b77285b3 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyAction.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/input/KeyAction.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.input; +package com.bartlomiejpluta.base.api.input; public enum KeyAction { PRESS, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyEvent.java b/api/src/main/java/com/bartlomiejpluta/base/api/input/KeyEvent.java similarity index 65% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyEvent.java rename to api/src/main/java/com/bartlomiejpluta/base/api/input/KeyEvent.java index 2378dc81..968a9020 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyEvent.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/input/KeyEvent.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.input; +package com.bartlomiejpluta.base.api.input; public interface KeyEvent extends InputEvent { Key getKey(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyEventHandler.java b/api/src/main/java/com/bartlomiejpluta/base/api/input/KeyEventHandler.java similarity index 61% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyEventHandler.java rename to api/src/main/java/com/bartlomiejpluta/base/api/input/KeyEventHandler.java index f0fb16a1..1a24eb7b 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/input/KeyEventHandler.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/input/KeyEventHandler.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.input; +package com.bartlomiejpluta.base.api.input; public interface KeyEventHandler { void handleKeyEvent(KeyEvent event); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Renderable.java b/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Renderable.java deleted file mode 100644 index 2ad0971a..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Renderable.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bartlomiejpluta.base.api.internal.render; - -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; - -public interface Renderable { - void render(Screen screen, Camera camera, ShaderManager shaderManager); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/map/handler/MapHandler.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/handler/MapHandler.java new file mode 100644 index 00000000..00be62da --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/handler/MapHandler.java @@ -0,0 +1,18 @@ +package com.bartlomiejpluta.base.api.map.handler; + +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.screen.Screen; + +public interface MapHandler { + void onCreate(Context context, GameMap map); + + void onOpen(Context context, GameMap map); + + void input(Input input); + + void update(Context context, GameMap map, float dt); + + void postRender(Screen screen); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java new file mode 100644 index 00000000..2a1bfe77 --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/base/Layer.java @@ -0,0 +1,12 @@ +package com.bartlomiejpluta.base.api.map.layer.base; + +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.render.Renderable; + +public interface Layer extends Renderable, Updatable { + GameMap getMap(); + + void pushAnimation(Animation animation); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/color/ColorLayer.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/color/ColorLayer.java similarity index 55% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/color/ColorLayer.java rename to api/src/main/java/com/bartlomiejpluta/base/api/map/layer/color/ColorLayer.java index a0472f1e..cc3963ce 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/color/ColorLayer.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/color/ColorLayer.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.game.map.layer.color; +package com.bartlomiejpluta.base.api.map.layer.color; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.Renderable; public interface ColorLayer extends Placeable, Renderable, Layer { void setColor(float red, float green, float blue, float alpha); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/image/ImageLayer.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/image/ImageLayer.java similarity index 61% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/image/ImageLayer.java rename to api/src/main/java/com/bartlomiejpluta/base/api/map/layer/image/ImageLayer.java index 5d352552..6425d491 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/image/ImageLayer.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/image/ImageLayer.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.game.map.layer.image; +package com.bartlomiejpluta.base.api.map.layer.image; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.image.Image; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; public interface ImageLayer extends Layer { void setImage(Image image); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/image/ImageLayerMode.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/image/ImageLayerMode.java similarity index 53% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/image/ImageLayerMode.java rename to api/src/main/java/com/bartlomiejpluta/base/api/map/layer/image/ImageLayerMode.java index 0b1b4d7f..0f174a23 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/image/ImageLayerMode.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/image/ImageLayerMode.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.map.layer.image; +package com.bartlomiejpluta.base.api.map.layer.image; public enum ImageLayerMode { NORMAL, diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/ObjectLayer.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/ObjectLayer.java similarity index 65% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/ObjectLayer.java rename to api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/ObjectLayer.java index 99057f04..a7fc2f0f 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/object/ObjectLayer.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/ObjectLayer.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.game.map.layer.object; +package com.bartlomiejpluta.base.api.map.layer.object; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.game.move.Movement; -import com.bartlomiejpluta.base.api.game.rule.Rule; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.move.Movement; +import com.bartlomiejpluta.base.api.rule.Rule; import org.joml.Vector2ic; import java.util.List; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/PassageAbility.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/PassageAbility.java new file mode 100644 index 00000000..13e265ed --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/object/PassageAbility.java @@ -0,0 +1,6 @@ +package com.bartlomiejpluta.base.api.map.layer.object; + +public enum PassageAbility { + BLOCK, + ALLOW +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/tile/TileLayer.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/tile/TileLayer.java similarity index 63% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/tile/TileLayer.java rename to api/src/main/java/com/bartlomiejpluta/base/api/map/layer/tile/TileLayer.java index efe07834..4e3fdc59 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/layer/tile/TileLayer.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/layer/tile/TileLayer.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.game.map.layer.tile; +package com.bartlomiejpluta.base.api.map.layer.tile; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; public interface TileLayer extends Layer { void setTile(int row, int column, int tileId); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/model/GameMap.java b/api/src/main/java/com/bartlomiejpluta/base/api/map/model/GameMap.java similarity index 53% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/map/model/GameMap.java rename to api/src/main/java/com/bartlomiejpluta/base/api/map/model/GameMap.java index 1047ef08..49a6ca4c 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/map/model/GameMap.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/map/model/GameMap.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.game.map.model; +package com.bartlomiejpluta.base.api.map.model; -import com.bartlomiejpluta.base.api.game.map.layer.color.ColorLayer; -import com.bartlomiejpluta.base.api.game.map.layer.image.ImageLayer; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.map.layer.tile.TileLayer; +import com.bartlomiejpluta.base.api.map.layer.color.ColorLayer; +import com.bartlomiejpluta.base.api.map.layer.image.ImageLayer; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.map.layer.tile.TileLayer; import org.joml.Vector2fc; public interface GameMap { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/move/Direction.java b/api/src/main/java/com/bartlomiejpluta/base/api/move/Direction.java similarity index 96% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/move/Direction.java rename to api/src/main/java/com/bartlomiejpluta/base/api/move/Direction.java index 036b5da3..cd24f39e 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/move/Direction.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/move/Direction.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.move; +package com.bartlomiejpluta.base.api.move; import org.joml.Vector2i; import org.joml.Vector2ic; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movable.java b/api/src/main/java/com/bartlomiejpluta/base/api/move/Movable.java similarity index 90% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movable.java rename to api/src/main/java/com/bartlomiejpluta/base/api/move/Movable.java index 0625e21b..34603827 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movable.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/move/Movable.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.move; +package com.bartlomiejpluta.base.api.move; import org.joml.Vector2fc; import org.joml.Vector2ic; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movement.java b/api/src/main/java/com/bartlomiejpluta/base/api/move/Movement.java similarity index 79% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movement.java rename to api/src/main/java/com/bartlomiejpluta/base/api/move/Movement.java index e9f4333f..9b1d83fa 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/move/Movement.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/move/Movement.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.move; +package com.bartlomiejpluta.base.api.move; import org.joml.Vector2ic; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/rule/BaseRule.java b/api/src/main/java/com/bartlomiejpluta/base/api/rule/BaseRule.java similarity index 84% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/rule/BaseRule.java rename to api/src/main/java/com/bartlomiejpluta/base/api/rule/BaseRule.java index d104a3da..3797d771 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/rule/BaseRule.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/rule/BaseRule.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.game.rule; +package com.bartlomiejpluta.base.api.rule; -import com.bartlomiejpluta.base.api.game.entity.Entity; +import com.bartlomiejpluta.base.api.entity.Entity; import java.util.HashSet; import java.util.Set; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/rule/Rule.java b/api/src/main/java/com/bartlomiejpluta/base/api/rule/Rule.java new file mode 100644 index 00000000..8620d9fa --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/rule/Rule.java @@ -0,0 +1,9 @@ +package com.bartlomiejpluta.base.api.rule; + +import com.bartlomiejpluta.base.api.entity.Entity; + +public interface Rule { + boolean when(Entity entity); + + void then(Entity entity); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/runner/GameRunner.java b/api/src/main/java/com/bartlomiejpluta/base/api/runner/GameRunner.java new file mode 100644 index 00000000..4356e2af --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/api/runner/GameRunner.java @@ -0,0 +1,13 @@ +package com.bartlomiejpluta.base.api.runner; + +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.internal.gc.Disposable; + +public interface GameRunner extends Disposable { + void init(Context context); + + void input(Input input); + + void update(float dt); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/screen/Screen.java b/api/src/main/java/com/bartlomiejpluta/base/api/screen/Screen.java similarity index 87% rename from api/src/main/java/com/bartlomiejpluta/base/api/game/screen/Screen.java rename to api/src/main/java/com/bartlomiejpluta/base/api/screen/Screen.java index 710fb2fb..f96b257d 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/screen/Screen.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/screen/Screen.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.game.screen; +package com.bartlomiejpluta.base.api.screen; import org.joml.Vector2fc; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/AnimationRunner.java b/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/AnimationRunner.java deleted file mode 100644 index 95333e8f..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/AnimationRunner.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bartlomiejpluta.base.api.snippet.animation; - -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import org.joml.Vector2fc; - -public interface AnimationRunner { - void run(Context context, Layer layer, Vector2fc origin); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathSegment.java b/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathSegment.java deleted file mode 100644 index 4fbb0ff5..00000000 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathSegment.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bartlomiejpluta.base.api.util.path; - -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Movable; - -public interface PathSegment { - PathProgress perform(T movable, ObjectLayer layer, float dt); -} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/gc/Cleanable.java b/api/src/main/java/com/bartlomiejpluta/base/internal/gc/Cleanable.java similarity index 50% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/gc/Cleanable.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/gc/Cleanable.java index 19527dcc..7cb869d3 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/gc/Cleanable.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/gc/Cleanable.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.internal.gc; +package com.bartlomiejpluta.base.internal.gc; public interface Cleanable { void cleanUp(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/gc/Disposable.java b/api/src/main/java/com/bartlomiejpluta/base/internal/gc/Disposable.java similarity index 50% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/gc/Disposable.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/gc/Disposable.java index 8a48aef5..956ca8f7 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/gc/Disposable.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/gc/Disposable.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.internal.gc; +package com.bartlomiejpluta.base.internal.gc; public interface Disposable { void dispose(); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/logic/Updatable.java b/api/src/main/java/com/bartlomiejpluta/base/internal/logic/Updatable.java similarity index 52% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/logic/Updatable.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/logic/Updatable.java index 068faa73..0a74abcc 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/logic/Updatable.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/logic/Updatable.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.internal.logic; +package com.bartlomiejpluta.base.internal.logic; public interface Updatable { void update(float dt); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/object/Placeable.java b/api/src/main/java/com/bartlomiejpluta/base/internal/object/Placeable.java similarity index 92% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/object/Placeable.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/object/Placeable.java index 1d697dac..ad31af0e 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/object/Placeable.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/object/Placeable.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.internal.object; +package com.bartlomiejpluta.base.internal.object; import org.joml.Matrix4fc; import org.joml.Vector2fc; diff --git a/api/src/main/java/com/bartlomiejpluta/base/internal/render/Renderable.java b/api/src/main/java/com/bartlomiejpluta/base/internal/render/Renderable.java new file mode 100644 index 00000000..e5a0fa4d --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/render/Renderable.java @@ -0,0 +1,8 @@ +package com.bartlomiejpluta.base.internal.render; + +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; + +public interface Renderable { + void render(Screen screen, Camera camera, ShaderManager shaderManager); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/ShaderManager.java b/api/src/main/java/com/bartlomiejpluta/base/internal/render/ShaderManager.java similarity index 92% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/render/ShaderManager.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/render/ShaderManager.java index c5fbde95..1a7cdaac 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/ShaderManager.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/render/ShaderManager.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.internal.render; +package com.bartlomiejpluta.base.internal.render; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.internal.gc.Cleanable; import org.joml.*; public interface ShaderManager extends Cleanable { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/ShaderProgram.java b/api/src/main/java/com/bartlomiejpluta/base/internal/render/ShaderProgram.java similarity index 89% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/render/ShaderProgram.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/render/ShaderProgram.java index 0a2aefc8..e8efe74d 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/ShaderProgram.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/render/ShaderProgram.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.internal.render; +package com.bartlomiejpluta.base.internal.render; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; +import com.bartlomiejpluta.base.internal.gc.Disposable; import org.joml.*; public interface ShaderProgram extends Disposable { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Uniform.java b/api/src/main/java/com/bartlomiejpluta/base/internal/render/Uniform.java similarity index 76% rename from api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Uniform.java rename to api/src/main/java/com/bartlomiejpluta/base/internal/render/Uniform.java index ea6b1ea3..e29db556 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Uniform.java +++ b/api/src/main/java/com/bartlomiejpluta/base/internal/render/Uniform.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.internal.render; +package com.bartlomiejpluta.base.internal.render; public interface Uniform { void createUniform(ShaderProgram shaderProgram, String uniformName); diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowEntityAI.java b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowEntityAI.java similarity index 76% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowEntityAI.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowEntityAI.java index ebcbb8b2..c598bb2f 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowEntityAI.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowEntityAI.java @@ -1,11 +1,11 @@ -package com.bartlomiejpluta.base.api.snippet.ai; +package com.bartlomiejpluta.base.lib.ai; -import com.bartlomiejpluta.base.api.game.ai.AI; -import com.bartlomiejpluta.base.api.game.ai.NPC; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.util.pathfinder.PathFinder; +import com.bartlomiejpluta.base.api.ai.AI; +import com.bartlomiejpluta.base.api.ai.NPC; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.util.pathfinder.PathFinder; import org.joml.Vector2i; public class FollowEntityAI implements AI { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowPathAI.java b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowPathAI.java similarity index 72% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowPathAI.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowPathAI.java index 42987acf..c7c90b3f 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/FollowPathAI.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowPathAI.java @@ -1,11 +1,11 @@ -package com.bartlomiejpluta.base.api.snippet.ai; +package com.bartlomiejpluta.base.lib.ai; -import com.bartlomiejpluta.base.api.game.ai.AI; -import com.bartlomiejpluta.base.api.game.ai.NPC; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.util.path.NPCPath; -import com.bartlomiejpluta.base.api.util.path.PathExecutor; +import com.bartlomiejpluta.base.api.ai.AI; +import com.bartlomiejpluta.base.api.ai.NPC; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.util.path.NPCPath; +import com.bartlomiejpluta.base.util.path.PathExecutor; public class FollowPathAI implements AI { private final PathExecutor executor; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/NoopAI.java b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/NoopAI.java similarity index 52% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/NoopAI.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/ai/NoopAI.java index 217e20ed..31e2ceb8 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/NoopAI.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/NoopAI.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.snippet.ai; +package com.bartlomiejpluta.base.lib.ai; -import com.bartlomiejpluta.base.api.game.ai.AI; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.ai.AI; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; public class NoopAI implements AI { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/RandomMovementAI.java b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/RandomMovementAI.java similarity index 75% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/RandomMovementAI.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/ai/RandomMovementAI.java index 205de9a3..ee424c84 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/ai/RandomMovementAI.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/ai/RandomMovementAI.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.snippet.ai; +package com.bartlomiejpluta.base.lib.ai; -import com.bartlomiejpluta.base.api.game.ai.AI; -import com.bartlomiejpluta.base.api.game.ai.NPC; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; +import com.bartlomiejpluta.base.api.ai.AI; +import com.bartlomiejpluta.base.api.ai.NPC; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; import java.util.Random; diff --git a/api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationRunner.java b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationRunner.java new file mode 100644 index 00000000..6afea9ee --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/AnimationRunner.java @@ -0,0 +1,9 @@ +package com.bartlomiejpluta.base.lib.animation; + +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import org.joml.Vector2fc; + +public interface AnimationRunner { + void run(Context context, Layer layer, Vector2fc origin); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/DelayedAnimation.java b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java similarity index 62% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/DelayedAnimation.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java index fe2458ef..c810fd9a 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/DelayedAnimation.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/DelayedAnimation.java @@ -1,10 +1,10 @@ -package com.bartlomiejpluta.base.api.snippet.animation; +package com.bartlomiejpluta.base.lib.animation; -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.animation.AnimationDelegate; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.animation.AnimationDelegate; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.render.ShaderManager; public class DelayedAnimation extends AnimationDelegate { private final int delay; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/RandomAnimationsRunner.java b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/RandomAnimationsRunner.java similarity index 96% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/RandomAnimationsRunner.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/animation/RandomAnimationsRunner.java index f4bef8fc..82679e52 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/RandomAnimationsRunner.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/RandomAnimationsRunner.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.snippet.animation; +package com.bartlomiejpluta.base.lib.animation; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; import org.apache.commons.math3.distribution.NormalDistribution; import org.apache.commons.math3.distribution.RealDistribution; import org.apache.commons.math3.distribution.UniformRealDistribution; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/SimpleAnimationRunner.java b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/SimpleAnimationRunner.java similarity index 89% rename from api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/SimpleAnimationRunner.java rename to api/src/main/java/com/bartlomiejpluta/base/lib/animation/SimpleAnimationRunner.java index ff9eaf92..a3c986f1 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/snippet/animation/SimpleAnimationRunner.java +++ b/api/src/main/java/com/bartlomiejpluta/base/lib/animation/SimpleAnimationRunner.java @@ -1,9 +1,9 @@ -package com.bartlomiejpluta.base.api.snippet.animation; +package com.bartlomiejpluta.base.lib.animation; -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.util.path.Path; +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.util.path.Path; import org.joml.Vector2fc; public class SimpleAnimationRunner implements AnimationRunner { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/math/MathUtil.java b/api/src/main/java/com/bartlomiejpluta/base/util/math/MathUtil.java similarity index 92% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/math/MathUtil.java rename to api/src/main/java/com/bartlomiejpluta/base/util/math/MathUtil.java index c64c4be9..83011db0 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/math/MathUtil.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/math/MathUtil.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.util.math; +package com.bartlomiejpluta.base.util.math; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/MoveSegment.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/MoveSegment.java similarity index 78% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/MoveSegment.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/MoveSegment.java index f23f52b3..687f8021 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/MoveSegment.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/MoveSegment.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movable; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movable; import java.util.Objects; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/NPCPath.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/NPCPath.java similarity index 51% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/NPCPath.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/NPCPath.java index 4e5f4abd..65ad7c21 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/NPCPath.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/NPCPath.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.ai.NPC; -import com.bartlomiejpluta.base.api.game.move.Direction; +import com.bartlomiejpluta.base.api.ai.NPC; +import com.bartlomiejpluta.base.api.move.Direction; public class NPCPath extends Path { diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/Path.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/Path.java similarity index 83% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/Path.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/Path.java index 965d2fc8..c128b579 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/Path.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/Path.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movable; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movable; import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathExecutor.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/PathExecutor.java similarity index 86% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathExecutor.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/PathExecutor.java index 5f65d58a..16194e93 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathExecutor.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/PathExecutor.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Movable; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Movable; import java.util.List; import java.util.Objects; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathProgress.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/PathProgress.java similarity index 67% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathProgress.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/PathProgress.java index e6c39c20..23c05ab4 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/PathProgress.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/PathProgress.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; public enum PathProgress { ONGOING, diff --git a/api/src/main/java/com/bartlomiejpluta/base/util/path/PathSegment.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/PathSegment.java new file mode 100644 index 00000000..44036df4 --- /dev/null +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/PathSegment.java @@ -0,0 +1,8 @@ +package com.bartlomiejpluta.base.util.path; + +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Movable; + +public interface PathSegment { + PathProgress perform(T movable, ObjectLayer layer, float dt); +} diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/RunSegment.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/RunSegment.java similarity index 70% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/RunSegment.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/RunSegment.java index 40a550b3..f634970c 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/RunSegment.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/RunSegment.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Movable; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Movable; import static java.util.Objects.requireNonNull; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/TurnSegment.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/TurnSegment.java similarity index 65% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/TurnSegment.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/TurnSegment.java index d914d3a6..0a4398eb 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/TurnSegment.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/TurnSegment.java @@ -1,8 +1,8 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.ai.NPC; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; +import com.bartlomiejpluta.base.api.ai.NPC; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; import static java.util.Objects.requireNonNull; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/WaitSegment.java b/api/src/main/java/com/bartlomiejpluta/base/util/path/WaitSegment.java similarity index 73% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/path/WaitSegment.java rename to api/src/main/java/com/bartlomiejpluta/base/util/path/WaitSegment.java index 8d71c83f..5ba20d66 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/path/WaitSegment.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/path/WaitSegment.java @@ -1,7 +1,7 @@ -package com.bartlomiejpluta.base.api.util.path; +package com.bartlomiejpluta.base.util.path; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Movable; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Movable; public class WaitSegment implements PathSegment { private final float seconds; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/pathfinder/AstarPathFinder.java b/api/src/main/java/com/bartlomiejpluta/base/util/pathfinder/AstarPathFinder.java similarity index 98% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/pathfinder/AstarPathFinder.java rename to api/src/main/java/com/bartlomiejpluta/base/util/pathfinder/AstarPathFinder.java index 92c0887c..70048b6a 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/pathfinder/AstarPathFinder.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/pathfinder/AstarPathFinder.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.util.pathfinder; +package com.bartlomiejpluta.base.util.pathfinder; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; import org.joml.Vector2i; import org.joml.Vector2ic; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/pathfinder/PathFinder.java b/api/src/main/java/com/bartlomiejpluta/base/util/pathfinder/PathFinder.java similarity index 58% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/pathfinder/PathFinder.java rename to api/src/main/java/com/bartlomiejpluta/base/util/pathfinder/PathFinder.java index 1769bc3d..9deb1cf7 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/pathfinder/PathFinder.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/pathfinder/PathFinder.java @@ -1,6 +1,6 @@ -package com.bartlomiejpluta.base.api.util.pathfinder; +package com.bartlomiejpluta.base.util.pathfinder; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; import org.joml.Vector2ic; import java.util.LinkedList; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/profiler/FPSProfiler.java b/api/src/main/java/com/bartlomiejpluta/base/util/profiler/FPSProfiler.java similarity index 97% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/profiler/FPSProfiler.java rename to api/src/main/java/com/bartlomiejpluta/base/util/profiler/FPSProfiler.java index cbcee6dc..0211a4d0 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/profiler/FPSProfiler.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/profiler/FPSProfiler.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.util.profiler; +package com.bartlomiejpluta.base.util.profiler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/util/profiler/TimeProfiler.java b/api/src/main/java/com/bartlomiejpluta/base/util/profiler/TimeProfiler.java similarity index 95% rename from api/src/main/java/com/bartlomiejpluta/base/api/util/profiler/TimeProfiler.java rename to api/src/main/java/com/bartlomiejpluta/base/util/profiler/TimeProfiler.java index b4ebb19a..83aab4b5 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/util/profiler/TimeProfiler.java +++ b/api/src/main/java/com/bartlomiejpluta/base/util/profiler/TimeProfiler.java @@ -1,4 +1,4 @@ -package com.bartlomiejpluta.base.api.util.profiler; +package com.bartlomiejpluta.base.util.profiler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/editor/src/main/resources/java_templates/game_runner.ftl b/editor/src/main/resources/java_templates/game_runner.ftl index 60159c28..79f95cb5 100644 --- a/editor/src/main/resources/java_templates/game_runner.ftl +++ b/editor/src/main/resources/java_templates/game_runner.ftl @@ -3,10 +3,10 @@ package ${package}; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.game.runner.GameRunner; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.api.runner.GameRunner; public class ${className} implements GameRunner { private static final Logger log = LoggerFactory.getLogger(${className}.class); diff --git a/editor/src/main/resources/java_templates/map_handler.ftl b/editor/src/main/resources/java_templates/map_handler.ftl index cf918d48..a412ad2b 100644 --- a/editor/src/main/resources/java_templates/map_handler.ftl +++ b/editor/src/main/resources/java_templates/map_handler.ftl @@ -1,10 +1,10 @@ package ${package}; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.map.handler.MapHandler; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.map.handler.MapHandler; +import com.bartlomiejpluta.base.api.screen.Screen; public class ${className} implements MapHandler { diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/ContextManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/ContextManager.java index 8b717cc9..8cb729d3 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/ContextManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/ContextManager.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.context.manager; -import com.bartlomiejpluta.base.api.game.context.Context; +import com.bartlomiejpluta.base.api.context.Context; public interface ContextManager { Context createContext(); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/DefaultContextManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/DefaultContextManager.java index d8528ad5..6eb5c9f6 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/DefaultContextManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/manager/DefaultContextManager.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.context.manager; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.runner.GameRunner; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.runner.GameRunner; import com.bartlomiejpluta.base.engine.context.model.DefaultContext; import com.bartlomiejpluta.base.engine.core.engine.GameEngine; import com.bartlomiejpluta.base.engine.gui.manager.FontManager; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java index c12e35fc..62502191 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/context/model/DefaultContext.java @@ -1,16 +1,15 @@ package com.bartlomiejpluta.base.engine.context.model; -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.map.handler.MapHandler; -import com.bartlomiejpluta.base.api.game.runner.GameRunner; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.image.Image; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.map.handler.MapHandler; +import com.bartlomiejpluta.base.api.runner.GameRunner; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.engine.GameEngine; import com.bartlomiejpluta.base.engine.gui.manager.FontManager; import com.bartlomiejpluta.base.engine.gui.manager.WidgetDefinitionManager; @@ -21,6 +20,7 @@ import com.bartlomiejpluta.base.engine.world.entity.manager.EntityManager; import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager; import com.bartlomiejpluta.base.engine.world.map.manager.MapManager; import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.Builder; import lombok.Getter; import lombok.NonNull; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java index a08418ff..95a1c6e3 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/DefaultGameEngine.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.core.engine; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.gc.OffHeapGarbageCollector; import com.bartlomiejpluta.base.engine.logic.GameLogic; import com.bartlomiejpluta.base.engine.thread.ThreadManager; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java index acdd61ff..ce56e022 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/engine/GameEngine.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.core.engine; -import com.bartlomiejpluta.base.api.game.context.Context; +import com.bartlomiejpluta.base.api.context.Context; public interface GameEngine { void start(Context context); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java index d272cf11..2cbc7274 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/material/Material.java @@ -1,11 +1,11 @@ package com.bartlomiejpluta.base.engine.core.gl.object.material; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.Renderable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.object.texture.Texture; import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName; +import com.bartlomiejpluta.base.internal.render.Renderable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.Getter; import org.joml.*; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java index e617fcbc..fb74b099 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/mesh/Mesh.java @@ -1,10 +1,10 @@ package com.bartlomiejpluta.base.engine.core.gl.object.mesh; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.gc.Disposable; +import com.bartlomiejpluta.base.internal.render.Renderable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import org.lwjgl.opengl.GL15; import org.lwjgl.system.MemoryStack; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java index 62007a4f..8fed9077 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/Texture.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.core.gl.object.texture; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; import com.bartlomiejpluta.base.engine.error.AppException; +import com.bartlomiejpluta.base.internal.gc.Disposable; import lombok.Getter; import org.joml.Vector2f; import org.joml.Vector2fc; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java index 8a848d29..4194ccd4 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/object/texture/TextureManager.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.core.gl.object.texture; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface TextureManager extends Cleanable { Texture loadTexture(String textureFileName); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java index b316b5f8..f1f891b5 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/DefaultRenderer.java @@ -1,10 +1,10 @@ package com.bartlomiejpluta.base.engine.core.gl.render; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.Renderable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName; +import com.bartlomiejpluta.base.internal.render.Renderable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java index c9bf5b6a..9b14d949 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/render/Renderer.java @@ -1,9 +1,9 @@ package com.bartlomiejpluta.base.engine.core.gl.render; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.gc.Cleanable; +import com.bartlomiejpluta.base.internal.render.Renderable; public interface Renderer extends Cleanable { void init(); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java index c3f538da..20c71450 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/manager/DefaultShaderManager.java @@ -1,10 +1,10 @@ package com.bartlomiejpluta.base.engine.core.gl.shader.manager; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; -import com.bartlomiejpluta.base.api.internal.render.ShaderProgram; -import com.bartlomiejpluta.base.api.internal.render.Uniform; import com.bartlomiejpluta.base.engine.core.gl.shader.program.GLShaderProgram; import com.bartlomiejpluta.base.engine.util.res.ResourcesManager; +import com.bartlomiejpluta.base.internal.render.ShaderManager; +import com.bartlomiejpluta.base.internal.render.ShaderProgram; +import com.bartlomiejpluta.base.internal.render.Uniform; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.joml.*; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/GLShaderProgram.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/GLShaderProgram.java index ee54182b..f664512b 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/GLShaderProgram.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/core/gl/shader/program/GLShaderProgram.java @@ -1,8 +1,8 @@ package com.bartlomiejpluta.base.engine.core.gl.shader.program; -import com.bartlomiejpluta.base.api.internal.render.ShaderProgram; -import com.bartlomiejpluta.base.api.internal.render.Uniform; import com.bartlomiejpluta.base.engine.error.AppException; +import com.bartlomiejpluta.base.internal.render.ShaderProgram; +import com.bartlomiejpluta.base.internal.render.Uniform; import lombok.extern.slf4j.Slf4j; import org.joml.*; import org.lwjgl.system.MemoryStack; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java index a5efe6a6..dd4ab61a 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gc/DefaultOffHeapGarbageCollector.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.gc; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.internal.gc.Cleanable; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java index bfeb32d1..1593b9ff 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGColor.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.gui.render; -import com.bartlomiejpluta.base.api.game.gui.base.Color; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; +import com.bartlomiejpluta.base.api.gui.base.Color; +import com.bartlomiejpluta.base.internal.gc.Disposable; import lombok.*; import org.lwjgl.nanovg.NVGColor; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java index 740a99a5..37202c4d 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGGUI.java @@ -1,19 +1,19 @@ package com.bartlomiejpluta.base.engine.gui.render; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.*; -import com.bartlomiejpluta.base.api.game.gui.component.Component; -import com.bartlomiejpluta.base.api.game.gui.window.Window; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.*; +import com.bartlomiejpluta.base.api.gui.component.Component; +import com.bartlomiejpluta.base.api.gui.window.Window; +import com.bartlomiejpluta.base.api.input.KeyEvent; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.error.AppException; import com.bartlomiejpluta.base.engine.gui.manager.FontManager; import com.bartlomiejpluta.base.engine.gui.manager.WidgetDefinitionManager; import com.bartlomiejpluta.base.engine.gui.widget.ScreenWidget; import com.bartlomiejpluta.base.engine.gui.xml.inflater.Inflater; import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java index a18a80e0..824c2f94 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGImage.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.gui.render; -import com.bartlomiejpluta.base.api.game.gui.base.Image; +import com.bartlomiejpluta.base.api.gui.base.Image; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java index b45b2a85..0c823a23 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/render/NanoVGPaint.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.gui.render; -import com.bartlomiejpluta.base.api.game.gui.base.Paint; -import com.bartlomiejpluta.base.api.internal.gc.Disposable; +import com.bartlomiejpluta.base.api.gui.base.Paint; +import com.bartlomiejpluta.base.internal.gc.Disposable; import lombok.*; import org.lwjgl.nanovg.NVGPaint; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java index 345128a3..764a4430 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/widget/ScreenWidget.java @@ -1,10 +1,10 @@ package com.bartlomiejpluta.base.engine.gui.widget; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.gui.base.Widget; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.gui.base.Widget; +import com.bartlomiejpluta.base.api.input.KeyEvent; +import com.bartlomiejpluta.base.api.screen.Screen; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java index 8847f50f..a409f648 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/DefaultInflater.java @@ -1,14 +1,14 @@ package com.bartlomiejpluta.base.engine.gui.xml.inflater; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.base.SizeMode; -import com.bartlomiejpluta.base.api.game.gui.base.Widget; -import com.bartlomiejpluta.base.api.game.gui.component.Component; -import com.bartlomiejpluta.base.api.game.gui.window.Inflatable; -import com.bartlomiejpluta.base.api.game.gui.window.Ref; -import com.bartlomiejpluta.base.api.game.gui.window.Window; -import com.bartlomiejpluta.base.api.game.gui.window.WindowPosition; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.base.SizeMode; +import com.bartlomiejpluta.base.api.gui.base.Widget; +import com.bartlomiejpluta.base.api.gui.component.Component; +import com.bartlomiejpluta.base.api.gui.window.Inflatable; +import com.bartlomiejpluta.base.api.gui.window.Ref; +import com.bartlomiejpluta.base.api.gui.window.Window; +import com.bartlomiejpluta.base.api.gui.window.WindowPosition; import com.bartlomiejpluta.base.engine.error.AppException; import com.bartlomiejpluta.base.engine.util.reflection.ClassLoader; import lombok.SneakyThrows; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java index 33a0e0df..833a19d0 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/gui/xml/inflater/Inflater.java @@ -1,9 +1,9 @@ package com.bartlomiejpluta.base.engine.gui.xml.inflater; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.gui.base.GUI; -import com.bartlomiejpluta.base.api.game.gui.component.Component; -import com.bartlomiejpluta.base.api.game.gui.window.Window; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.gui.base.GUI; +import com.bartlomiejpluta.base.api.gui.component.Component; +import com.bartlomiejpluta.base.api.gui.window.Window; import java.io.File; import java.io.InputStream; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java index fd198a28..f51cb870 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/DefaultGameLogic.java @@ -1,9 +1,9 @@ package com.bartlomiejpluta.base.engine.logic; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.render.Renderer; import com.bartlomiejpluta.base.engine.ui.model.GLFWInput; import com.bartlomiejpluta.base.engine.world.camera.DefaultCamera; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java index 00173671..3a4eb42c 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/logic/GameLogic.java @@ -1,8 +1,8 @@ package com.bartlomiejpluta.base.engine.logic; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface GameLogic extends Cleanable { void init(Screen screen, Context context); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/event/GLFWKeyEvent.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/event/GLFWKeyEvent.java index 4d07aa8e..2c2d552d 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/event/GLFWKeyEvent.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/event/GLFWKeyEvent.java @@ -1,8 +1,8 @@ package com.bartlomiejpluta.base.engine.ui.event; -import com.bartlomiejpluta.base.api.game.input.Key; -import com.bartlomiejpluta.base.api.game.input.KeyAction; -import com.bartlomiejpluta.base.api.game.input.KeyEvent; +import com.bartlomiejpluta.base.api.input.Key; +import com.bartlomiejpluta.base.api.input.KeyAction; +import com.bartlomiejpluta.base.api.input.KeyEvent; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/manager/ScreenManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/manager/ScreenManager.java index 21579ab9..357cce08 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/manager/ScreenManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/manager/ScreenManager.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.ui.manager; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.ui.model.GLFWScreen; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWInput.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWInput.java index 424e3ca3..65346111 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWInput.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWInput.java @@ -1,9 +1,9 @@ package com.bartlomiejpluta.base.engine.ui.model; -import com.bartlomiejpluta.base.api.game.input.Input; -import com.bartlomiejpluta.base.api.game.input.Key; -import com.bartlomiejpluta.base.api.game.input.KeyEventHandler; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.input.Input; +import com.bartlomiejpluta.base.api.input.Key; +import com.bartlomiejpluta.base.api.input.KeyEventHandler; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.ui.event.GLFWKeyEvent; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWScreen.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWScreen.java index 338973a2..c3cad10a 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWScreen.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/ui/model/GLFWScreen.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.ui.model; -import com.bartlomiejpluta.base.api.game.screen.Screen; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.error.AppException; import lombok.Getter; import lombok.NonNull; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java index 1d8e77bb..ced0be32 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/util/mesh/MeshManager.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.util.mesh; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface MeshManager extends Cleanable { Mesh createQuad(float width, float height, float originX, float originY); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/AnimationManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/AnimationManager.java index 7aec5518..894b5fd0 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/AnimationManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/AnimationManager.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.world.animation.manager; -import com.bartlomiejpluta.base.api.game.animation.Animation; +import com.bartlomiejpluta.base.api.animation.Animation; import com.bartlomiejpluta.base.engine.common.manager.AssetManager; import com.bartlomiejpluta.base.engine.world.animation.asset.AnimationAsset; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/DefaultAnimationManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/DefaultAnimationManager.java index 611f6c33..8b980e93 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/DefaultAnimationManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/manager/DefaultAnimationManager.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.world.animation.manager; -import com.bartlomiejpluta.base.api.game.animation.Animation; +import com.bartlomiejpluta.base.api.animation.Animation; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/AnimatedSprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/AnimatedSprite.java index 0cf4b5dd..2a526cb5 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/AnimatedSprite.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/AnimatedSprite.java @@ -1,12 +1,12 @@ package com.bartlomiejpluta.base.engine.world.animation.model; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.world.object.Sprite; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.EqualsAndHashCode; import org.joml.Vector2fc; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/DefaultAnimation.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/DefaultAnimation.java index 4092c249..474316b2 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/DefaultAnimation.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/animation/model/DefaultAnimation.java @@ -1,21 +1,21 @@ package com.bartlomiejpluta.base.engine.world.animation.model; -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.util.math.MathUtil; -import com.bartlomiejpluta.base.api.util.path.Path; -import com.bartlomiejpluta.base.api.util.path.PathExecutor; +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.world.movement.MovableSprite; +import com.bartlomiejpluta.base.util.math.MathUtil; +import com.bartlomiejpluta.base.util.path.Path; +import com.bartlomiejpluta.base.util.path.PathExecutor; import lombok.Getter; import lombok.NonNull; import lombok.Setter; import org.joml.Vector2fc; -import static com.bartlomiejpluta.base.api.util.path.PathProgress.DONE; -import static com.bartlomiejpluta.base.api.util.path.PathProgress.SEGMENT_FAILED; +import static com.bartlomiejpluta.base.util.path.PathProgress.DONE; +import static com.bartlomiejpluta.base.util.path.PathProgress.SEGMENT_FAILED; public class DefaultAnimation extends MovableSprite implements Animation { private final Vector2fc[] frames; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/DefaultCamera.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/DefaultCamera.java index 7695defb..ea870e19 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/DefaultCamera.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/camera/DefaultCamera.java @@ -1,10 +1,10 @@ package com.bartlomiejpluta.base.engine.world.camera; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName; import com.bartlomiejpluta.base.engine.world.object.Model; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import org.joml.Matrix4f; import org.joml.Matrix4fc; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java index 981ea62f..7169beb3 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/config/EntitySpriteConfiguration.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.world.entity.config; -import com.bartlomiejpluta.base.api.game.move.Direction; +import com.bartlomiejpluta.base.api.move.Direction; import lombok.Data; import org.joml.Vector2i; import org.joml.Vector2ic; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java index 5a92e4be..7069c9d5 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/DefaultEntityManager.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.world.entity.manager; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.move.Direction; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.move.Direction; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.util.mesh.MeshManager; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java index 6a615da6..c9bca15e 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/manager/EntityManager.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.world.entity.manager; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface EntityManager extends Cleanable { Entity createEntity(String entitySetUid); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java index bbbc890d..b31ad158 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/entity/model/DefaultEntity.java @@ -1,13 +1,13 @@ package com.bartlomiejpluta.base.engine.world.entity.model; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movement; -import com.bartlomiejpluta.base.api.util.math.MathUtil; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movement; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.world.movement.MovableSprite; +import com.bartlomiejpluta.base.util.math.MathUtil; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java index 26548465..6a5a94bc 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/DefaultImageManager.java @@ -1,7 +1,6 @@ package com.bartlomiejpluta.base.engine.world.image.manager; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.util.math.MathUtil; +import com.bartlomiejpluta.base.api.image.Image; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.texture.TextureManager; import com.bartlomiejpluta.base.engine.error.AppException; @@ -10,6 +9,7 @@ import com.bartlomiejpluta.base.engine.util.mesh.MeshManager; import com.bartlomiejpluta.base.engine.util.res.ResourcesManager; import com.bartlomiejpluta.base.engine.world.image.asset.ImageAsset; import com.bartlomiejpluta.base.engine.world.image.model.DefaultImage; +import com.bartlomiejpluta.base.util.math.MathUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java index 4a4b8ab4..db48f1ea 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/manager/ImageManager.java @@ -1,10 +1,10 @@ package com.bartlomiejpluta.base.engine.world.image.manager; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.api.image.Image; import com.bartlomiejpluta.base.engine.common.manager.AssetManager; import com.bartlomiejpluta.base.engine.common.manager.ByteBufferAssetManager; import com.bartlomiejpluta.base.engine.world.image.asset.ImageAsset; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface ImageManager extends AssetManager, ByteBufferAssetManager, Cleanable { } diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/DefaultImage.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/DefaultImage.java index 0ebd491a..6192dedf 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/DefaultImage.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/image/model/DefaultImage.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.world.image.model; -import com.bartlomiejpluta.base.api.game.image.Image; +import com.bartlomiejpluta.base.api.image.Image; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.world.object.Sprite; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java index be04033c..7c6955d7 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/base/BaseLayer.java @@ -1,12 +1,12 @@ package com.bartlomiejpluta.base.engine.world.map.layer.base; -import com.bartlomiejpluta.base.api.game.animation.Animation; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.animation.Animation; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.screen.Screen; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.NonNull; import org.joml.Vector2fc; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/DefaultColorLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/DefaultColorLayer.java index 7a507c3d..b44c3eb2 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/DefaultColorLayer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/color/DefaultColorLayer.java @@ -1,15 +1,15 @@ package com.bartlomiejpluta.base.engine.world.map.layer.color; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.map.layer.color.ColorLayer; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.object.Placeable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.map.layer.color.ColorLayer; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.util.mesh.MeshManager; import com.bartlomiejpluta.base.engine.world.map.layer.base.BaseLayer; import com.bartlomiejpluta.base.engine.world.object.Sprite; +import com.bartlomiejpluta.base.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.NonNull; import org.joml.Matrix4fc; import org.joml.Vector2fc; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/DefaultImageLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/DefaultImageLayer.java index f4874caa..4ae4dcea 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/DefaultImageLayer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/image/DefaultImageLayer.java @@ -1,13 +1,13 @@ package com.bartlomiejpluta.base.engine.world.map.layer.image; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.game.map.layer.image.ImageLayer; -import com.bartlomiejpluta.base.api.game.map.layer.image.ImageLayerMode; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.image.Image; +import com.bartlomiejpluta.base.api.map.layer.image.ImageLayer; +import com.bartlomiejpluta.base.api.map.layer.image.ImageLayerMode; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.world.map.layer.base.BaseLayer; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.Getter; import lombok.NonNull; import lombok.Setter; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/DefaultObjectLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/DefaultObjectLayer.java index 76918461..7e3b517e 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/DefaultObjectLayer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/object/DefaultObjectLayer.java @@ -1,16 +1,16 @@ package com.bartlomiejpluta.base.engine.world.map.layer.object; -import com.bartlomiejpluta.base.api.game.ai.NPC; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.entity.Entity; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.map.layer.object.PassageAbility; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.move.Movement; -import com.bartlomiejpluta.base.api.game.rule.Rule; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.ai.NPC; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.entity.Entity; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.map.layer.object.PassageAbility; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.move.Movement; +import com.bartlomiejpluta.base.api.rule.Rule; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.world.map.layer.base.BaseLayer; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.Getter; import lombok.NonNull; import org.joml.Vector2ic; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/DefaultTileLayer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/DefaultTileLayer.java index ea0131c4..fadb74ba 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/DefaultTileLayer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/layer/tile/DefaultTileLayer.java @@ -1,13 +1,13 @@ package com.bartlomiejpluta.base.engine.world.map.layer.tile; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.map.layer.tile.TileLayer; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.map.layer.tile.TileLayer; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.world.map.layer.base.BaseLayer; import com.bartlomiejpluta.base.engine.world.tileset.model.Tile; import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.NonNull; import java.util.Arrays; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java index a6a06b83..3acff373 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/DefaultMapManager.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.world.map.manager; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.map.handler.MapHandler; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.map.handler.MapHandler; import com.bartlomiejpluta.base.engine.error.AppException; import com.bartlomiejpluta.base.engine.project.config.ProjectConfiguration; import com.bartlomiejpluta.base.engine.util.reflection.ClassLoader; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java index b1af5cae..efdf60ff 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/manager/MapManager.java @@ -1,11 +1,11 @@ package com.bartlomiejpluta.base.engine.world.map.manager; -import com.bartlomiejpluta.base.api.game.context.Context; -import com.bartlomiejpluta.base.api.game.map.handler.MapHandler; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; +import com.bartlomiejpluta.base.api.context.Context; +import com.bartlomiejpluta.base.api.map.handler.MapHandler; import com.bartlomiejpluta.base.engine.common.manager.AssetManager; import com.bartlomiejpluta.base.engine.world.map.asset.GameMapAsset; import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface MapManager extends AssetManager, Cleanable { MapHandler loadHandler(Context context, String mapUid); diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java index 425648a3..b4b496bc 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/model/DefaultGameMap.java @@ -1,25 +1,25 @@ package com.bartlomiejpluta.base.engine.world.map.model; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.image.Image; -import com.bartlomiejpluta.base.api.game.map.layer.base.Layer; -import com.bartlomiejpluta.base.api.game.map.layer.color.ColorLayer; -import com.bartlomiejpluta.base.api.game.map.layer.image.ImageLayer; -import com.bartlomiejpluta.base.api.game.map.layer.image.ImageLayerMode; -import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer; -import com.bartlomiejpluta.base.api.game.map.layer.object.PassageAbility; -import com.bartlomiejpluta.base.api.game.map.layer.tile.TileLayer; -import com.bartlomiejpluta.base.api.game.map.model.GameMap; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.internal.render.Renderable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.image.Image; +import com.bartlomiejpluta.base.api.map.layer.base.Layer; +import com.bartlomiejpluta.base.api.map.layer.color.ColorLayer; +import com.bartlomiejpluta.base.api.map.layer.image.ImageLayer; +import com.bartlomiejpluta.base.api.map.layer.image.ImageLayerMode; +import com.bartlomiejpluta.base.api.map.layer.object.ObjectLayer; +import com.bartlomiejpluta.base.api.map.layer.object.PassageAbility; +import com.bartlomiejpluta.base.api.map.layer.tile.TileLayer; +import com.bartlomiejpluta.base.api.map.model.GameMap; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.util.mesh.MeshManager; import com.bartlomiejpluta.base.engine.world.map.layer.color.DefaultColorLayer; import com.bartlomiejpluta.base.engine.world.map.layer.image.DefaultImageLayer; import com.bartlomiejpluta.base.engine.world.map.layer.object.DefaultObjectLayer; import com.bartlomiejpluta.base.engine.world.map.layer.tile.DefaultTileLayer; import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.internal.render.Renderable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.Getter; import lombok.NonNull; import org.joml.Vector2f; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java index c3cee42f..6d41487e 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/map/serial/ProtobufMapDeserializer.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.world.map.serial; -import com.bartlomiejpluta.base.api.game.map.layer.image.ImageLayerMode; -import com.bartlomiejpluta.base.api.game.map.layer.object.PassageAbility; +import com.bartlomiejpluta.base.api.map.layer.image.ImageLayerMode; +import com.bartlomiejpluta.base.api.map.layer.object.PassageAbility; import com.bartlomiejpluta.base.engine.error.AppException; import com.bartlomiejpluta.base.engine.util.mesh.MeshManager; import com.bartlomiejpluta.base.engine.world.image.manager.ImageManager; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java index 30f38c03..97d96a00 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/DefaultMovement.java @@ -1,7 +1,7 @@ package com.bartlomiejpluta.base.engine.world.movement; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movement; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movement; import lombok.EqualsAndHashCode; import lombok.Getter; import org.joml.Vector2i; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java index 66487837..10c074fc 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/movement/MovableSprite.java @@ -1,13 +1,13 @@ package com.bartlomiejpluta.base.engine.world.movement; -import com.bartlomiejpluta.base.api.game.move.Direction; -import com.bartlomiejpluta.base.api.game.move.Movable; -import com.bartlomiejpluta.base.api.game.move.Movement; -import com.bartlomiejpluta.base.api.internal.logic.Updatable; -import com.bartlomiejpluta.base.api.util.math.MathUtil; +import com.bartlomiejpluta.base.api.move.Direction; +import com.bartlomiejpluta.base.api.move.Movable; +import com.bartlomiejpluta.base.api.move.Movement; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.world.animation.model.AnimatedSprite; +import com.bartlomiejpluta.base.internal.logic.Updatable; +import com.bartlomiejpluta.base.util.math.MathUtil; import lombok.EqualsAndHashCode; import lombok.Getter; import org.joml.Vector2f; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java index 4a0bd699..8123d7b5 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Model.java @@ -1,6 +1,6 @@ package com.bartlomiejpluta.base.engine.world.object; -import com.bartlomiejpluta.base.api.internal.object.Placeable; +import com.bartlomiejpluta.base.internal.object.Placeable; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java index cd47c449..949eb0b7 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/object/Sprite.java @@ -1,12 +1,12 @@ package com.bartlomiejpluta.base.engine.world.object; -import com.bartlomiejpluta.base.api.game.camera.Camera; -import com.bartlomiejpluta.base.api.game.screen.Screen; -import com.bartlomiejpluta.base.api.internal.render.Renderable; -import com.bartlomiejpluta.base.api.internal.render.ShaderManager; +import com.bartlomiejpluta.base.api.camera.Camera; +import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.engine.core.gl.object.material.Material; import com.bartlomiejpluta.base.engine.core.gl.object.mesh.Mesh; import com.bartlomiejpluta.base.engine.core.gl.shader.constant.UniformName; +import com.bartlomiejpluta.base.internal.render.Renderable; +import com.bartlomiejpluta.base.internal.render.ShaderManager; import lombok.*; @RequiredArgsConstructor diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java index 083743e1..98c8c440 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/world/tileset/manager/TileSetManager.java @@ -1,9 +1,9 @@ package com.bartlomiejpluta.base.engine.world.tileset.manager; -import com.bartlomiejpluta.base.api.internal.gc.Cleanable; import com.bartlomiejpluta.base.engine.common.manager.AssetManager; import com.bartlomiejpluta.base.engine.world.tileset.asset.TileSetAsset; import com.bartlomiejpluta.base.engine.world.tileset.model.TileSet; +import com.bartlomiejpluta.base.internal.gc.Cleanable; public interface TileSetManager extends AssetManager, Cleanable { }