diff --git a/android/src/main/java/com/openeggbert/android/AndroidLauncher.java b/android/src/main/java/com/openeggbert/android/AndroidLauncher.java index edf4509..90e03ab 100644 --- a/android/src/main/java/com/openeggbert/android/AndroidLauncher.java +++ b/android/src/main/java/com/openeggbert/android/AndroidLauncher.java @@ -4,7 +4,7 @@ import android.os.Bundle; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; -import com.openeggbert.main.OpenEggbertGame; +import com.openeggbert.core.main.OpenEggbertGame; /** Launches the Android application. */ public class AndroidLauncher extends AndroidApplication { diff --git a/core/src/main/java/com/openeggbert/compatibility/FileExtension.java b/core/src/main/java/com/openeggbert/core/compatibility/FileExtension.java similarity index 96% rename from core/src/main/java/com/openeggbert/compatibility/FileExtension.java rename to core/src/main/java/com/openeggbert/core/compatibility/FileExtension.java index 85ebcdf..d06633a 100644 --- a/core/src/main/java/com/openeggbert/compatibility/FileExtension.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/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.compatibility; +package com.openeggbert.core.compatibility; /** * diff --git a/core/src/main/java/com/openeggbert/compatibility/FileNameCaseType.java b/core/src/main/java/com/openeggbert/core/compatibility/FileNameCaseType.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/FileNameCaseType.java rename to core/src/main/java/com/openeggbert/core/compatibility/FileNameCaseType.java index 1d2a92b..54b93de 100644 --- a/core/src/main/java/com/openeggbert/compatibility/FileNameCaseType.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/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.compatibility; +package com.openeggbert.core.compatibility; -import com.openeggbert.entity.common.OpenEggbertException; +import com.openeggbert.core.entity.common.OpenEggbertException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/core/src/main/java/com/openeggbert/compatibility/GameDirectoryType.java b/core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/GameDirectoryType.java rename to core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.java index 6670b14..1a0de37 100644 --- a/core/src/main/java/com/openeggbert/compatibility/GameDirectoryType.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.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.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/compatibility/ImageFormat.java b/core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/ImageFormat.java rename to core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.java index efcbed9..283c575 100644 --- a/core/src/main/java/com/openeggbert/compatibility/ImageFormat.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.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.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/compatibility/ImageResolution.java b/core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/ImageResolution.java rename to core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.java index ad362d4..852d21c 100644 --- a/core/src/main/java/com/openeggbert/compatibility/ImageResolution.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.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.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/compatibility/Language.java b/core/src/main/java/com/openeggbert/core/compatibility/Language.java similarity index 96% rename from core/src/main/java/com/openeggbert/compatibility/Language.java rename to core/src/main/java/com/openeggbert/core/compatibility/Language.java index 56ae060..da1ba33 100644 --- a/core/src/main/java/com/openeggbert/compatibility/Language.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/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.compatibility; +package com.openeggbert.core.compatibility; /** * diff --git a/core/src/main/java/com/openeggbert/compatibility/MusicFormat.java b/core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/MusicFormat.java rename to core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.java index b3303c7..182ccb5 100644 --- a/core/src/main/java/com/openeggbert/compatibility/MusicFormat.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.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.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/compatibility/Publisher.java b/core/src/main/java/com/openeggbert/core/compatibility/Publisher.java similarity index 96% rename from core/src/main/java/com/openeggbert/compatibility/Publisher.java rename to core/src/main/java/com/openeggbert/core/compatibility/Publisher.java index 11555ab..2cdddaf 100644 --- a/core/src/main/java/com/openeggbert/compatibility/Publisher.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/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.compatibility; +package com.openeggbert.core.compatibility; /** * diff --git a/core/src/main/java/com/openeggbert/compatibility/Release.java b/core/src/main/java/com/openeggbert/core/compatibility/Release.java similarity index 81% rename from core/src/main/java/com/openeggbert/compatibility/Release.java rename to core/src/main/java/com/openeggbert/core/compatibility/Release.java index 91b1069..5f714e0 100644 --- a/core/src/main/java/com/openeggbert/compatibility/Release.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/Release.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.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; @@ -26,23 +26,29 @@ import lombok.Getter; * @author robertvokac */ public enum Release { - SPEEDY_BLUPI_DEMO(ReleaseType.BLUPI, ReleaseVersion.DEMO, Publisher.EPSITEC_SA), - SPEEDY_BLUPI_I(ReleaseType.BLUPI, ReleaseVersion.ONE, Publisher.EPSITEC_SA), - SPEEDY_BLUPI_II(ReleaseType.BLUPI, ReleaseVersion.TWO, Publisher.EPSITEC_SA), - SPEEDY_EGGBERT_DEMO(ReleaseType.EGGBERT, ReleaseVersion.DEMO, Publisher.E_GAMES), - SPEEDY_EGGBERT_1(ReleaseType.EGGBERT, ReleaseVersion.ONE, Publisher.E_GAMES), - SPEEDY_EGGBERT_2(ReleaseType.EGGBERT, ReleaseVersion.TWO, Publisher.E_GAMES), - SPEEDY_EGGBERT_VALUEWARE(ReleaseType.EGGBERT, ReleaseVersion.VALUEWARE, Publisher.E_GAMES), - SPEEDY_BLUPI_FOR_WINDOWS_PHONE(ReleaseType.BLUPI, ReleaseVersion.WINDOWS_PHONE, Publisher.DADA_GAMES), - OPEN_EGGBERT_3(ReleaseType.OPEN, ReleaseVersion.THREE, Publisher.OPEN_EGGBERT); + SPEEDY_BLUPI_DEMO(ReleaseType.BLUPI, ReleaseVersion.DEMO, Publisher.EPSITEC_SA, "SBD"), + SPEEDY_BLUPI_I(ReleaseType.BLUPI, ReleaseVersion.ONE, Publisher.EPSITEC_SA, "SBI"), + SPEEDY_BLUPI_II(ReleaseType.BLUPI, ReleaseVersion.TWO, Publisher.EPSITEC_SA, "SBII"), + SPEEDY_EGGBERT_DEMO(ReleaseType.EGGBERT, ReleaseVersion.DEMO, Publisher.E_GAMES, "SED"), + SPEEDY_EGGBERT_1(ReleaseType.EGGBERT, ReleaseVersion.ONE, Publisher.E_GAMES, "SE1"), + SPEEDY_EGGBERT_2(ReleaseType.EGGBERT, ReleaseVersion.TWO, Publisher.E_GAMES, "SE2"), + SPEEDY_EGGBERT_VALUEWARE(ReleaseType.EGGBERT, ReleaseVersion.VALUEWARE, Publisher.E_GAMES, "SEW"), + SPEEDY_BLUPI_FOR_WINDOWS_PHONE(ReleaseType.BLUPI, ReleaseVersion.WINDOWS_PHONE, Publisher.DADA_GAMES, "SBP"), + OPEN_EGGBERT_3(ReleaseType.OPEN, ReleaseVersion.THREE, Publisher.OPEN_EGGBERT, "OE3"); @Getter private final ReleaseType releaseType; @Getter private final ReleaseVersion releaseVersion; + @Getter + private final Publisher publisher; + @Getter + private final String abbreviation; - private Release(ReleaseType releaseType, ReleaseVersion releaseVersion, Publisher publisher) { + private Release(ReleaseType releaseType, ReleaseVersion releaseVersion, Publisher publisher, String abbreviation) { this.releaseType = releaseType; this.releaseVersion = releaseVersion; + this.publisher = publisher; + this.abbreviation = abbreviation; } public String createLabel() { diff --git a/core/src/main/java/com/openeggbert/compatibility/ReleaseType.java b/core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java similarity index 96% rename from core/src/main/java/com/openeggbert/compatibility/ReleaseType.java rename to core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java index e505ffb..7f5d6fa 100644 --- a/core/src/main/java/com/openeggbert/compatibility/ReleaseType.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.compatibility; +package com.openeggbert.core.compatibility; /** * diff --git a/core/src/main/java/com/openeggbert/compatibility/ReleaseVersion.java b/core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java similarity index 96% rename from core/src/main/java/com/openeggbert/compatibility/ReleaseVersion.java rename to core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java index aad2c9b..6a9f271 100644 --- a/core/src/main/java/com/openeggbert/compatibility/ReleaseVersion.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.compatibility; +package com.openeggbert.core.compatibility; /** * diff --git a/core/src/main/java/com/openeggbert/compatibility/ScreenResolution.java b/core/src/main/java/com/openeggbert/core/compatibility/ScreenResolution.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/ScreenResolution.java rename to core/src/main/java/com/openeggbert/core/compatibility/ScreenResolution.java index ca9320a..acbc202 100644 --- a/core/src/main/java/com/openeggbert/compatibility/ScreenResolution.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/ScreenResolution.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/compatibility/SoundFormat.java b/core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.java similarity index 97% rename from core/src/main/java/com/openeggbert/compatibility/SoundFormat.java rename to core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.java index f464216..b34cca0 100644 --- a/core/src/main/java/com/openeggbert/compatibility/SoundFormat.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.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.compatibility; +package com.openeggbert.core.compatibility; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/compatibility/StrictMode.java b/core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java similarity index 96% rename from core/src/main/java/com/openeggbert/compatibility/StrictMode.java rename to core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java index bd0d08d..5aa86b1 100644 --- a/core/src/main/java/com/openeggbert/compatibility/StrictMode.java +++ b/core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.compatibility; +package com.openeggbert.core.compatibility; /** * diff --git a/core/src/main/java/com/openeggbert/entity/common/Cheat.java b/core/src/main/java/com/openeggbert/core/entity/common/Cheat.java similarity index 94% rename from core/src/main/java/com/openeggbert/entity/common/Cheat.java rename to core/src/main/java/com/openeggbert/core/entity/common/Cheat.java index 054df5f..aa9e324 100644 --- a/core/src/main/java/com/openeggbert/entity/common/Cheat.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/Cheat.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/entity/common/ConfigDef.java b/core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.java similarity index 97% rename from core/src/main/java/com/openeggbert/entity/common/ConfigDef.java rename to core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.java index b267577..97f7d29 100644 --- a/core/src/main/java/com/openeggbert/entity/common/ConfigDef.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.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.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.utils.OpenEggbertUtils; +import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.HashMap; import java.util.Map; import lombok.ToString; diff --git a/core/src/main/java/com/openeggbert/entity/common/ConfigDefKey.java b/core/src/main/java/com/openeggbert/core/entity/common/ConfigDefKey.java similarity index 95% rename from core/src/main/java/com/openeggbert/entity/common/ConfigDefKey.java rename to core/src/main/java/com/openeggbert/core/entity/common/ConfigDefKey.java index 3993e10..aadb3aa 100644 --- a/core/src/main/java/com/openeggbert/entity/common/ConfigDefKey.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/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.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/openeggbert/entity/common/EntityType.java b/core/src/main/java/com/openeggbert/core/entity/common/EntityType.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/EntityType.java rename to core/src/main/java/com/openeggbert/core/entity/common/EntityType.java index bdbaa3e..85f8d39 100644 --- a/core/src/main/java/com/openeggbert/entity/common/EntityType.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/EntityType.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; /** * diff --git a/core/src/main/java/com/openeggbert/entity/common/GameFileType.java b/core/src/main/java/com/openeggbert/core/entity/common/GameFileType.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/GameFileType.java rename to core/src/main/java/com/openeggbert/core/entity/common/GameFileType.java index b13b0a3..92d6826 100644 --- a/core/src/main/java/com/openeggbert/entity/common/GameFileType.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/GameFileType.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; /** * diff --git a/core/src/main/java/com/openeggbert/entity/common/GameSpace.java b/core/src/main/java/com/openeggbert/core/entity/common/GameSpace.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/GameSpace.java rename to core/src/main/java/com/openeggbert/core/entity/common/GameSpace.java index f3639b7..f5e8110 100644 --- a/core/src/main/java/com/openeggbert/entity/common/GameSpace.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/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.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/openeggbert/entity/common/ImageType.java b/core/src/main/java/com/openeggbert/core/entity/common/ImageType.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/ImageType.java rename to core/src/main/java/com/openeggbert/core/entity/common/ImageType.java index d15f286..05589c8 100644 --- a/core/src/main/java/com/openeggbert/entity/common/ImageType.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/ImageType.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; /** diff --git a/core/src/main/java/com/openeggbert/entity/common/MusicType.java b/core/src/main/java/com/openeggbert/core/entity/common/MusicType.java similarity index 93% rename from core/src/main/java/com/openeggbert/entity/common/MusicType.java rename to core/src/main/java/com/openeggbert/core/entity/common/MusicType.java index 8e61a47..9d6b839 100644 --- a/core/src/main/java/com/openeggbert/entity/common/MusicType.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/MusicType.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/entity/common/OpenEggbertException.java b/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertException.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/OpenEggbertException.java rename to core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertException.java index 9a2db7f..d3aaa41 100644 --- a/core/src/main/java/com/openeggbert/entity/common/OpenEggbertException.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertException.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; /** * diff --git a/core/src/main/java/com/openeggbert/entity/common/OpenEggbertScreenType.java b/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertScreenType.java similarity index 97% rename from core/src/main/java/com/openeggbert/entity/common/OpenEggbertScreenType.java rename to core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertScreenType.java index 627739b..06b627c 100644 --- a/core/src/main/java/com/openeggbert/entity/common/OpenEggbertScreenType.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/OpenEggbertScreenType.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/entity/common/PlayerState.java b/core/src/main/java/com/openeggbert/core/entity/common/PlayerState.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/PlayerState.java rename to core/src/main/java/com/openeggbert/core/entity/common/PlayerState.java index 1dec26e..657a713 100644 --- a/core/src/main/java/com/openeggbert/entity/common/PlayerState.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/PlayerState.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; /** * diff --git a/core/src/main/java/com/openeggbert/entity/common/SoundType.java b/core/src/main/java/com/openeggbert/core/entity/common/SoundType.java similarity index 97% rename from core/src/main/java/com/openeggbert/entity/common/SoundType.java rename to core/src/main/java/com/openeggbert/core/entity/common/SoundType.java index 19c616f..831e972 100644 --- a/core/src/main/java/com/openeggbert/entity/common/SoundType.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/SoundType.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/entity/common/Utils.java b/core/src/main/java/com/openeggbert/core/entity/common/Utils.java similarity index 93% rename from core/src/main/java/com/openeggbert/entity/common/Utils.java rename to core/src/main/java/com/openeggbert/core/entity/common/Utils.java index dc7a57f..9cd894f 100644 --- a/core/src/main/java/com/openeggbert/entity/common/Utils.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/Utils.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; /** * diff --git a/core/src/main/java/com/openeggbert/entity/common/World.java b/core/src/main/java/com/openeggbert/core/entity/common/World.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/common/World.java rename to core/src/main/java/com/openeggbert/core/entity/common/World.java index e4d2b4b..05183eb 100644 --- a/core/src/main/java/com/openeggbert/entity/common/World.java +++ b/core/src/main/java/com/openeggbert/core/entity/common/World.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.common; +package com.openeggbert.core.entity.common; /** * diff --git a/core/src/main/java/com/openeggbert/entity/sprites/SpriteAnimation.java b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteAnimation.java similarity index 96% rename from core/src/main/java/com/openeggbert/entity/sprites/SpriteAnimation.java rename to core/src/main/java/com/openeggbert/core/entity/sprites/SpriteAnimation.java index 3ad725e..2a34a24 100644 --- a/core/src/main/java/com/openeggbert/entity/sprites/SpriteAnimation.java +++ b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteAnimation.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.sprites; +package com.openeggbert.core.entity.sprites; /** * diff --git a/core/src/main/java/com/openeggbert/entity/sprites/SpriteGroup.java b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteGroup.java similarity index 93% rename from core/src/main/java/com/openeggbert/entity/sprites/SpriteGroup.java rename to core/src/main/java/com/openeggbert/core/entity/sprites/SpriteGroup.java index 0ffd011..1e558e9 100644 --- a/core/src/main/java/com/openeggbert/entity/sprites/SpriteGroup.java +++ b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteGroup.java @@ -19,9 +19,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.sprites; +package com.openeggbert.core.entity.sprites; -import com.openeggbert.compatibility.ReleaseVersion; +import com.openeggbert.core.compatibility.ReleaseVersion; import lombok.Getter; /** diff --git a/core/src/main/java/com/openeggbert/entity/sprites/SpriteSheet.java b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java similarity index 89% rename from core/src/main/java/com/openeggbert/entity/sprites/SpriteSheet.java rename to core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java index 8035570..be3d720 100644 --- a/core/src/main/java/com/openeggbert/entity/sprites/SpriteSheet.java +++ b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java @@ -17,10 +17,10 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.sprites; +package com.openeggbert.core.entity.sprites; -import com.openeggbert.entity.common.OpenEggbertException; -import com.openeggbert.utils.OpenEggbertUtils; +import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -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.entity.sprites.SpriteSheetRowColumn.values()).stream().filter(r -> r.getColumnName().equals(columnName)).findFirst(); + Optional optionalSpriteSheetRowColumn = Arrays.asList(com.openeggbert.core.entity.sprites.SpriteSheetRowColumn.values()).stream().filter(r -> r.getColumnName().equals(columnName)).findFirst(); if (!optionalSpriteSheetRowColumn.isPresent()) { continue; } diff --git a/core/src/main/java/com/openeggbert/entity/sprites/SpriteSheetRow.java b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java similarity index 95% rename from core/src/main/java/com/openeggbert/entity/sprites/SpriteSheetRow.java rename to core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java index 2f9a08d..4853c8c 100644 --- a/core/src/main/java/com/openeggbert/entity/sprites/SpriteSheetRow.java +++ b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java @@ -17,10 +17,10 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.entity.sprites; +package com.openeggbert.core.entity.sprites; -import com.openeggbert.entity.common.OpenEggbertException; -import com.openeggbert.utils.OpenEggbertUtils; +import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.Map; import java.util.function.Function; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/entity/sprites/SpriteSheetRowColumn.java b/core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRowColumn.java similarity index 97% rename from core/src/main/java/com/openeggbert/entity/sprites/SpriteSheetRowColumn.java rename to core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRowColumn.java index aeaa4f1..5bce614 100644 --- a/core/src/main/java/com/openeggbert/entity/sprites/SpriteSheetRowColumn.java +++ b/core/src/main/java/com/openeggbert/core/entity/sprites/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.entity.sprites; +package com.openeggbert.core.entity.sprites; import lombok.Getter; diff --git a/core/src/main/java/com/openeggbert/main/OpenEggbertGame.gwt.xml b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.gwt.xml similarity index 100% rename from core/src/main/java/com/openeggbert/main/OpenEggbertGame.gwt.xml rename to core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.gwt.xml diff --git a/core/src/main/java/com/openeggbert/main/OpenEggbertGame.java b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java similarity index 93% rename from core/src/main/java/com/openeggbert/main/OpenEggbertGame.java rename to core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java index 40821da..5ca7d63 100644 --- a/core/src/main/java/com/openeggbert/main/OpenEggbertGame.java +++ b/core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.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.main; +package com.openeggbert.core.main; -import com.openeggbert.utils.AssetsTxt; +import com.openeggbert.core.utils.AssetsTxt; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; @@ -31,16 +31,16 @@ 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.entity.common.ConfigDef; -import com.openeggbert.entity.common.GameSpace; -import com.openeggbert.mods.Mod; -import com.openeggbert.mods.ModIdentification; -import com.openeggbert.screens.GameSpaceListScreen; -import com.openeggbert.screens.InitScreen; +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.gdx.storage.Storage; import com.openeggbert.gdx.storage.StorageImplementationLoader; -import com.openeggbert.utils.OpenEggbertDisplayMode; -import com.openeggbert.utils.OpenEggbertUtils; +import com.openeggbert.core.utils.OpenEggbertDisplayMode; +import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/com/openeggbert/mods/Mod.java b/core/src/main/java/com/openeggbert/core/mods/Mod.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/Mod.java rename to core/src/main/java/com/openeggbert/core/mods/Mod.java index 86bd1d0..55958a2 100644 --- a/core/src/main/java/com/openeggbert/mods/Mod.java +++ b/core/src/main/java/com/openeggbert/core/mods/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.mods; +package com.openeggbert.core.mods; import com.badlogic.gdx.utils.XmlReader; import com.badlogic.gdx.utils.XmlReader.Element; -import com.openeggbert.compatibility.Release; +import com.openeggbert.core.compatibility.Release; import java.util.ArrayList; import java.util.List; import lombok.Data; diff --git a/core/src/main/java/com/openeggbert/mods/ModIdentification.java b/core/src/main/java/com/openeggbert/core/mods/ModIdentification.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/ModIdentification.java rename to core/src/main/java/com/openeggbert/core/mods/ModIdentification.java index 7cb78df..a4ab206 100644 --- a/core/src/main/java/com/openeggbert/mods/ModIdentification.java +++ b/core/src/main/java/com/openeggbert/core/mods/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.mods; +package com.openeggbert.core.mods; import com.badlogic.gdx.utils.XmlReader.Element; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/openeggbert/mods/ModPackaging.java b/core/src/main/java/com/openeggbert/core/mods/ModPackaging.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/ModPackaging.java rename to core/src/main/java/com/openeggbert/core/mods/ModPackaging.java index a61b749..470de73 100644 --- a/core/src/main/java/com/openeggbert/mods/ModPackaging.java +++ b/core/src/main/java/com/openeggbert/core/mods/ModPackaging.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.mods; +package com.openeggbert.core.mods; /** * diff --git a/core/src/main/java/com/openeggbert/mods/ModType.java b/core/src/main/java/com/openeggbert/core/mods/ModType.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/ModType.java rename to core/src/main/java/com/openeggbert/core/mods/ModType.java index 0f18f7b..74660ff 100644 --- a/core/src/main/java/com/openeggbert/mods/ModType.java +++ b/core/src/main/java/com/openeggbert/core/mods/ModType.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.mods; +package com.openeggbert.core.mods; /** * diff --git a/core/src/main/java/com/openeggbert/mods/MusicSheet.java b/core/src/main/java/com/openeggbert/core/mods/MusicSheet.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/MusicSheet.java rename to core/src/main/java/com/openeggbert/core/mods/MusicSheet.java index d52ceb5..d72baba 100644 --- a/core/src/main/java/com/openeggbert/mods/MusicSheet.java +++ b/core/src/main/java/com/openeggbert/core/mods/MusicSheet.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.mods; +package com.openeggbert.core.mods; /** * diff --git a/core/src/main/java/com/openeggbert/mods/SoundSheet.java b/core/src/main/java/com/openeggbert/core/mods/SoundSheet.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/SoundSheet.java rename to core/src/main/java/com/openeggbert/core/mods/SoundSheet.java index 82f8166..1b07946 100644 --- a/core/src/main/java/com/openeggbert/mods/SoundSheet.java +++ b/core/src/main/java/com/openeggbert/core/mods/SoundSheet.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.mods; +package com.openeggbert.core.mods; /** * diff --git a/core/src/main/java/com/openeggbert/mods/SpriteSheet.java b/core/src/main/java/com/openeggbert/core/mods/SpriteSheet.java similarity index 88% rename from core/src/main/java/com/openeggbert/mods/SpriteSheet.java rename to core/src/main/java/com/openeggbert/core/mods/SpriteSheet.java index cb62993..50d52ef 100644 --- a/core/src/main/java/com/openeggbert/mods/SpriteSheet.java +++ b/core/src/main/java/com/openeggbert/core/mods/SpriteSheet.java @@ -2,7 +2,7 @@ * 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.mods; +package com.openeggbert.core.mods; /** * diff --git a/core/src/main/java/com/openeggbert/mods/SpriteSheetRow.java b/core/src/main/java/com/openeggbert/core/mods/SpriteSheetRow.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/SpriteSheetRow.java rename to core/src/main/java/com/openeggbert/core/mods/SpriteSheetRow.java index 952aba3..af54151 100644 --- a/core/src/main/java/com/openeggbert/mods/SpriteSheetRow.java +++ b/core/src/main/java/com/openeggbert/core/mods/SpriteSheetRow.java @@ -18,7 +18,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.mods; +package com.openeggbert.core.mods; /** * diff --git a/core/src/main/java/com/openeggbert/mods/Store.java b/core/src/main/java/com/openeggbert/core/mods/Store.java similarity index 97% rename from core/src/main/java/com/openeggbert/mods/Store.java rename to core/src/main/java/com/openeggbert/core/mods/Store.java index ca3a3de..6d48f08 100644 --- a/core/src/main/java/com/openeggbert/mods/Store.java +++ b/core/src/main/java/com/openeggbert/core/mods/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.mods; +package com.openeggbert.core.mods; import com.badlogic.gdx.utils.XmlReader; diff --git a/core/src/main/java/com/openeggbert/screens/AbstractGameScreen.java b/core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java similarity index 96% rename from core/src/main/java/com/openeggbert/screens/AbstractGameScreen.java rename to core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java index 7558ca9..5f53b55 100644 --- a/core/src/main/java/com/openeggbert/screens/AbstractGameScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java @@ -17,14 +17,14 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.screens; +package com.openeggbert.core.screens; 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.main.OpenEggbertGame; +import com.openeggbert.core.main.OpenEggbertGame; /** * diff --git a/core/src/main/java/com/openeggbert/screens/AbstractOpenEggbertScreen.java b/core/src/main/java/com/openeggbert/core/screens/AbstractOpenEggbertScreen.java similarity index 93% rename from core/src/main/java/com/openeggbert/screens/AbstractOpenEggbertScreen.java rename to core/src/main/java/com/openeggbert/core/screens/AbstractOpenEggbertScreen.java index 61e91c6..59fb39c 100644 --- a/core/src/main/java/com/openeggbert/screens/AbstractOpenEggbertScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/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.screens; +package com.openeggbert.core.screens; import com.badlogic.gdx.Application; import static com.badlogic.gdx.Application.LOG_INFO; @@ -26,11 +26,11 @@ 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.entity.common.GameFileType; -import com.openeggbert.entity.common.OpenEggbertException; -import com.openeggbert.entity.common.OpenEggbertScreenType; -import com.openeggbert.main.OpenEggbertGame; -import com.openeggbert.utils.OpenEggbertUtils; +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.main.OpenEggbertGame; +import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.List; import java.util.Optional; diff --git a/core/src/main/java/com/openeggbert/screens/DemoScreen.java b/core/src/main/java/com/openeggbert/core/screens/DemoScreen.java similarity index 94% rename from core/src/main/java/com/openeggbert/screens/DemoScreen.java rename to core/src/main/java/com/openeggbert/core/screens/DemoScreen.java index 0d045d0..405211d 100644 --- a/core/src/main/java/com/openeggbert/screens/DemoScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/DemoScreen.java @@ -17,15 +17,15 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.screens; +package com.openeggbert.core.screens; 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.entity.common.OpenEggbertScreenType; -import com.openeggbert.main.OpenEggbertGame; +import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; /** diff --git a/core/src/main/java/com/openeggbert/screens/GameScreen.java b/core/src/main/java/com/openeggbert/core/screens/GameScreen.java similarity index 94% rename from core/src/main/java/com/openeggbert/screens/GameScreen.java rename to core/src/main/java/com/openeggbert/core/screens/GameScreen.java index b3162b2..aa9121c 100644 --- a/core/src/main/java/com/openeggbert/screens/GameScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/GameScreen.java @@ -17,15 +17,15 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.screens; +package com.openeggbert.core.screens; 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.entity.common.OpenEggbertScreenType; -import com.openeggbert.main.OpenEggbertGame; +import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; /** diff --git a/core/src/main/java/com/openeggbert/screens/GameSpaceListScreen.java b/core/src/main/java/com/openeggbert/core/screens/GameSpaceListScreen.java similarity index 97% rename from core/src/main/java/com/openeggbert/screens/GameSpaceListScreen.java rename to core/src/main/java/com/openeggbert/core/screens/GameSpaceListScreen.java index ce508de..1e8df51 100644 --- a/core/src/main/java/com/openeggbert/screens/GameSpaceListScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/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.screens; +package com.openeggbert.core.screens; 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.entity.common.GameSpace; -import com.openeggbert.main.OpenEggbertGame; -import com.openeggbert.mods.Mod; -import com.openeggbert.mods.ModType; +import com.openeggbert.core.entity.common.GameSpace; +import com.openeggbert.core.main.OpenEggbertGame; +import com.openeggbert.core.mods.Mod; +import com.openeggbert.core.mods.ModType; import java.util.List; import java.util.stream.Collectors; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/openeggbert/screens/InitScreen.java b/core/src/main/java/com/openeggbert/core/screens/InitScreen.java similarity index 94% rename from core/src/main/java/com/openeggbert/screens/InitScreen.java rename to core/src/main/java/com/openeggbert/core/screens/InitScreen.java index 6eae78e..e1a120e 100644 --- a/core/src/main/java/com/openeggbert/screens/InitScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/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.screens; +package com.openeggbert.core.screens; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; @@ -25,11 +25,11 @@ 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.entity.common.ConfigDef; -import com.openeggbert.entity.common.OpenEggbertScreenType; -import com.openeggbert.main.OpenEggbertGame; -import com.openeggbert.utils.EmbeddedFileHandleFactory; -import com.openeggbert.utils.OpenEggbertDisplayMode; +import com.openeggbert.core.entity.common.ConfigDef; +import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.main.OpenEggbertGame; +import com.openeggbert.core.utils.EmbeddedFileHandleFactory; +import com.openeggbert.core.utils.OpenEggbertDisplayMode; import java.util.Optional; /** diff --git a/core/src/main/java/com/openeggbert/screens/MainHubScreen.java b/core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java similarity index 94% rename from core/src/main/java/com/openeggbert/screens/MainHubScreen.java rename to core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java index c2afcef..268f9cc 100644 --- a/core/src/main/java/com/openeggbert/screens/MainHubScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java @@ -17,15 +17,15 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.screens; +package com.openeggbert.core.screens; 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.entity.common.OpenEggbertScreenType; -import com.openeggbert.main.OpenEggbertGame; +import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; /** diff --git a/core/src/main/java/com/openeggbert/screens/SubHubScreen.java b/core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java similarity index 94% rename from core/src/main/java/com/openeggbert/screens/SubHubScreen.java rename to core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java index 4333b49..442b67b 100644 --- a/core/src/main/java/com/openeggbert/screens/SubHubScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java @@ -17,15 +17,15 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.screens; +package com.openeggbert.core.screens; 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.entity.common.OpenEggbertScreenType; -import com.openeggbert.main.OpenEggbertGame; +import com.openeggbert.core.entity.common.OpenEggbertScreenType; +import com.openeggbert.core.main.OpenEggbertGame; import java.util.Optional; /** diff --git a/core/src/main/java/com/openeggbert/screens/TestScreen.java b/core/src/main/java/com/openeggbert/core/screens/TestScreen.java similarity index 97% rename from core/src/main/java/com/openeggbert/screens/TestScreen.java rename to core/src/main/java/com/openeggbert/core/screens/TestScreen.java index d8e22ad..07a2c2f 100644 --- a/core/src/main/java/com/openeggbert/screens/TestScreen.java +++ b/core/src/main/java/com/openeggbert/core/screens/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.screens; +package com.openeggbert.core.screens; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; @@ -25,7 +25,7 @@ import com.badlogic.gdx.Input; import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.utils.ScreenUtils; -import com.openeggbert.main.OpenEggbertGame; +import com.openeggbert.core.main.OpenEggbertGame; import java.util.function.Function; /** diff --git a/core/src/main/java/com/openeggbert/utils/AssetsTxt.java b/core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java similarity index 97% rename from core/src/main/java/com/openeggbert/utils/AssetsTxt.java rename to core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java index 96f0cf6..c6cd1c0 100644 --- a/core/src/main/java/com/openeggbert/utils/AssetsTxt.java +++ b/core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java @@ -17,13 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.utils; +package com.openeggbert.core.utils; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; -import com.openeggbert.entity.common.OpenEggbertException; -import com.openeggbert.utils.OpenEggbertUtils; +import com.openeggbert.core.entity.common.OpenEggbertException; +import com.openeggbert.core.utils.OpenEggbertUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; diff --git a/core/src/main/java/com/openeggbert/utils/EmbeddedFileHandleFactory.java b/core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java similarity index 97% rename from core/src/main/java/com/openeggbert/utils/EmbeddedFileHandleFactory.java rename to core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java index 7748356..2683e49 100644 --- a/core/src/main/java/com/openeggbert/utils/EmbeddedFileHandleFactory.java +++ b/core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.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.utils; +package com.openeggbert.core.utils; import com.badlogic.gdx.Application; import com.badlogic.gdx.Gdx; diff --git a/core/src/main/java/com/openeggbert/utils/OpenEggbertDisplayMode.java b/core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java similarity index 96% rename from core/src/main/java/com/openeggbert/utils/OpenEggbertDisplayMode.java rename to core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java index 30ecf94..24f5297 100644 --- a/core/src/main/java/com/openeggbert/utils/OpenEggbertDisplayMode.java +++ b/core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java @@ -17,13 +17,13 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.utils; +package com.openeggbert.core.utils; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Graphics; import com.badlogic.gdx.Graphics.DisplayMode; -import com.openeggbert.entity.common.ConfigDef; -import com.openeggbert.entity.common.OpenEggbertException; +import com.openeggbert.core.entity.common.ConfigDef; +import com.openeggbert.core.entity.common.OpenEggbertException; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/core/src/main/java/com/openeggbert/utils/OpenEggbertUtils.java b/core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java similarity index 92% rename from core/src/main/java/com/openeggbert/utils/OpenEggbertUtils.java rename to core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java index 045b032..637eca7 100644 --- a/core/src/main/java/com/openeggbert/utils/OpenEggbertUtils.java +++ b/core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java @@ -17,14 +17,14 @@ // or write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. /////////////////////////////////////////////////////////////////////////////////////////////// -package com.openeggbert.utils; +package com.openeggbert.core.utils; -import com.openeggbert.compatibility.FileNameCaseType; -import com.openeggbert.compatibility.ImageFormat; -import com.openeggbert.compatibility.MusicFormat; -import com.openeggbert.compatibility.SoundFormat; -import com.openeggbert.entity.common.GameFileType; -import com.openeggbert.entity.common.OpenEggbertException; +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 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 6dc032e..7a3e08a 100644 --- a/core/src/test/java/com/openeggbert/compatibility/FileNameCaseTypeTest.java +++ b/core/src/test/java/com/openeggbert/compatibility/FileNameCaseTypeTest.java @@ -19,9 +19,10 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.compatibility; -import com.openeggbert.entity.common.GameFileType; -import com.openeggbert.entity.common.OpenEggbertException; -import com.openeggbert.utils.OpenEggbertUtils; +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.OpenEggbertUtils; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.AfterEach; diff --git a/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java b/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java index d34b6a4..10e0aaa 100644 --- a/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java +++ b/core/src/test/java/com/openeggbert/utils/OpenEggbertUtilsTest.java @@ -19,7 +19,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.utils; -import com.openeggbert.entity.common.GameFileType; +import com.openeggbert.core.utils.OpenEggbertUtils; +import com.openeggbert.core.entity.common.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/GdxDefinition.gwt.xml b/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml index 95212a2..760fa94 100644 --- a/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml +++ b/html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml @@ -22,7 +22,7 @@ - + diff --git a/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java b/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java index fbc1949..dfa2c6b 100644 --- a/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java +++ b/html/src/main/java/com/openeggbert/gwt/GwtLauncher.java @@ -3,7 +3,8 @@ 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.main.OpenEggbertGame; +import com.openeggbert.core.compatibility.ScreenResolution; +import com.openeggbert.core.main.OpenEggbertGame; /** Launches the GWT application. */ public class GwtLauncher extends GwtApplication { @@ -16,7 +17,7 @@ public class GwtLauncher extends GwtApplication { //return cfg; // If you want a fixed size application, comment out the above resizable section, // and uncomment below: - return new GwtApplicationConfiguration(640, 480); + return new GwtApplicationConfiguration(ScreenResolution.VGA.getWidth(), ScreenResolution.VGA.getHeight()); } @Override diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/DesktopUtils.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/DesktopUtils.java index 46e3810..bf3b5a1 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.compatibility.Release; -import com.openeggbert.entity.common.GameSpace; -import com.openeggbert.entity.common.OpenEggbertException; +import com.openeggbert.core.compatibility.Release; +import com.openeggbert.core.entity.common.GameSpace; +import com.openeggbert.core.entity.common.OpenEggbertException; import java.io.File; import java.net.URISyntaxException; import java.util.Optional; @@ -41,17 +41,17 @@ public class DesktopUtils { String gameSpaceDirectoryFromSystemProperty = System.getProperty(GAME_SPACE_DIRECTORY, ""); if (!gameSpaceDirectoryFromEnvironmentVariable.isBlank()) { - return tryToLoadGameSpaceFromEnvironmentVariable(gameSpaceDirectoryFromEnvironmentVariable); + return tryToLoadGameSpaceFromDirectory(gameSpaceDirectoryFromEnvironmentVariable); } if (!gameSpaceDirectoryFromSystemProperty.isBlank()) { - return tryToLoadGameSpaceFromEnvironmentVariable(gameSpaceDirectoryFromSystemProperty); + return tryToLoadGameSpaceFromDirectory(gameSpaceDirectoryFromSystemProperty); } Optional gameOptional = tryToLoadGameSpaceFromCurrentDirectory(); return gameOptional; } private static final String GAME_SPACE_DIRECTORY = "GAME_SPACE_DIRECTORY"; - private static Optional tryToLoadGameSpaceFromEnvironmentVariable(String gameSpaceDirectoryFromEnvironmentVariable) { + private static Optional tryToLoadGameSpaceFromDirectory(String gameSpaceDirectoryFromEnvironmentVariable) { File gameSpaceDirectory = new File(gameSpaceDirectoryFromEnvironmentVariable); diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java index 77ca353..cb5e2dd 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/Lwjgl3Launcher.java @@ -22,8 +22,8 @@ package com.openeggbert.lwjgl3; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; -import com.openeggbert.main.OpenEggbertGame; -import com.openeggbert.entity.common.GameSpace; +import com.openeggbert.core.main.OpenEggbertGame; +import com.openeggbert.core.entity.common.GameSpace; import java.util.Optional; /** Launches the desktop (LWJGL3) application. */ diff --git a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DebuggingAssetsTxt.java b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DebuggingAssetsTxt.java index d2f0630..81a5afc 100644 --- a/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DebuggingAssetsTxt.java +++ b/lwjgl3/src/main/java/com/openeggbert/lwjgl3/debugging/DebuggingAssetsTxt.java @@ -19,7 +19,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.openeggbert.lwjgl3.debugging; -import com.openeggbert.utils.AssetsTxt; +import com.openeggbert.core.utils.AssetsTxt; import java.util.List; import java.util.Scanner;