diff --git a/core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.java b/core/src/main/java/com/openeggbert/core/configuration/ConfigDef.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.java rename to core/src/main/java/com/openeggbert/core/configuration/ConfigDef.java index 97f7d29..2fc1640 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.java +++ b/core/src/main/java/com/openeggbert/core/configuration/ConfigDef.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.configuration; +import com.openeggbert.core.main.OpenEggbertException; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/openeggbert/core/entity/common/ConfigDefKey.java b/core/src/main/java/com/openeggbert/core/configuration/ConfigDefKey.java similarity index 95% rename from core/src/main/java/com/openeggbert/core/entity/common/ConfigDefKey.java rename to core/src/main/java/com/openeggbert/core/configuration/ConfigDefKey.java index aadb3aa..4e48379 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/ConfigDefKey.java +++ b/core/src/main/java/com/openeggbert/core/configuration/ConfigDefKey.java @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.configuration; -import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.release.Release; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/Language.java b/core/src/main/java/com/openeggbert/core/configuration/Language.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/compatibility/Language.java rename to core/src/main/java/com/openeggbert/core/configuration/Language.java index da1ba33..e1c5b1a 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/Language.java +++ b/core/src/main/java/com/openeggbert/core/configuration/Language.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.configuration; /** * diff --git a/core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java b/core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java rename to core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java index 24f5297..0d7d1e8 100644 --- a/core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java +++ b/core/src/main/java/com/openeggbert/core/configuration/OpenEggbertDisplayMode.java @@ -17,13 +17,12 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.utils; +package com.openeggbert.core.configuration; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Graphics; import com.badlogic.gdx.Graphics.DisplayMode; -import com.openeggbert.core.entity.common.ConfigDef; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.main.OpenEggbertException; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/ScreenResolution.java b/core/src/main/java/com/openeggbert/core/configuration/ScreenResolution.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/compatibility/ScreenResolution.java rename to core/src/main/java/com/openeggbert/core/configuration/ScreenResolution.java index acbc202..fecb640 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/ScreenResolution.java +++ b/core/src/main/java/com/openeggbert/core/configuration/ScreenResolution.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.configuration; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java b/core/src/main/java/com/openeggbert/core/configuration/StrictMode.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java rename to core/src/main/java/com/openeggbert/core/configuration/StrictMode.java index 5aa86b1..33174c2 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java +++ b/core/src/main/java/com/openeggbert/core/configuration/StrictMode.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.configuration; /** * diff --git a/core/src/main/java/com/openeggbert/core/entity/common/Utils.java b/core/src/main/java/com/openeggbert/core/entity/common/Utils.java deleted file mode 100644 index 9cd894f..0000000 --- a/core/src/main/java/com/openeggbert/core/entity/common/Utils.java +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// - - -package com.openeggbert.core.entity.common; - -import com.openeggbert.core.compatibility.Release; - -/** - * - * @author robertvokac - */ -public class Utils { - private Utils() { - //Instantiate not needed. - } - public static final Release[] ALL_FEATURE_LEVELS = Release.values(); -} diff --git a/core/src/main/java/com/openeggbert/core/entity/elements/Buldozer.java b/core/src/main/java/com/openeggbert/core/entity/elements/Buldozer.java deleted file mode 100644 index 43b1a07..0000000 --- a/core/src/main/java/com/openeggbert/core/entity/elements/Buldozer.java +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// - - -package com.openeggbert.core.entity.elements; - -/** - * - * @author robertvokac - */ -public class Buldozer { - -} diff --git a/core/src/main/java/com/openeggbert/core/entity/elements/Eggbert.java b/core/src/main/java/com/openeggbert/core/entity/elements/Eggbert.java deleted file mode 100644 index 319a7fd..0000000 --- a/core/src/main/java/com/openeggbert/core/entity/elements/Eggbert.java +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// - - -package com.openeggbert.core.entity.elements; - -/** - * - * @author robertvokac - */ -public class Eggbert { - -} diff --git a/core/src/main/java/com/openeggbert/core/entity/immovableobjects/.gitkeep b/core/src/main/java/com/openeggbert/core/entity/immovableobjects/.gitkeep deleted file mode 100644 index 8b13789..0000000 --- a/core/src/main/java/com/openeggbert/core/entity/immovableobjects/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/src/main/java/com/openeggbert/core/entity/common/Cheat.java b/core/src/main/java/com/openeggbert/core/game/Cheat.java similarity index 91% rename from core/src/main/java/com/openeggbert/core/entity/common/Cheat.java rename to core/src/main/java/com/openeggbert/core/game/Cheat.java index aa9e324..698ae74 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/Cheat.java +++ b/core/src/main/java/com/openeggbert/core/game/Cheat.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.game; -import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.release.Release; import lombok.Getter; /** @@ -30,7 +30,7 @@ import lombok.Getter; */ public enum Cheat { - MEGABLUPI(Utils.ALL_FEATURE_LEVELS); + MEGABLUPI(Release.ALL_RELEASES); //todo//todo//todo//todo @Getter diff --git a/core/src/main/java/com/openeggbert/core/entity/common/EntityType.java b/core/src/main/java/com/openeggbert/core/game/EntityType.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/EntityType.java rename to core/src/main/java/com/openeggbert/core/game/EntityType.java index 85f8d39..0f8b64e 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/EntityType.java +++ b/core/src/main/java/com/openeggbert/core/game/EntityType.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.game; /** * diff --git a/core/src/main/java/com/openeggbert/core/entity/common/PlayerState.java b/core/src/main/java/com/openeggbert/core/game/PlayerState.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/PlayerState.java rename to core/src/main/java/com/openeggbert/core/game/PlayerState.java index 657a713..7c767a6 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/PlayerState.java +++ b/core/src/main/java/com/openeggbert/core/game/PlayerState.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.game; /** * diff --git a/core/src/main/java/com/openeggbert/core/entity/common/World.java b/core/src/main/java/com/openeggbert/core/game/World.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/World.java rename to core/src/main/java/com/openeggbert/core/game/World.java index 05183eb..eb7868c 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/World.java +++ b/core/src/main/java/com/openeggbert/core/game/World.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.game; /** * diff --git a/core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.java b/core/src/main/java/com/openeggbert/core/gamespace/GameDirectoryType.java similarity index 94% rename from core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.java rename to core/src/main/java/com/openeggbert/core/gamespace/GameDirectoryType.java index 1a0de37..9015b8c 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.java +++ b/core/src/main/java/com/openeggbert/core/gamespace/GameDirectoryType.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.gamespace; +import com.openeggbert.core.configuration.StrictMode; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/entity/common/GameFileType.java b/core/src/main/java/com/openeggbert/core/gamespace/GameFileType.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/GameFileType.java rename to core/src/main/java/com/openeggbert/core/gamespace/GameFileType.java index 92d6826..7255c9f 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/GameFileType.java +++ b/core/src/main/java/com/openeggbert/core/gamespace/GameFileType.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.gamespace; /** * diff --git a/core/src/main/java/com/openeggbert/core/entity/common/GameSpace.java b/core/src/main/java/com/openeggbert/core/gamespace/GameSpace.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/GameSpace.java rename to core/src/main/java/com/openeggbert/core/gamespace/GameSpace.java index f5e8110..38377a7 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/GameSpace.java +++ b/core/src/main/java/com/openeggbert/core/gamespace/GameSpace.java @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.gamespace; -import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.release.Release; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.java b/core/src/main/java/com/openeggbert/core/image/ImageFormat.java similarity index 95% rename from core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.java rename to core/src/main/java/com/openeggbert/core/image/ImageFormat.java index 283c575..0d7aa93 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.java +++ b/core/src/main/java/com/openeggbert/core/image/ImageFormat.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.image; +import com.openeggbert.core.configuration.StrictMode; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.java b/core/src/main/java/com/openeggbert/core/image/ImageResolution.java similarity index 87% rename from core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.java rename to core/src/main/java/com/openeggbert/core/image/ImageResolution.java index 852d21c..5e64b98 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.java +++ b/core/src/main/java/com/openeggbert/core/image/ImageResolution.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.image; +import com.openeggbert.core.configuration.StrictMode; import lombok.Getter; /** @@ -35,7 +36,7 @@ public enum ImageResolution implements StrictMode{ @Override public boolean isEnabledInCaseOfStrictMode() { - throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody + return enabledInCaseOfStrictMode; } } diff --git a/core/src/main/java/com/openeggbert/core/entity/common/ImageType.java b/core/src/main/java/com/openeggbert/core/image/ImageType.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/ImageType.java rename to core/src/main/java/com/openeggbert/core/image/ImageType.java index 05589c8..8d1e306 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/ImageType.java +++ b/core/src/main/java/com/openeggbert/core/image/ImageType.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.image; /** diff --git a/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertException.java b/core/src/main/java/com/openeggbert/core/main/OpenEggbertException.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertException.java rename to core/src/main/java/com/openeggbert/core/main/OpenEggbertException.java index d3aaa41..660908c 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertException.java +++ b/core/src/main/java/com/openeggbert/core/main/OpenEggbertException.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.main; /** * diff --git a/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java index 73262b0..ccc5a1b 100644 --- a/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java +++ b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java @@ -31,15 +31,15 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.utils.ObjectMap; import com.badlogic.gdx.utils.viewport.Viewport; -import com.openeggbert.core.entity.common.ConfigDef; -import com.openeggbert.core.entity.common.GameSpace; -import com.openeggbert.core.mods.Mod; -import com.openeggbert.core.mods.ModIdentification; -import com.openeggbert.core.screens.GameSpaceListScreen; -import com.openeggbert.core.screens.InitScreen; +import com.openeggbert.core.configuration.ConfigDef; +import com.openeggbert.core.gamespace.GameSpace; +import com.openeggbert.core.mod.Mod; +import com.openeggbert.core.mod.ModIdentification; +import com.openeggbert.core.screen.GameSpaceListScreen; +import com.openeggbert.core.screen.InitScreen; import com.openeggbert.gdx.storage.Storage; import com.openeggbert.gdx.storage.StorageImplementationLoader; -import com.openeggbert.core.utils.OpenEggbertDisplayMode; +import com.openeggbert.core.configuration.OpenEggbertDisplayMode; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/openeggbert/core/mods/Mod.java b/core/src/main/java/com/openeggbert/core/mod/Mod.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/Mod.java rename to core/src/main/java/com/openeggbert/core/mod/Mod.java index 55958a2..aacdb0b 100644 --- a/core/src/main/java/com/openeggbert/core/mods/Mod.java +++ b/core/src/main/java/com/openeggbert/core/mod/Mod.java @@ -17,11 +17,11 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; import com.badlogic.gdx.utils.XmlReader; import com.badlogic.gdx.utils.XmlReader.Element; -import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.release.Release; import java.util.ArrayList; import java.util.List; import lombok.Data; diff --git a/core/src/main/java/com/openeggbert/core/mods/ModIdentification.java b/core/src/main/java/com/openeggbert/core/mod/ModIdentification.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/ModIdentification.java rename to core/src/main/java/com/openeggbert/core/mod/ModIdentification.java index a4ab206..753fe68 100644 --- a/core/src/main/java/com/openeggbert/core/mods/ModIdentification.java +++ b/core/src/main/java/com/openeggbert/core/mod/ModIdentification.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; import com.badlogic.gdx.utils.XmlReader.Element; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/openeggbert/core/mods/ModPackaging.java b/core/src/main/java/com/openeggbert/core/mod/ModPackaging.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/ModPackaging.java rename to core/src/main/java/com/openeggbert/core/mod/ModPackaging.java index 470de73..584d5a0 100644 --- a/core/src/main/java/com/openeggbert/core/mods/ModPackaging.java +++ b/core/src/main/java/com/openeggbert/core/mod/ModPackaging.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; /** * diff --git a/core/src/main/java/com/openeggbert/core/mods/ModType.java b/core/src/main/java/com/openeggbert/core/mod/ModType.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/ModType.java rename to core/src/main/java/com/openeggbert/core/mod/ModType.java index 74660ff..4c90535 100644 --- a/core/src/main/java/com/openeggbert/core/mods/ModType.java +++ b/core/src/main/java/com/openeggbert/core/mod/ModType.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; /** * diff --git a/core/src/main/java/com/openeggbert/core/mods/MusicSheet.java b/core/src/main/java/com/openeggbert/core/mod/MusicSheet.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/MusicSheet.java rename to core/src/main/java/com/openeggbert/core/mod/MusicSheet.java index d72baba..7654f71 100644 --- a/core/src/main/java/com/openeggbert/core/mods/MusicSheet.java +++ b/core/src/main/java/com/openeggbert/core/mod/MusicSheet.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; /** * diff --git a/core/src/main/java/com/openeggbert/core/mods/SoundSheet.java b/core/src/main/java/com/openeggbert/core/mod/SoundSheet.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/SoundSheet.java rename to core/src/main/java/com/openeggbert/core/mod/SoundSheet.java index 1b07946..80ee52c 100644 --- a/core/src/main/java/com/openeggbert/core/mods/SoundSheet.java +++ b/core/src/main/java/com/openeggbert/core/mod/SoundSheet.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; /** * diff --git a/core/src/main/java/com/openeggbert/core/mods/Store.java b/core/src/main/java/com/openeggbert/core/mod/Store.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/mods/Store.java rename to core/src/main/java/com/openeggbert/core/mod/Store.java index 6d48f08..f56737d 100644 --- a/core/src/main/java/com/openeggbert/core/mods/Store.java +++ b/core/src/main/java/com/openeggbert/core/mod/Store.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.mods; +package com.openeggbert.core.mod; import com.badlogic.gdx.utils.XmlReader; diff --git a/core/src/main/java/com/openeggbert/core/mods/SpriteSheet.java b/core/src/main/java/com/openeggbert/core/mods/SpriteSheet.java deleted file mode 100644 index 50d52ef..0000000 --- a/core/src/main/java/com/openeggbert/core/mods/SpriteSheet.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template - */ -package com.openeggbert.core.mods; - -/** - * - * @author robertvokac - */ -public class SpriteSheet { - -} diff --git a/core/src/main/java/com/openeggbert/core/mods/SpriteSheetRow.java b/core/src/main/java/com/openeggbert/core/mods/SpriteSheetRow.java deleted file mode 100644 index af54151..0000000 --- a/core/src/main/java/com/openeggbert/core/mods/SpriteSheetRow.java +++ /dev/null @@ -1,29 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////// -// Open Eggbert: Free recreation of the computer game Speedy Eggbert. -// Copyright (C) 2024 the original author or authors. -// -// This program is free software: you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation, either version 3 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see -// or write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -/////////////////////////////////////////////////////////////////////////////////////////////// - -package com.openeggbert.core.mods; - -/** - * - * @author robertvokac - */ -public class SpriteSheetRow { - -} diff --git a/core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.java b/core/src/main/java/com/openeggbert/core/music/MusicFormat.java similarity index 95% rename from core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.java rename to core/src/main/java/com/openeggbert/core/music/MusicFormat.java index 182ccb5..1895e90 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.java +++ b/core/src/main/java/com/openeggbert/core/music/MusicFormat.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.music; +import com.openeggbert.core.configuration.StrictMode; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/entity/common/MusicType.java b/core/src/main/java/com/openeggbert/core/music/MusicType.java similarity index 93% rename from core/src/main/java/com/openeggbert/core/entity/common/MusicType.java rename to core/src/main/java/com/openeggbert/core/music/MusicType.java index 9d6b839..ca147e0 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/MusicType.java +++ b/core/src/main/java/com/openeggbert/core/music/MusicType.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.music; -import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.release.Release; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/compatibility/Publisher.java b/core/src/main/java/com/openeggbert/core/release/Publisher.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/compatibility/Publisher.java rename to core/src/main/java/com/openeggbert/core/release/Publisher.java index 2cdddaf..b614d2a 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/Publisher.java +++ b/core/src/main/java/com/openeggbert/core/release/Publisher.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.release; /** * diff --git a/core/src/main/java/com/openeggbert/core/compatibility/Release.java b/core/src/main/java/com/openeggbert/core/release/Release.java similarity index 91% rename from core/src/main/java/com/openeggbert/core/compatibility/Release.java rename to core/src/main/java/com/openeggbert/core/release/Release.java index 5f714e0..19c6fa9 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/Release.java +++ b/core/src/main/java/com/openeggbert/core/release/Release.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.release; +import com.openeggbert.core.utils.FileNameCaseType; import lombok.Getter; /** @@ -44,6 +45,8 @@ public enum Release { @Getter private final String abbreviation; + public static final Release[] ALL_RELEASES = Release.values(); + private Release(ReleaseType releaseType, ReleaseVersion releaseVersion, Publisher publisher, String abbreviation) { this.releaseType = releaseType; this.releaseVersion = releaseVersion; @@ -52,7 +55,7 @@ public enum Release { } public String createLabel() { - String[] array = this.name().split("_"); + String[] array = this.name().split(UNDERSCORE); StringBuilder sb = new StringBuilder(); for(int i = 0;i < array.length; i++) { sb.append(FileNameCaseType.convertToString(array[i], FileNameCaseType.CAPITALIZATION)); @@ -62,5 +65,6 @@ public enum Release { } return sb.toString(); } + private static final String UNDERSCORE = "_"; } diff --git a/core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java b/core/src/main/java/com/openeggbert/core/release/ReleaseType.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java rename to core/src/main/java/com/openeggbert/core/release/ReleaseType.java index 7f5d6fa..3ce0f51 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java +++ b/core/src/main/java/com/openeggbert/core/release/ReleaseType.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.release; /** * diff --git a/core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java b/core/src/main/java/com/openeggbert/core/release/ReleaseVersion.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java rename to core/src/main/java/com/openeggbert/core/release/ReleaseVersion.java index 6a9f271..db1075b 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java +++ b/core/src/main/java/com/openeggbert/core/release/ReleaseVersion.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.release; /** * diff --git a/core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java b/core/src/main/java/com/openeggbert/core/screen/AbstractGameScreen.java similarity index 98% rename from core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java rename to core/src/main/java/com/openeggbert/core/screen/AbstractGameScreen.java index 5f53b55..6873287 100644 --- a/core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/AbstractGameScreen.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputAdapter; diff --git a/core/src/main/java/com/openeggbert/core/screens/AbstractOpenEggbertScreen.java b/core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java similarity index 93% rename from core/src/main/java/com/openeggbert/core/screens/AbstractOpenEggbertScreen.java rename to core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java index 59fb39c..90333a7 100644 --- a/core/src/main/java/com/openeggbert/core/screens/AbstractOpenEggbertScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/AbstractOpenEggbertScreen.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Application; import static com.badlogic.gdx.Application.LOG_INFO; @@ -26,9 +26,8 @@ import com.badlogic.gdx.ScreenAdapter; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.openeggbert.core.entity.common.GameFileType; -import com.openeggbert.core.entity.common.OpenEggbertException; -import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.gamespace.GameFileType; +import com.openeggbert.core.main.OpenEggbertException; import com.openeggbert.core.main.OpenEggbertGame; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.List; @@ -54,7 +53,7 @@ public abstract class AbstractOpenEggbertScreen extends ScreenAdapter { return getScreenType().isPresent() ? getScreenType().get().getFileNameWithoutExtension(): ""; } - protected Optional getScreenType() { + protected Optional getScreenType() { return Optional.empty(); } diff --git a/core/src/main/java/com/openeggbert/core/screens/DemoScreen.java b/core/src/main/java/com/openeggbert/core/screen/DemoScreen.java similarity index 92% rename from core/src/main/java/com/openeggbert/core/screens/DemoScreen.java rename to core/src/main/java/com/openeggbert/core/screen/DemoScreen.java index 405211d..f5db914 100644 --- a/core/src/main/java/com/openeggbert/core/screens/DemoScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/DemoScreen.java @@ -17,14 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.core.entity.common.OpenEggbertScreenType; import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; @@ -39,8 +38,8 @@ public class DemoScreen extends AbstractOpenEggbertScreen { } - protected final Optional getScreenType() { - return Optional.of(OpenEggbertScreenType.DEMO); + protected final Optional getScreenType() { + return Optional.of(ScreenType.DEMO); } @Override diff --git a/core/src/main/java/com/openeggbert/core/screens/GameScreen.java b/core/src/main/java/com/openeggbert/core/screen/GameScreen.java similarity index 92% rename from core/src/main/java/com/openeggbert/core/screens/GameScreen.java rename to core/src/main/java/com/openeggbert/core/screen/GameScreen.java index aa9121c..d5fc2c7 100644 --- a/core/src/main/java/com/openeggbert/core/screens/GameScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/GameScreen.java @@ -17,14 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.core.entity.common.OpenEggbertScreenType; import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; @@ -39,8 +38,8 @@ public class GameScreen extends AbstractGameScreen { } - protected final Optional getScreenType() { - return Optional.of(OpenEggbertScreenType.GAME); + protected final Optional getScreenType() { + return Optional.of(ScreenType.GAME); } @Override diff --git a/core/src/main/java/com/openeggbert/core/screens/GameSpaceListScreen.java b/core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java similarity index 98% rename from core/src/main/java/com/openeggbert/core/screens/GameSpaceListScreen.java rename to core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java index 1e8df51..9af5ccc 100644 --- a/core/src/main/java/com/openeggbert/core/screens/GameSpaceListScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/GameSpaceListScreen.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; @@ -28,10 +28,10 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.core.entity.common.GameSpace; +import com.openeggbert.core.gamespace.GameSpace; import com.openeggbert.core.main.OpenEggbertGame; -import com.openeggbert.core.mods.Mod; -import com.openeggbert.core.mods.ModType; +import com.openeggbert.core.mod.Mod; +import com.openeggbert.core.mod.ModType; import java.util.List; import java.util.stream.Collectors; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/openeggbert/core/screens/InitScreen.java b/core/src/main/java/com/openeggbert/core/screen/InitScreen.java similarity index 94% rename from core/src/main/java/com/openeggbert/core/screens/InitScreen.java rename to core/src/main/java/com/openeggbert/core/screen/InitScreen.java index e1a120e..09ef05f 100644 --- a/core/src/main/java/com/openeggbert/core/screens/InitScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/InitScreen.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; @@ -25,11 +25,10 @@ import com.badlogic.gdx.Input; import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.core.entity.common.ConfigDef; -import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.configuration.ConfigDef; import com.openeggbert.core.main.OpenEggbertGame; import com.openeggbert.core.utils.EmbeddedFileHandleFactory; -import com.openeggbert.core.utils.OpenEggbertDisplayMode; +import com.openeggbert.core.configuration.OpenEggbertDisplayMode; import java.util.Optional; /** @@ -87,8 +86,8 @@ public class InitScreen extends AbstractOpenEggbertScreen { } - protected final Optional getScreenType() { - return Optional.of(OpenEggbertScreenType.INIT); + protected final Optional getScreenType() { + return Optional.of(ScreenType.INIT); } @Override diff --git a/core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java b/core/src/main/java/com/openeggbert/core/screen/MainHubScreen.java similarity index 91% rename from core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java rename to core/src/main/java/com/openeggbert/core/screen/MainHubScreen.java index 268f9cc..f19a727 100644 --- a/core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/MainHubScreen.java @@ -17,14 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.core.entity.common.OpenEggbertScreenType; import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; @@ -39,8 +38,8 @@ public class MainHubScreen extends AbstractGameScreen { } - protected final Optional getScreenType() { - return Optional.of(OpenEggbertScreenType.MAIN_HUB); + protected final Optional getScreenType() { + return Optional.of(ScreenType.MAIN_HUB); } @Override diff --git a/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertScreenType.java b/core/src/main/java/com/openeggbert/core/screen/ScreenType.java similarity index 90% rename from core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertScreenType.java rename to core/src/main/java/com/openeggbert/core/screen/ScreenType.java index 06b627c..356481d 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertScreenType.java +++ b/core/src/main/java/com/openeggbert/core/screen/ScreenType.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.screen; import lombok.Getter; @@ -27,7 +27,7 @@ import lombok.Getter; * * @author robertvokac */ -public enum OpenEggbertScreenType { +public enum ScreenType { MAIN, GAME_SPACE_SELECTION, INIT("INIT"), @@ -41,10 +41,10 @@ public enum OpenEggbertScreenType { @Getter private String fileNameWithoutExtension; - OpenEggbertScreenType() { + ScreenType() { this.fileNameWithoutExtension = ""; } - OpenEggbertScreenType(String fileName) { + ScreenType(String fileName) { this.fileNameWithoutExtension = fileName; } diff --git a/core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java b/core/src/main/java/com/openeggbert/core/screen/SubHubScreen.java similarity index 92% rename from core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java rename to core/src/main/java/com/openeggbert/core/screen/SubHubScreen.java index 442b67b..1aa80f2 100644 --- a/core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/SubHubScreen.java @@ -17,14 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.core.entity.common.OpenEggbertScreenType; import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; @@ -39,8 +38,8 @@ public class SubHubScreen extends AbstractGameScreen { } - protected final Optional getScreenType() { - return Optional.of(OpenEggbertScreenType.SUB_HUB); + protected final Optional getScreenType() { + return Optional.of(ScreenType.SUB_HUB); } @Override diff --git a/core/src/main/java/com/openeggbert/core/screens/TestScreen.java b/core/src/main/java/com/openeggbert/core/screen/TestScreen.java similarity index 99% rename from core/src/main/java/com/openeggbert/core/screens/TestScreen.java rename to core/src/main/java/com/openeggbert/core/screen/TestScreen.java index b161ce9..63a2e6d 100644 --- a/core/src/main/java/com/openeggbert/core/screens/TestScreen.java +++ b/core/src/main/java/com/openeggbert/core/screen/TestScreen.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.screens; +package com.openeggbert.core.screen; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.java b/core/src/main/java/com/openeggbert/core/sound/SoundFormat.java similarity index 95% rename from core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.java rename to core/src/main/java/com/openeggbert/core/sound/SoundFormat.java index b34cca0..c82bb6b 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.java +++ b/core/src/main/java/com/openeggbert/core/sound/SoundFormat.java @@ -17,8 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.sound; +import com.openeggbert.core.configuration.StrictMode; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/entity/common/SoundType.java b/core/src/main/java/com/openeggbert/core/sound/SoundType.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/entity/common/SoundType.java rename to core/src/main/java/com/openeggbert/core/sound/SoundType.java index 831e972..c4d9dbb 100644 --- a/core/src/main/java/com/openeggbert/core/entity/common/SoundType.java +++ b/core/src/main/java/com/openeggbert/core/sound/SoundType.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.common; +package com.openeggbert.core.sound; -import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.release.Release; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteAnimation.java b/core/src/main/java/com/openeggbert/core/sprite/SpriteAnimation.java similarity index 96% rename from core/src/main/java/com/openeggbert/core/entity/sprites/SpriteAnimation.java rename to core/src/main/java/com/openeggbert/core/sprite/SpriteAnimation.java index 2a34a24..1c12bf1 100644 --- a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteAnimation.java +++ b/core/src/main/java/com/openeggbert/core/sprite/SpriteAnimation.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.sprites; +package com.openeggbert.core.sprite; /** * diff --git a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteGroup.java b/core/src/main/java/com/openeggbert/core/sprite/SpriteGroup.java similarity index 93% rename from core/src/main/java/com/openeggbert/core/entity/sprites/SpriteGroup.java rename to core/src/main/java/com/openeggbert/core/sprite/SpriteGroup.java index 1e558e9..120560b 100644 --- a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteGroup.java +++ b/core/src/main/java/com/openeggbert/core/sprite/SpriteGroup.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.sprites; +package com.openeggbert.core.sprite; -import com.openeggbert.core.compatibility.ReleaseVersion; +import com.openeggbert.core.release.ReleaseVersion; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java b/core/src/main/java/com/openeggbert/core/sprite/SpriteSheet.java similarity index 91% rename from core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java rename to core/src/main/java/com/openeggbert/core/sprite/SpriteSheet.java index be3d720..558e893 100644 --- a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java +++ b/core/src/main/java/com/openeggbert/core/sprite/SpriteSheet.java @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.sprites; +package com.openeggbert.core.sprite; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.main.OpenEggbertException; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.ArrayList; import java.util.Arrays; @@ -49,7 +49,7 @@ public class SpriteSheet { if (columnIndexesForNames.containsKey(columnName)) { throw new OpenEggbertException("Invalid sprite sheet. It has invalid the first row (column names). Column is more than once: " + columnName); } - Optional optionalSpriteSheetRowColumn = Arrays.asList(com.openeggbert.core.entity.sprites.SpriteSheetRowColumn.values()).stream().filter(r -> r.getColumnName().equals(columnName)).findFirst(); + Optional optionalSpriteSheetRowColumn = Arrays.asList(com.openeggbert.core.sprite.SpriteSheetRowColumn.values()).stream().filter(r -> r.getColumnName().equals(columnName)).findFirst(); if (!optionalSpriteSheetRowColumn.isPresent()) { continue; } diff --git a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java b/core/src/main/java/com/openeggbert/core/sprite/SpriteSheetRow.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java rename to core/src/main/java/com/openeggbert/core/sprite/SpriteSheetRow.java index 4853c8c..5372d03 100644 --- a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java +++ b/core/src/main/java/com/openeggbert/core/sprite/SpriteSheetRow.java @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.sprites; +package com.openeggbert.core.sprite; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.main.OpenEggbertException; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.Map; import java.util.function.Function; diff --git a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRowColumn.java b/core/src/main/java/com/openeggbert/core/sprite/SpriteSheetRowColumn.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRowColumn.java rename to core/src/main/java/com/openeggbert/core/sprite/SpriteSheetRowColumn.java index 5bce614..3184a63 100644 --- a/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRowColumn.java +++ b/core/src/main/java/com/openeggbert/core/sprite/SpriteSheetRowColumn.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.entity.sprites; +package com.openeggbert.core.sprite; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java b/core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java index c6cd1c0..d93c437 100644 --- a/core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java +++ b/core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java @@ -22,7 +22,7 @@ package com.openeggbert.core.utils; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.main.OpenEggbertException; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/FileExtension.java b/core/src/main/java/com/openeggbert/core/utils/FileExtension.java similarity index 92% rename from core/src/main/java/com/openeggbert/core/compatibility/FileExtension.java rename to core/src/main/java/com/openeggbert/core/utils/FileExtension.java index d06633a..c0ab47e 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/FileExtension.java +++ b/core/src/main/java/com/openeggbert/core/utils/FileExtension.java @@ -17,7 +17,7 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.utils; /** * @@ -27,7 +27,7 @@ public class FileExtension { private FileExtension() { //Not meant to be instantiated. } - public boolean isOpenEggbertOnly(String fileExtension) { + public static boolean isOpenEggbertOnly(String fileExtension) { return fileExtension != null && !fileExtension.toLowerCase().equals(BLP); } private static final String BLP = "blp"; diff --git a/core/src/main/java/com/openeggbert/core/compatibility/FileNameCaseType.java b/core/src/main/java/com/openeggbert/core/utils/FileNameCaseType.java similarity index 97% rename from core/src/main/java/com/openeggbert/core/compatibility/FileNameCaseType.java rename to core/src/main/java/com/openeggbert/core/utils/FileNameCaseType.java index 54b93de..fd35c29 100644 --- a/core/src/main/java/com/openeggbert/core/compatibility/FileNameCaseType.java +++ b/core/src/main/java/com/openeggbert/core/utils/FileNameCaseType.java @@ -17,9 +17,9 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.core.compatibility; +package com.openeggbert.core.utils; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.main.OpenEggbertException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java b/core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java index 637eca7..b27838e 100644 --- a/core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java +++ b/core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java @@ -19,12 +19,11 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.core.utils; -import com.openeggbert.core.compatibility.FileNameCaseType; -import com.openeggbert.core.compatibility.ImageFormat; -import com.openeggbert.core.compatibility.MusicFormat; -import com.openeggbert.core.compatibility.SoundFormat; -import com.openeggbert.core.entity.common.GameFileType; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.image.ImageFormat; +import com.openeggbert.core.music.MusicFormat; +import com.openeggbert.core.sound.SoundFormat; +import com.openeggbert.core.gamespace.GameFileType; +import com.openeggbert.core.main.OpenEggbertException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/core/src/test/java/com/openeggbert/compatibility/FileNameCaseTypeTest.java b/core/src/test/java/com/openeggbert/compatibility/FileNameCaseTypeTest.java index 7a3e08a..4bd014a 100644 --- a/core/src/test/java/com/openeggbert/compatibility/FileNameCaseTypeTest.java +++ b/core/src/test/java/com/openeggbert/compatibility/FileNameCaseTypeTest.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.compatibility; -import com.openeggbert.core.compatibility.FileNameCaseType; -import com.openeggbert.core.entity.common.GameFileType; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.utils.FileNameCaseType; +import com.openeggbert.core.gamespace.GameFileType; +import com.openeggbert.core.main.OpenEggbertException; import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java b/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java index 10e0aaa..8040cb7 100644 --- a/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java +++ b/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java @@ -20,7 +20,7 @@ package com.openeggbert.utils; import com.openeggbert.core.utils.OpenEggbertUtils; -import com.openeggbert.core.entity.common.GameFileType; +import com.openeggbert.core.gamespace.GameFileType; import java.util.stream.Collectors; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterAll; diff --git a/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java b/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java index dfa2c6b..a2d31d6 100644 --- a/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java +++ b/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java @@ -3,7 +3,7 @@ package com.openeggbert.gwt; import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.backends.gwt.GwtApplication; import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration; -import com.openeggbert.core.compatibility.ScreenResolution; +import com.openeggbert.core.configuration.ScreenResolution; import com.openeggbert.core.main.OpenEggbertGame; /** Launches the GWT application. */ diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/DesktopUtils.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/DesktopUtils.java index bf3b5a1..bd4a10d 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/DesktopUtils.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/DesktopUtils.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.lwjgl3; -import com.openeggbert.core.compatibility.Release; -import com.openeggbert.core.entity.common.GameSpace; -import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.release.Release; +import com.openeggbert.core.gamespace.GameSpace; +import com.openeggbert.core.main.OpenEggbertException; import java.io.File; import java.net.URISyntaxException; import java.util.Optional; diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java index ee72172..95f1439 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java @@ -22,9 +22,9 @@ package com.openeggbert.lwjgl3; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; -import com.openeggbert.core.compatibility.ScreenResolution; +import com.openeggbert.core.configuration.ScreenResolution; import com.openeggbert.core.main.OpenEggbertGame; -import com.openeggbert.core.entity.common.GameSpace; +import com.openeggbert.core.gamespace.GameSpace; import java.util.Optional; /** Launches the desktop (LWJGL3) application. */