From 817b41475687999e0bde7164d0a0a06fd9e28e2a Mon Sep 17 00:00:00 2001 From: Miguel Angel Astor Romero Date: Fri, 24 Oct 2014 08:40:49 -0430 Subject: [PATCH] Renamed the project to CEIDEC-Pong. --- README.md | 9 +++-- android/AndroidManifest.xml | 4 +-- android/build.gradle | 2 +- .../android/AndroidLauncher.java | 4 +-- build.gradle | 2 +- .../{poukemon => ceidecpong}/GameCore.java | 16 ++++----- .../ProjectConstants.java | 2 +- .../ecs/components/BoundingBoxComponent.java | 2 +- .../ecs/components/Mappers.java | 2 +- .../ecs/components/PlayerComponent.java | 2 +- .../ecs/components/PositionComponent.java | 2 +- .../ecs/components/ScoreComponent.java | 2 +- .../ecs/components/SoundComponent.java | 2 +- .../ecs/components/SpriteComponent.java | 2 +- .../ecs/components/TextureComponent.java | 2 +- .../ecs/components/VelocityComponent.java | 2 +- .../ecs/entities/EntityInitializerBase.java | 2 +- .../ecs/entities/PongEntityInitializer.java | 24 ++++++------- .../ecs/systems/CollisionDetectionSystem.java | 20 ++++++----- .../ComputerPlayerPositioningSystem.java | 16 +++++---- .../systems/HumanPlayerPositioningSystem.java | 16 +++++---- .../ecs/systems/PositioningSystem.java | 8 ++--- .../ecs/systems/RenderingSystem.java | 8 ++--- .../ecs/systems/ScoringSystem.java | 14 ++++---- .../ecs/systems/SoundSystem.java | 10 +++--- .../messaging}/InterSystemMessage.java | 2 +- .../messaging}/InterSystemMessagingQueue.java | 2 +- .../effects/ScrollingBackground.java | 6 ++-- .../interfaces/AssetsLoadedListener.java | 2 +- .../states/BaseState.java | 4 +-- .../states/InGameState.java | 34 +++++++++---------- .../states/LoadingState.java | 12 +++---- .../states/LogoScreenState.java | 6 ++-- .../states/MainMenuState.java | 14 ++++---- .../utils/AsyncAssetLoader.java | 4 +-- .../utils/managers/CachedFontManager.java | 2 +- .../utils/managers/CachedSoundManager.java | 2 +- desktop/build.gradle | 2 +- .../desktop/DesktopLauncher.java | 4 +-- 39 files changed, 140 insertions(+), 131 deletions(-) rename android/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/android/AndroidLauncher.java (91%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/GameCore.java (92%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ProjectConstants.java (95%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/BoundingBoxComponent.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/Mappers.java (96%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/PlayerComponent.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/PositionComponent.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/ScoreComponent.java (93%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/SoundComponent.java (81%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/SpriteComponent.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/TextureComponent.java (95%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/components/VelocityComponent.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/entities/EntityInitializerBase.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/entities/PongEntityInitializer.java (89%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/CollisionDetectionSystem.java (90%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/ComputerPlayerPositioningSystem.java (79%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/HumanPlayerPositioningSystem.java (76%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/PositioningSystem.java (82%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/RenderingSystem.java (85%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/ScoringSystem.java (83%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/ecs/systems/SoundSystem.java (74%) rename core/src/com/gamejolt/mikykr5/{poukemon/ecs/systems => ceidecpong/ecs/systems/messaging}/InterSystemMessage.java (81%) rename core/src/com/gamejolt/mikykr5/{poukemon/ecs/systems => ceidecpong/ecs/systems/messaging}/InterSystemMessagingQueue.java (93%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/effects/ScrollingBackground.java (95%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/interfaces/AssetsLoadedListener.java (93%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/states/BaseState.java (97%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/states/InGameState.java (83%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/states/LoadingState.java (87%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/states/LogoScreenState.java (91%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/states/MainMenuState.java (94%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/utils/AsyncAssetLoader.java (96%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/utils/managers/CachedFontManager.java (97%) rename core/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/utils/managers/CachedSoundManager.java (97%) rename desktop/src/com/gamejolt/mikykr5/{poukemon => ceidecpong}/desktop/DesktopLauncher.java (91%) diff --git a/README.md b/README.md index 7479883..0b7f1ae 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -PouKémon: An affectionate mashup of Pou and Pokémon. -======================================================================================== +CEIDEC-Pong +=========== -PouKémon is an absurdly simplified [Pou] [3] clone programmed in Java with the [LibGDX] [4] +CEIDEC-Pong is a Pong-like game programmed in Java with the [LibGDX] [3] framework. It is being developed for a game programming course to be taught during the [CEIDEC 2014] [1] week at [Venezuela's Central University] [2]. @@ -10,5 +10,4 @@ file for more details. [1]: http://www.ceidec.com/ [2]: http://www.ucv.ve/ - [3]: http://www.pou.me/ - [4]: http://libgdx.badlogicgames.com/ + [3]: http://libgdx.badlogicgames.com/ diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f24c569..24c74d6 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -12,7 +12,7 @@ android:label="@string/app_name" android:theme="@style/GdxTheme" > diff --git a/android/build.gradle b/android/build.gradle index a512f7c..259a412 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -63,7 +63,7 @@ task run(type: Exec) { } def adb = path + "/platform-tools/adb" - commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.gamejolt.mikykr5.poukemon.android/com.gamejolt.mikykr5.poukemon.android.AndroidLauncher' + commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.gamejolt.mikykr5.ceidecpong.android/com.gamejolt.mikykr5.ceidecpong.android.AndroidLauncher' } // sets up the Android Eclipse project, using the old Ant based build. diff --git a/android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java b/android/src/com/gamejolt/mikykr5/ceidecpong/android/AndroidLauncher.java similarity index 91% rename from android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java rename to android/src/com/gamejolt/mikykr5/ceidecpong/android/AndroidLauncher.java index 0961b72..ff3a215 100644 --- a/android/src/com/gamejolt/mikykr5/poukemon/android/AndroidLauncher.java +++ b/android/src/com/gamejolt/mikykr5/ceidecpong/android/AndroidLauncher.java @@ -13,13 +13,13 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.android; +package com.gamejolt.mikykr5.ceidecpong.android; import android.os.Bundle; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; -import com.gamejolt.mikykr5.poukemon.GameCore; +import com.gamejolt.mikykr5.ceidecpong.GameCore; public class AndroidLauncher extends AndroidApplication { @Override diff --git a/build.gradle b/build.gradle index 87099f0..215e644 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ allprojects { version = '1.0' ext { - appName = 'PouKemon' + appName = 'CEIDEC-Pong' gdxVersion = '1.4.1' roboVMVersion = '0.0.14' } diff --git a/core/src/com/gamejolt/mikykr5/poukemon/GameCore.java b/core/src/com/gamejolt/mikykr5/ceidecpong/GameCore.java similarity index 92% rename from core/src/com/gamejolt/mikykr5/poukemon/GameCore.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/GameCore.java index db8d274..03add00 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/GameCore.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/GameCore.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon; +package com.gamejolt.mikykr5.ceidecpong; import aurelienribon.tweenengine.Tween; import aurelienribon.tweenengine.TweenEquations; @@ -29,13 +29,13 @@ import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShaderProgram; -import com.gamejolt.mikykr5.poukemon.interfaces.AssetsLoadedListener; -import com.gamejolt.mikykr5.poukemon.states.BaseState; -import com.gamejolt.mikykr5.poukemon.states.InGameState; -import com.gamejolt.mikykr5.poukemon.states.LoadingState; -import com.gamejolt.mikykr5.poukemon.states.LogoScreenState; -import com.gamejolt.mikykr5.poukemon.states.MainMenuState; -import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; +import com.gamejolt.mikykr5.ceidecpong.interfaces.AssetsLoadedListener; +import com.gamejolt.mikykr5.ceidecpong.states.BaseState; +import com.gamejolt.mikykr5.ceidecpong.states.InGameState; +import com.gamejolt.mikykr5.ceidecpong.states.LoadingState; +import com.gamejolt.mikykr5.ceidecpong.states.LogoScreenState; +import com.gamejolt.mikykr5.ceidecpong.states.MainMenuState; +import com.gamejolt.mikykr5.ceidecpong.utils.AsyncAssetLoader; public class GameCore extends Game { private static final String TAG = "GAME_CORE"; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ProjectConstants.java similarity index 95% rename from core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ProjectConstants.java index f58529a..6edcbb3 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ProjectConstants.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ProjectConstants.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon; +package com.gamejolt.mikykr5.ceidecpong; public abstract class ProjectConstants{ public static final int EXIT_SUCCESS = 0; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/BoundingBoxComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/BoundingBoxComponent.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/BoundingBoxComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/BoundingBoxComponent.java index 137f0fb..49defcd 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/BoundingBoxComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/BoundingBoxComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.math.Rectangle; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/Mappers.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/Mappers.java similarity index 96% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/Mappers.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/Mappers.java index d506cce..8cb9008 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/Mappers.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/Mappers.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.ComponentMapper; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/PlayerComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/PlayerComponent.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/PlayerComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/PlayerComponent.java index 35d89d0..243ac05 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/PlayerComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/PlayerComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.utils.Pool.Poolable; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/PositionComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/PositionComponent.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/PositionComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/PositionComponent.java index 5324ef0..162ccba 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/PositionComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/PositionComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.utils.Pool.Poolable; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/ScoreComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/ScoreComponent.java similarity index 93% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/ScoreComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/ScoreComponent.java index 69ddcb7..adad132 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/ScoreComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/ScoreComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.utils.Pool.Poolable; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/SoundComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/SoundComponent.java similarity index 81% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/SoundComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/SoundComponent.java index 0faf13e..00c8a4b 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/SoundComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/SoundComponent.java @@ -1,4 +1,4 @@ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.utils.Pool.Poolable; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/SpriteComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/SpriteComponent.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/SpriteComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/SpriteComponent.java index e25a759..b8c0ba6 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/SpriteComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/SpriteComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.graphics.g2d.Sprite; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/TextureComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/TextureComponent.java similarity index 95% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/TextureComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/TextureComponent.java index c97b0b4..74a4af4 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/TextureComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/TextureComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.graphics.Texture; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/VelocityComponent.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/VelocityComponent.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/components/VelocityComponent.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/VelocityComponent.java index 9474798..17d3b1f 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/components/VelocityComponent.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/components/VelocityComponent.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.components; +package com.gamejolt.mikykr5.ceidecpong.ecs.components; import com.badlogic.ashley.core.Component; import com.badlogic.gdx.utils.Pool.Poolable; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/entities/EntityInitializerBase.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/entities/EntityInitializerBase.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/entities/EntityInitializerBase.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/entities/EntityInitializerBase.java index 9afe557..ffbeb59 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/entities/EntityInitializerBase.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/entities/EntityInitializerBase.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.entities; +package com.gamejolt.mikykr5.ceidecpong.ecs.entities; import com.badlogic.ashley.core.PooledEngine; import com.badlogic.gdx.utils.Disposable; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/entities/PongEntityInitializer.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/entities/PongEntityInitializer.java similarity index 89% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/entities/PongEntityInitializer.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/entities/PongEntityInitializer.java index 8df131b..b2cf3af 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/entities/PongEntityInitializer.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/entities/PongEntityInitializer.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.entities; +package com.gamejolt.mikykr5.ceidecpong.ecs.entities; import com.badlogic.ashley.core.Entity; import com.badlogic.ashley.core.PooledEngine; @@ -22,17 +22,17 @@ import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; -import com.gamejolt.mikykr5.poukemon.ProjectConstants; -import com.gamejolt.mikykr5.poukemon.ecs.components.BoundingBoxComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PlayerComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.PositionComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.ScoreComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.SoundComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.SpriteComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.VelocityComponent; -import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; -import com.gamejolt.mikykr5.poukemon.utils.managers.CachedSoundManager; +import com.gamejolt.mikykr5.ceidecpong.ProjectConstants; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.BoundingBoxComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PlayerComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.ScoreComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.SoundComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.SpriteComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.VelocityComponent; +import com.gamejolt.mikykr5.ceidecpong.utils.AsyncAssetLoader; +import com.gamejolt.mikykr5.ceidecpong.utils.managers.CachedSoundManager; public class PongEntityInitializer extends EntityInitializerBase { private AsyncAssetLoader loader; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/CollisionDetectionSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/CollisionDetectionSystem.java similarity index 90% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/CollisionDetectionSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/CollisionDetectionSystem.java index 54f1d66..d9bef1c 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/CollisionDetectionSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/CollisionDetectionSystem.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import com.badlogic.ashley.core.ComponentType; import com.badlogic.ashley.core.Engine; @@ -24,14 +24,16 @@ import com.badlogic.ashley.utils.ImmutableArray; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; -import com.gamejolt.mikykr5.poukemon.ProjectConstants; -import com.gamejolt.mikykr5.poukemon.ecs.components.BoundingBoxComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PlayerComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.PositionComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.SoundComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.SpriteComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.VelocityComponent; +import com.gamejolt.mikykr5.ceidecpong.ProjectConstants; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.BoundingBoxComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PlayerComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.SoundComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.SpriteComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.VelocityComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessage; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessagingQueue; public class CollisionDetectionSystem extends IteratingSystem { private ImmutableArray collidables; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/ComputerPlayerPositioningSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/ComputerPlayerPositioningSystem.java similarity index 79% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/ComputerPlayerPositioningSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/ComputerPlayerPositioningSystem.java index e7c3c29..e3222ac 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/ComputerPlayerPositioningSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/ComputerPlayerPositioningSystem.java @@ -13,17 +13,19 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import com.badlogic.ashley.core.Entity; import com.badlogic.ashley.core.Family; import com.badlogic.ashley.systems.IteratingSystem; -import com.gamejolt.mikykr5.poukemon.ProjectConstants; -import com.gamejolt.mikykr5.poukemon.ecs.components.BoundingBoxComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PlayerComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.PositionComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.VelocityComponent; +import com.gamejolt.mikykr5.ceidecpong.ProjectConstants; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.BoundingBoxComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PlayerComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.VelocityComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessage; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessagingQueue; public class ComputerPlayerPositioningSystem extends IteratingSystem { private final float screenTopBorder; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/HumanPlayerPositioningSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/HumanPlayerPositioningSystem.java similarity index 76% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/HumanPlayerPositioningSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/HumanPlayerPositioningSystem.java index 35be0a2..4dae71b 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/HumanPlayerPositioningSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/HumanPlayerPositioningSystem.java @@ -13,16 +13,18 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import com.badlogic.ashley.core.Entity; import com.badlogic.ashley.core.Family; import com.badlogic.ashley.systems.IteratingSystem; -import com.gamejolt.mikykr5.poukemon.ProjectConstants; -import com.gamejolt.mikykr5.poukemon.ecs.components.BoundingBoxComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PlayerComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ProjectConstants; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.BoundingBoxComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PlayerComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessage; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessagingQueue; public class HumanPlayerPositioningSystem extends IteratingSystem { private final float screenTopBorder; @@ -41,7 +43,7 @@ public class HumanPlayerPositioningSystem extends IteratingSystem { InterSystemMessage message; PositionComponent position = Mappers.positionMapper.get(entity); PlayerComponent player = Mappers.playerMapper.get(entity); - BoundingBoxComponent bounds = Mappers.bboxMapper.get(entity); + BoundingBoxComponent bounds = Mappers.bboxMapper.get(entity); if(player.id == PlayerComponent.HUMAN_PLAYER){ while((message = InterSystemMessagingQueue.popMessage(HumanPlayerPositioningSystem.class.getCanonicalName())) != null){ diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/PositioningSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/PositioningSystem.java similarity index 82% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/PositioningSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/PositioningSystem.java index 82efc85..204bbc6 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/PositioningSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/PositioningSystem.java @@ -13,14 +13,14 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import com.badlogic.ashley.core.Entity; import com.badlogic.ashley.core.Family; import com.badlogic.ashley.systems.IteratingSystem; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PositionComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.VelocityComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.VelocityComponent; public class PositioningSystem extends IteratingSystem{ @SuppressWarnings("unchecked") diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/RenderingSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/RenderingSystem.java similarity index 85% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/RenderingSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/RenderingSystem.java index 7e1a165..27885f6 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/RenderingSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/RenderingSystem.java @@ -13,15 +13,15 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import com.badlogic.ashley.core.Entity; import com.badlogic.ashley.core.Family; import com.badlogic.ashley.systems.IteratingSystem; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PositionComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.SpriteComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PositionComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.SpriteComponent; public class RenderingSystem extends IteratingSystem{ private final SpriteBatch batch; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/ScoringSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/ScoringSystem.java similarity index 83% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/ScoringSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/ScoringSystem.java index 5b57901..4cb2af5 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/ScoringSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/ScoringSystem.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import java.util.LinkedList; import java.util.Queue; @@ -25,11 +25,13 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.gamejolt.mikykr5.poukemon.ProjectConstants; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.PlayerComponent; -import com.gamejolt.mikykr5.poukemon.ecs.components.ScoreComponent; -import com.gamejolt.mikykr5.poukemon.utils.managers.CachedFontManager; +import com.gamejolt.mikykr5.ceidecpong.ProjectConstants; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.PlayerComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.ScoreComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessage; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessagingQueue; +import com.gamejolt.mikykr5.ceidecpong.utils.managers.CachedFontManager; public class ScoringSystem extends IteratingSystem { private final SpriteBatch batch; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/SoundSystem.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/SoundSystem.java similarity index 74% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/SoundSystem.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/SoundSystem.java index 1991ed1..c40acc7 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/SoundSystem.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/SoundSystem.java @@ -1,4 +1,4 @@ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems; import java.util.LinkedList; import java.util.Queue; @@ -7,9 +7,11 @@ import com.badlogic.ashley.core.Entity; import com.badlogic.ashley.core.Family; import com.badlogic.ashley.systems.IteratingSystem; import com.badlogic.gdx.audio.Sound; -import com.gamejolt.mikykr5.poukemon.ecs.components.Mappers; -import com.gamejolt.mikykr5.poukemon.ecs.components.SoundComponent; -import com.gamejolt.mikykr5.poukemon.utils.managers.CachedSoundManager; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.Mappers; +import com.gamejolt.mikykr5.ceidecpong.ecs.components.SoundComponent; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessage; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessagingQueue; +import com.gamejolt.mikykr5.ceidecpong.utils.managers.CachedSoundManager; public class SoundSystem extends IteratingSystem { private Queue ignoredMessages; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/InterSystemMessage.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/messaging/InterSystemMessage.java similarity index 81% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/InterSystemMessage.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/messaging/InterSystemMessage.java index 6b1cae2..98f0751 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/InterSystemMessage.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/messaging/InterSystemMessage.java @@ -1,4 +1,4 @@ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging; import java.util.HashMap; import java.util.Map; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/InterSystemMessagingQueue.java b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/messaging/InterSystemMessagingQueue.java similarity index 93% rename from core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/InterSystemMessagingQueue.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/messaging/InterSystemMessagingQueue.java index ca3d635..deaeab8 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/ecs/systems/InterSystemMessagingQueue.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/ecs/systems/messaging/InterSystemMessagingQueue.java @@ -1,4 +1,4 @@ -package com.gamejolt.mikykr5.poukemon.ecs.systems; +package com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging; import java.util.LinkedList; import java.util.Queue; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java b/core/src/com/gamejolt/mikykr5/ceidecpong/effects/ScrollingBackground.java similarity index 95% rename from core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/effects/ScrollingBackground.java index eacb2d6..97a3a39 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/effects/ScrollingBackground.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/effects/ScrollingBackground.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.effects; +package com.gamejolt.mikykr5.ceidecpong.effects; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; @@ -23,8 +23,8 @@ import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShaderProgram; import com.badlogic.gdx.utils.Disposable; -import com.gamejolt.mikykr5.poukemon.interfaces.AssetsLoadedListener; -import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; +import com.gamejolt.mikykr5.ceidecpong.interfaces.AssetsLoadedListener; +import com.gamejolt.mikykr5.ceidecpong.utils.AsyncAssetLoader; public class ScrollingBackground implements Disposable, AssetsLoadedListener{ private static final String TAG = "SCROLLING_BACKGROUND"; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java b/core/src/com/gamejolt/mikykr5/ceidecpong/interfaces/AssetsLoadedListener.java similarity index 93% rename from core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/interfaces/AssetsLoadedListener.java index 3f7bd9a..17d661b 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/interfaces/AssetsLoadedListener.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/interfaces/AssetsLoadedListener.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.interfaces; +package com.gamejolt.mikykr5.ceidecpong.interfaces; public interface AssetsLoadedListener { public void onAssetsLoaded(); diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java b/core/src/com/gamejolt/mikykr5/ceidecpong/states/BaseState.java similarity index 97% rename from core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/states/BaseState.java index ff7ef3f..66b3e9f 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/BaseState.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/states/BaseState.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.states; +package com.gamejolt.mikykr5.ceidecpong.states; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputProcessor; @@ -21,7 +21,7 @@ import com.badlogic.gdx.Screen; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector3; -import com.gamejolt.mikykr5.poukemon.GameCore; +import com.gamejolt.mikykr5.ceidecpong.GameCore; public abstract class BaseState implements Screen, InputProcessor{ private static final String CLASS_NAME = BaseState.class.getSimpleName(); diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java b/core/src/com/gamejolt/mikykr5/ceidecpong/states/InGameState.java similarity index 83% rename from core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/states/InGameState.java index 3d917f0..cf2707b 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/InGameState.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/states/InGameState.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.states; +package com.gamejolt.mikykr5.ceidecpong.states; import com.badlogic.ashley.core.PooledEngine; import com.badlogic.gdx.Gdx; @@ -24,21 +24,21 @@ import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.glutils.FrameBuffer; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector3; -import com.gamejolt.mikykr5.poukemon.GameCore; -import com.gamejolt.mikykr5.poukemon.GameCore.game_states_t; -import com.gamejolt.mikykr5.poukemon.ProjectConstants; -import com.gamejolt.mikykr5.poukemon.ecs.entities.EntityInitializerBase; -import com.gamejolt.mikykr5.poukemon.ecs.entities.PongEntityInitializer; -import com.gamejolt.mikykr5.poukemon.ecs.systems.CollisionDetectionSystem; -import com.gamejolt.mikykr5.poukemon.ecs.systems.ComputerPlayerPositioningSystem; -import com.gamejolt.mikykr5.poukemon.ecs.systems.HumanPlayerPositioningSystem; -import com.gamejolt.mikykr5.poukemon.ecs.systems.InterSystemMessage; -import com.gamejolt.mikykr5.poukemon.ecs.systems.InterSystemMessagingQueue; -import com.gamejolt.mikykr5.poukemon.ecs.systems.PositioningSystem; -import com.gamejolt.mikykr5.poukemon.ecs.systems.RenderingSystem; -import com.gamejolt.mikykr5.poukemon.ecs.systems.ScoringSystem; -import com.gamejolt.mikykr5.poukemon.ecs.systems.SoundSystem; -import com.gamejolt.mikykr5.poukemon.interfaces.AssetsLoadedListener; +import com.gamejolt.mikykr5.ceidecpong.GameCore; +import com.gamejolt.mikykr5.ceidecpong.ProjectConstants; +import com.gamejolt.mikykr5.ceidecpong.GameCore.game_states_t; +import com.gamejolt.mikykr5.ceidecpong.ecs.entities.EntityInitializerBase; +import com.gamejolt.mikykr5.ceidecpong.ecs.entities.PongEntityInitializer; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.CollisionDetectionSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.ComputerPlayerPositioningSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.HumanPlayerPositioningSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.PositioningSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.RenderingSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.ScoringSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.SoundSystem; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessage; +import com.gamejolt.mikykr5.ceidecpong.ecs.systems.messaging.InterSystemMessagingQueue; +import com.gamejolt.mikykr5.ceidecpong.interfaces.AssetsLoadedListener; public class InGameState extends BaseState implements AssetsLoadedListener{ private PooledEngine engine; @@ -167,7 +167,7 @@ public class InGameState extends BaseState implements AssetsLoadedListener{ } @Override - public void onAssetsLoaded() { + public void onAssetsLoaded(){ entityInitializer.setLoadableAssets(engine); assetsLoaded = true; } diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java b/core/src/com/gamejolt/mikykr5/ceidecpong/states/LoadingState.java similarity index 87% rename from core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/states/LoadingState.java index 554d809..a5c9f52 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/LoadingState.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/states/LoadingState.java @@ -13,18 +13,18 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.states; +package com.gamejolt.mikykr5.ceidecpong.states; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds; -import com.gamejolt.mikykr5.poukemon.GameCore; -import com.gamejolt.mikykr5.poukemon.GameCore.game_states_t; -import com.gamejolt.mikykr5.poukemon.effects.ScrollingBackground; -import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; -import com.gamejolt.mikykr5.poukemon.utils.managers.CachedFontManager; +import com.gamejolt.mikykr5.ceidecpong.GameCore; +import com.gamejolt.mikykr5.ceidecpong.GameCore.game_states_t; +import com.gamejolt.mikykr5.ceidecpong.effects.ScrollingBackground; +import com.gamejolt.mikykr5.ceidecpong.utils.AsyncAssetLoader; +import com.gamejolt.mikykr5.ceidecpong.utils.managers.CachedFontManager; public class LoadingState extends BaseState{ // Helper fields. diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java b/core/src/com/gamejolt/mikykr5/ceidecpong/states/LogoScreenState.java similarity index 91% rename from core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/states/LogoScreenState.java index 20beacf..c43d5eb 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/LogoScreenState.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/states/LogoScreenState.java @@ -13,13 +13,13 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.states; +package com.gamejolt.mikykr5.ceidecpong.states; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; -import com.gamejolt.mikykr5.poukemon.GameCore; -import com.gamejolt.mikykr5.poukemon.GameCore.game_states_t; +import com.gamejolt.mikykr5.ceidecpong.GameCore; +import com.gamejolt.mikykr5.ceidecpong.GameCore.game_states_t; public class LogoScreenState extends BaseState{ private Texture logo; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java b/core/src/com/gamejolt/mikykr5/ceidecpong/states/MainMenuState.java similarity index 94% rename from core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/states/MainMenuState.java index ce204b2..a4db005 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/states/MainMenuState.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/states/MainMenuState.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.states; +package com.gamejolt.mikykr5.ceidecpong.states; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; @@ -27,12 +27,12 @@ import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle; import com.badlogic.gdx.scenes.scene2d.utils.NinePatchDrawable; -import com.gamejolt.mikykr5.poukemon.GameCore; -import com.gamejolt.mikykr5.poukemon.GameCore.game_states_t; -import com.gamejolt.mikykr5.poukemon.effects.ScrollingBackground; -import com.gamejolt.mikykr5.poukemon.interfaces.AssetsLoadedListener; -import com.gamejolt.mikykr5.poukemon.utils.AsyncAssetLoader; -import com.gamejolt.mikykr5.poukemon.utils.managers.CachedFontManager; +import com.gamejolt.mikykr5.ceidecpong.GameCore; +import com.gamejolt.mikykr5.ceidecpong.GameCore.game_states_t; +import com.gamejolt.mikykr5.ceidecpong.effects.ScrollingBackground; +import com.gamejolt.mikykr5.ceidecpong.interfaces.AssetsLoadedListener; +import com.gamejolt.mikykr5.ceidecpong.utils.AsyncAssetLoader; +import com.gamejolt.mikykr5.ceidecpong.utils.managers.CachedFontManager; public class MainMenuState extends BaseState implements AssetsLoadedListener{ // Helper fields. diff --git a/core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java b/core/src/com/gamejolt/mikykr5/ceidecpong/utils/AsyncAssetLoader.java similarity index 96% rename from core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/utils/AsyncAssetLoader.java index bc04acc..33fe72c 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/utils/AsyncAssetLoader.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/utils/AsyncAssetLoader.java @@ -13,14 +13,14 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.utils; +package com.gamejolt.mikykr5.ceidecpong.utils; import java.util.LinkedList; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.utils.Disposable; -import com.gamejolt.mikykr5.poukemon.interfaces.AssetsLoadedListener; +import com.gamejolt.mikykr5.ceidecpong.interfaces.AssetsLoadedListener; public final class AsyncAssetLoader implements Disposable{ private LinkedList listeners; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/utils/managers/CachedFontManager.java b/core/src/com/gamejolt/mikykr5/ceidecpong/utils/managers/CachedFontManager.java similarity index 97% rename from core/src/com/gamejolt/mikykr5/poukemon/utils/managers/CachedFontManager.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/utils/managers/CachedFontManager.java index 916286a..58b93fe 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/utils/managers/CachedFontManager.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/utils/managers/CachedFontManager.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.utils.managers; +package com.gamejolt.mikykr5.ceidecpong.utils.managers; import java.util.HashMap; import java.util.Map; diff --git a/core/src/com/gamejolt/mikykr5/poukemon/utils/managers/CachedSoundManager.java b/core/src/com/gamejolt/mikykr5/ceidecpong/utils/managers/CachedSoundManager.java similarity index 97% rename from core/src/com/gamejolt/mikykr5/poukemon/utils/managers/CachedSoundManager.java rename to core/src/com/gamejolt/mikykr5/ceidecpong/utils/managers/CachedSoundManager.java index 7ccc4b6..f71d99d 100644 --- a/core/src/com/gamejolt/mikykr5/poukemon/utils/managers/CachedSoundManager.java +++ b/core/src/com/gamejolt/mikykr5/ceidecpong/utils/managers/CachedSoundManager.java @@ -13,7 +13,7 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.utils.managers; +package com.gamejolt.mikykr5.ceidecpong.utils.managers; import java.util.HashMap; import java.util.Map; diff --git a/desktop/build.gradle b/desktop/build.gradle index 41be9d8..12c5666 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -3,7 +3,7 @@ apply plugin: "java" sourceCompatibility = 1.6 sourceSets.main.java.srcDirs = [ "src/" ] -project.ext.mainClassName = "com.gamejolt.mikykr5.poukemon.desktop.DesktopLauncher" +project.ext.mainClassName = "com.gamejolt.mikykr5.ceidecpong.desktop.DesktopLauncher" project.ext.assetsDir = new File("../android/assets"); task run(dependsOn: classes, type: JavaExec) { diff --git a/desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java b/desktop/src/com/gamejolt/mikykr5/ceidecpong/desktop/DesktopLauncher.java similarity index 91% rename from desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java rename to desktop/src/com/gamejolt/mikykr5/ceidecpong/desktop/DesktopLauncher.java index 0bb3b2b..2320b5c 100644 --- a/desktop/src/com/gamejolt/mikykr5/poukemon/desktop/DesktopLauncher.java +++ b/desktop/src/com/gamejolt/mikykr5/ceidecpong/desktop/DesktopLauncher.java @@ -13,11 +13,11 @@ * * Read the LICENSE file for more details. */ -package com.gamejolt.mikykr5.poukemon.desktop; +package com.gamejolt.mikykr5.ceidecpong.desktop; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import com.gamejolt.mikykr5.poukemon.GameCore; +import com.gamejolt.mikykr5.ceidecpong.GameCore; public class DesktopLauncher { public static void main (String[] arg) {