Refactoring II

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 {

core/src/main/java/com/openeggbert/core/compatibility/FileExtension.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**
  *

core/src/main/java/com/openeggbert/core/compatibility/FileNameCaseType.java

@@ -17,9 +17,9 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/compatibility/GameDirectoryType.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/compatibility/ImageFormat.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/compatibility/ImageResolution.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/compatibility/Language.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**
  *

core/src/main/java/com/openeggbert/core/compatibility/MusicFormat.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/compatibility/Publisher.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**
  *

core/src/main/java/com/openeggbert/core/compatibility/Release.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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() {

core/src/main/java/com/openeggbert/core/compatibility/ReleaseType.java

@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 
-package com.openeggbert.compatibility;
+package com.openeggbert.core.compatibility;
 
 /**
  *

core/src/main/java/com/openeggbert/core/compatibility/ReleaseVersion.java

@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 
-package com.openeggbert.compatibility;
+package com.openeggbert.core.compatibility;
 
 /**
  *

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;
 

core/src/main/java/com/openeggbert/core/compatibility/SoundFormat.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/compatibility/StrictMode.java

@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 
-package com.openeggbert.compatibility;
+package com.openeggbert.core.compatibility;
 
 /**
  *

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;
 
 /**

core/src/main/java/com/openeggbert/core/entity/common/ConfigDef.java

@@ -17,9 +17,9 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/entity/common/ConfigDefKey.java

@@ -17,9 +17,9 @@
 // <https://www.gnu.org/licenses/> 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;

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;
 
 /**
  *

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;
 
 /**
  *

core/src/main/java/com/openeggbert/core/entity/common/GameSpace.java

@@ -17,9 +17,9 @@
 // <https://www.gnu.org/licenses/> 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;
 

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;
 
 
 /**

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;
 
 /**

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;
 
 /**
  *

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;
 

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;
 
 /**
  *

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;
 
 /**

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**

core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheet.java

@@ -17,10 +17,10 @@
 // <https://www.gnu.org/licenses/> 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<SpriteSheetRowColumn> optionalSpriteSheetRowColumn = Arrays.asList(com.openeggbert.entity.sprites.SpriteSheetRowColumn.values()).stream().filter(r -> r.getColumnName().equals(columnName)).findFirst();
+            Optional<SpriteSheetRowColumn> optionalSpriteSheetRowColumn = Arrays.asList(com.openeggbert.core.entity.sprites.SpriteSheetRowColumn.values()).stream().filter(r -> r.getColumnName().equals(columnName)).findFirst();
             if (!optionalSpriteSheetRowColumn.isPresent()) {
                 continue;
             }

core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRow.java

@@ -17,10 +17,10 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/entity/sprites/SpriteSheetRowColumn.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/main/OpenEggbertGame.java

@@ -17,9 +17,9 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/mods/Mod.java

@@ -17,11 +17,11 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/mods/ModIdentification.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

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;
 
 /**
  *

core/src/main/java/com/openeggbert/core/mods/Store.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/screens/AbstractGameScreen.java

@@ -17,14 +17,14 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**
  *

core/src/main/java/com/openeggbert/core/screens/AbstractOpenEggbertScreen.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 

core/src/main/java/com/openeggbert/core/screens/DemoScreen.java

@@ -17,15 +17,15 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**

core/src/main/java/com/openeggbert/core/screens/GameScreen.java

@@ -17,15 +17,15 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**

core/src/main/java/com/openeggbert/core/screens/GameSpaceListScreen.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/screens/InitScreen.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**

core/src/main/java/com/openeggbert/core/screens/MainHubScreen.java

@@ -17,15 +17,15 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**

core/src/main/java/com/openeggbert/core/screens/SubHubScreen.java

@@ -17,15 +17,15 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**

core/src/main/java/com/openeggbert/core/screens/TestScreen.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;
 
 /**

core/src/main/java/com/openeggbert/core/utils/AssetsTxt.java

@@ -17,13 +17,13 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/utils/EmbeddedFileHandleFactory.java

@@ -17,7 +17,7 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/utils/OpenEggbertDisplayMode.java

@@ -17,13 +17,13 @@
 // <https://www.gnu.org/licenses/> 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;

core/src/main/java/com/openeggbert/core/utils/OpenEggbertUtils.java

@@ -17,14 +17,14 @@
 // <https://www.gnu.org/licenses/> 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;

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;

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;

html/src/main/java/com/openeggbert/GdxDefinition.gwt.xml

@@ -22,7 +22,7 @@
   <inherits name="com.github.czyzby.websocket.GdxWebSocket" />
   <inherits name="com.github.czyzby.websocket.GdxWebSocketGwt" />
   <inherits name="com.github.czyzby.websocket.GdxWebSocketSerialization" />
-  <inherits name="com.openeggbert.main.OpenEggbertGame" />
+  <inherits name="com.openeggbert.core.main.OpenEggbertGame" />
   <!--<inherits name="com.openeggbert.gdx.storage.GdxStorageMainClass" />-->
   <inherits name="formic" />
   <inherits name="guacamole_gdx_gwt" />

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

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<GameSpace> gameOptional = tryToLoadGameSpaceFromCurrentDirectory();
         return gameOptional;
     }
     private static final String GAME_SPACE_DIRECTORY = "GAME_SPACE_DIRECTORY";
 
-    private static Optional<GameSpace> tryToLoadGameSpaceFromEnvironmentVariable(String gameSpaceDirectoryFromEnvironmentVariable) {
+    private static Optional<GameSpace> tryToLoadGameSpaceFromDirectory(String gameSpaceDirectoryFromEnvironmentVariable) {
 
         File gameSpaceDirectory = new File(gameSpaceDirectoryFromEnvironmentVariable);
 

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. */

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;