From 0a855ca3c1d0c84de41a928cc99fd8544a933015 Mon Sep 17 00:00:00 2001 From: fred-boy Date: Tue, 19 Feb 2019 02:44:28 +0700 Subject: [PATCH] Rename project --- android/AndroidManifest.xml | 10 +++---- android/assets/gamelogo.png | Bin 4888 -> 2284 bytes android/build.gradle | 4 +-- android/res/values/strings.xml | 2 +- .../AndroidLauncher.java | 2 +- build.gradle | 2 +- .../{cavecraft => cavedroid}/CaveGame.java | 4 +-- .../{cavecraft => cavedroid}/GameScreen.java | 12 ++++---- .../game/GameInput.java | 14 +++++----- .../game/GameItems.java | 6 ++-- .../game/GamePhysics.java | 12 ++++---- .../game/GameProc.java | 22 +++++++-------- .../game/GameRenderer.java | 18 ++++++------ .../game/GameSaver.java | 4 +-- .../game/GameWorld.java | 4 +-- .../game/WorldGen.java | 2 +- .../game/mobs/FallingGravel.java | 6 ++-- .../game/mobs/FallingSand.java | 6 ++-- .../game/mobs/Mob.java | 2 +- .../game/mobs/Pig.java | 4 +-- .../game/objects/Block.java | 2 +- .../game/objects/Drop.java | 5 ++-- .../game/objects/Item.java | 2 +- .../game/objects/Player.java | 10 +++---- .../menu/MenuRenderer.java | 26 +++++++++--------- .../menu/objects/Button.java | 2 +- .../misc/AppState.java | 2 +- .../{cavecraft => cavedroid}/misc/Assets.java | 4 +-- .../misc/InputHandlerGame.java | 10 +++---- .../misc/InputHandlerMenu.java | 10 +++---- .../misc/Renderer.java | 4 +-- desktop/build.gradle | 2 +- .../desktop/DesktopLauncher.java | 8 +++--- 33 files changed, 110 insertions(+), 113 deletions(-) rename android/src/ru/deadsoftware/{cavecraft => cavedroid}/AndroidLauncher.java (96%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/CaveGame.java (89%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/GameScreen.java (91%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GameInput.java (95%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GameItems.java (98%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GamePhysics.java (95%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GameProc.java (97%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GameRenderer.java (96%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GameSaver.java (97%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/GameWorld.java (97%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/WorldGen.java (99%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/mobs/FallingGravel.java (80%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/mobs/FallingSand.java (80%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/mobs/Mob.java (97%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/mobs/Pig.java (94%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/objects/Block.java (97%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/objects/Drop.java (94%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/objects/Item.java (92%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/game/objects/Player.java (94%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/menu/MenuRenderer.java (87%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/menu/objects/Button.java (96%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/misc/AppState.java (83%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/misc/Assets.java (98%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/misc/InputHandlerGame.java (93%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/misc/InputHandlerMenu.java (89%) rename core/src/ru/deadsoftware/{cavecraft => cavedroid}/misc/Renderer.java (95%) rename desktop/src/ru/deadsoftware/{cavecraft => cavedroid}/desktop/DesktopLauncher.java (73%) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 9fcb35d..522b4b8 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="ru.deadsoftware.cavedroid"> @@ -12,10 +12,10 @@ android:label="@string/app_name" android:theme="@style/GdxTheme" > + android:name="ru.deadsoftware.cavedroid.AndroidLauncher" + android:label="@string/app_name" + android:screenOrientation="landscape" + android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize"> diff --git a/android/assets/gamelogo.png b/android/assets/gamelogo.png index 7984a531e2529c3c87d2c79e197152b8e064048f..af9629192431e6204e5e596e085543dcf1f0563d 100644 GIT binary patch delta 2234 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 g4K~ - CaveCraft + CaveDroid diff --git a/android/src/ru/deadsoftware/cavecraft/AndroidLauncher.java b/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java similarity index 96% rename from android/src/ru/deadsoftware/cavecraft/AndroidLauncher.java rename to android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java index 1a0a929..0851de4 100644 --- a/android/src/ru/deadsoftware/cavecraft/AndroidLauncher.java +++ b/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java @@ -1,4 +1,4 @@ -package ru.deadsoftware.cavecraft; +package ru.deadsoftware.cavedroid; import android.content.pm.PackageManager; import android.os.Bundle; diff --git a/build.gradle b/build.gradle index c413ee9..8e69a31 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ allprojects { version = 'alpha0.4' ext { - appName = "CaveCraft" + appName = "CaveDroid" gdxVersion = '1.9.7' roboVMVersion = '2.3.1' box2DLightsVersion = '1.4' diff --git a/core/src/ru/deadsoftware/cavecraft/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java similarity index 89% rename from core/src/ru/deadsoftware/cavecraft/CaveGame.java rename to core/src/ru/deadsoftware/cavedroid/CaveGame.java index b70038b..ca11186 100644 --- a/core/src/ru/deadsoftware/cavecraft/CaveGame.java +++ b/core/src/ru/deadsoftware/cavedroid/CaveGame.java @@ -1,8 +1,8 @@ -package ru.deadsoftware.cavecraft; +package ru.deadsoftware.cavedroid; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; -import ru.deadsoftware.cavecraft.misc.AppState; +import ru.deadsoftware.cavedroid.misc.AppState; public class CaveGame extends Game { diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/GameScreen.java similarity index 91% rename from core/src/ru/deadsoftware/cavecraft/GameScreen.java rename to core/src/ru/deadsoftware/cavedroid/GameScreen.java index 0bbd996..6b5382e 100644 --- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java +++ b/core/src/ru/deadsoftware/cavedroid/GameScreen.java @@ -1,12 +1,12 @@ -package ru.deadsoftware.cavecraft; +package ru.deadsoftware.cavedroid; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Screen; -import ru.deadsoftware.cavecraft.game.GameItems; -import ru.deadsoftware.cavecraft.game.GameProc; -import ru.deadsoftware.cavecraft.game.GameSaver; -import ru.deadsoftware.cavecraft.menu.MenuRenderer; -import ru.deadsoftware.cavecraft.misc.*; +import ru.deadsoftware.cavedroid.game.GameItems; +import ru.deadsoftware.cavedroid.game.GameProc; +import ru.deadsoftware.cavedroid.game.GameSaver; +import ru.deadsoftware.cavedroid.menu.MenuRenderer; +import ru.deadsoftware.cavedroid.misc.*; public class GameScreen implements Screen { diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java similarity index 95% rename from core/src/ru/deadsoftware/cavecraft/game/GameInput.java rename to core/src/ru/deadsoftware/cavedroid/game/GameInput.java index e2877e3..50ad5e4 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java @@ -1,14 +1,14 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Input; import com.badlogic.gdx.utils.TimeUtils; -import ru.deadsoftware.cavecraft.CaveGame; -import ru.deadsoftware.cavecraft.GameScreen; -import ru.deadsoftware.cavecraft.game.mobs.Pig; -import ru.deadsoftware.cavecraft.misc.AppState; -import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavedroid.CaveGame; +import ru.deadsoftware.cavedroid.GameScreen; +import ru.deadsoftware.cavedroid.game.mobs.Pig; +import ru.deadsoftware.cavedroid.misc.AppState; +import ru.deadsoftware.cavedroid.misc.Assets; -import static ru.deadsoftware.cavecraft.GameScreen.GP; +import static ru.deadsoftware.cavedroid.GameScreen.GP; public class GameInput { diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java similarity index 98% rename from core/src/ru/deadsoftware/cavecraft/game/GameItems.java rename to core/src/ru/deadsoftware/cavedroid/game/GameItems.java index 42b0a75..39b9dfa 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameItems.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java @@ -1,8 +1,8 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.utils.ArrayMap; -import ru.deadsoftware.cavecraft.game.objects.Block; -import ru.deadsoftware.cavecraft.game.objects.Item; +import ru.deadsoftware.cavedroid.game.objects.Block; +import ru.deadsoftware.cavedroid.game.objects.Item; import java.util.ArrayList; diff --git a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java similarity index 95% rename from core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java rename to core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java index 80274ab..fb0d6ed 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GamePhysics.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java @@ -1,17 +1,17 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.math.Intersector; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavecraft.CaveGame; -import ru.deadsoftware.cavecraft.game.mobs.Mob; -import ru.deadsoftware.cavecraft.game.objects.Drop; -import ru.deadsoftware.cavecraft.game.objects.Player; +import ru.deadsoftware.cavedroid.CaveGame; +import ru.deadsoftware.cavedroid.game.mobs.Mob; +import ru.deadsoftware.cavedroid.game.objects.Drop; +import ru.deadsoftware.cavedroid.game.objects.Player; import java.util.Iterator; -import static ru.deadsoftware.cavecraft.GameScreen.GP; +import static ru.deadsoftware.cavedroid.GameScreen.GP; class GamePhysics { diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java similarity index 97% rename from core/src/ru/deadsoftware/cavecraft/game/GameProc.java rename to core/src/ru/deadsoftware/cavedroid/game/GameProc.java index d946942..7364e59 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java @@ -1,18 +1,18 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.utils.TimeUtils; -import ru.deadsoftware.cavecraft.CaveGame; -import ru.deadsoftware.cavecraft.GameScreen; -import ru.deadsoftware.cavecraft.game.mobs.FallingGravel; -import ru.deadsoftware.cavecraft.game.mobs.FallingSand; -import ru.deadsoftware.cavecraft.game.mobs.Mob; -import ru.deadsoftware.cavecraft.game.mobs.Pig; -import ru.deadsoftware.cavecraft.game.objects.Drop; -import ru.deadsoftware.cavecraft.game.objects.Player; -import ru.deadsoftware.cavecraft.misc.AppState; -import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavedroid.CaveGame; +import ru.deadsoftware.cavedroid.GameScreen; +import ru.deadsoftware.cavedroid.game.mobs.FallingGravel; +import ru.deadsoftware.cavedroid.game.mobs.FallingSand; +import ru.deadsoftware.cavedroid.game.mobs.Mob; +import ru.deadsoftware.cavedroid.game.mobs.Pig; +import ru.deadsoftware.cavedroid.game.objects.Drop; +import ru.deadsoftware.cavedroid.game.objects.Player; +import ru.deadsoftware.cavedroid.misc.AppState; +import ru.deadsoftware.cavedroid.misc.Assets; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java similarity index 96% rename from core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java rename to core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java index c5ec8df..762492f 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -1,16 +1,16 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import ru.deadsoftware.cavecraft.CaveGame; -import ru.deadsoftware.cavecraft.GameScreen; -import ru.deadsoftware.cavecraft.game.mobs.Mob; -import ru.deadsoftware.cavecraft.game.objects.Drop; -import ru.deadsoftware.cavecraft.misc.Assets; -import ru.deadsoftware.cavecraft.misc.Renderer; - -import static ru.deadsoftware.cavecraft.GameScreen.GP; +import ru.deadsoftware.cavedroid.CaveGame; +import ru.deadsoftware.cavedroid.GameScreen; +import ru.deadsoftware.cavedroid.game.mobs.Mob; +import ru.deadsoftware.cavedroid.game.objects.Drop; +import ru.deadsoftware.cavedroid.misc.Assets; +import ru.deadsoftware.cavedroid.misc.Renderer; + +import static ru.deadsoftware.cavedroid.GameScreen.GP; public class GameRenderer extends Renderer { diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameSaver.java b/core/src/ru/deadsoftware/cavedroid/game/GameSaver.java similarity index 97% rename from core/src/ru/deadsoftware/cavecraft/game/GameSaver.java rename to core/src/ru/deadsoftware/cavedroid/game/GameSaver.java index 5f8743d..edc29e3 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameSaver.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameSaver.java @@ -1,8 +1,8 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; -import ru.deadsoftware.cavecraft.CaveGame; +import ru.deadsoftware.cavedroid.CaveGame; import java.io.*; import java.nio.ByteBuffer; diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java similarity index 97% rename from core/src/ru/deadsoftware/cavecraft/game/GameWorld.java rename to core/src/ru/deadsoftware/cavedroid/game/GameWorld.java index e6c5633..6aefd89 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java @@ -1,6 +1,6 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; -import ru.deadsoftware.cavecraft.game.objects.Drop; +import ru.deadsoftware.cavedroid.game.objects.Drop; public class GameWorld { diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavedroid/game/WorldGen.java similarity index 99% rename from core/src/ru/deadsoftware/cavecraft/game/WorldGen.java rename to core/src/ru/deadsoftware/cavedroid/game/WorldGen.java index 974cef4..faacb25 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java +++ b/core/src/ru/deadsoftware/cavedroid/game/WorldGen.java @@ -1,4 +1,4 @@ -package ru.deadsoftware.cavecraft.game; +package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.math.RandomXS128; import com.badlogic.gdx.utils.TimeUtils; diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java similarity index 80% rename from core/src/ru/deadsoftware/cavecraft/game/mobs/FallingGravel.java rename to core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java index 23515f4..f30faef 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/mobs/FallingGravel.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java @@ -1,9 +1,9 @@ -package ru.deadsoftware.cavecraft.game.mobs; +package ru.deadsoftware.cavedroid.game.mobs; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavecraft.game.GameItems; -import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavedroid.game.GameItems; +import ru.deadsoftware.cavedroid.misc.Assets; public class FallingGravel extends Mob { diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/FallingSand.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java similarity index 80% rename from core/src/ru/deadsoftware/cavecraft/game/mobs/FallingSand.java rename to core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java index aa12a87..6194e4e 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/mobs/FallingSand.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java @@ -1,9 +1,9 @@ -package ru.deadsoftware.cavecraft.game.mobs; +package ru.deadsoftware.cavedroid.game.mobs; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavecraft.game.GameItems; -import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavedroid.game.GameItems; +import ru.deadsoftware.cavedroid.misc.Assets; public class FallingSand extends Mob { diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java similarity index 97% rename from core/src/ru/deadsoftware/cavecraft/game/mobs/Mob.java rename to core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java index f776ff5..3b7edae 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/mobs/Mob.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java @@ -1,4 +1,4 @@ -package ru.deadsoftware.cavecraft.game.mobs; +package ru.deadsoftware.cavedroid.game.mobs; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.Rectangle; diff --git a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java similarity index 94% rename from core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java rename to core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java index 1dd9f9a..5bc0426 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/mobs/Pig.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java @@ -1,9 +1,9 @@ -package ru.deadsoftware.cavecraft.game.mobs; +package ru.deadsoftware.cavedroid.game.mobs; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavedroid.misc.Assets; public class Pig extends Mob { diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java similarity index 97% rename from core/src/ru/deadsoftware/cavecraft/game/objects/Block.java rename to core/src/ru/deadsoftware/cavedroid/game/objects/Block.java index 5871485..defbd3b 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/objects/Block.java +++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java @@ -1,4 +1,4 @@ -package ru.deadsoftware.cavecraft.game.objects; +package ru.deadsoftware.cavedroid.game.objects; import com.badlogic.gdx.math.Rectangle; diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Drop.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java similarity index 94% rename from core/src/ru/deadsoftware/cavecraft/game/objects/Drop.java rename to core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java index f541daa..ed8d4ac 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/objects/Drop.java +++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java @@ -1,13 +1,12 @@ -package ru.deadsoftware.cavecraft.game.objects; +package ru.deadsoftware.cavedroid.game.objects; import com.badlogic.gdx.math.Intersector; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavecraft.game.GameProc; import java.io.Serializable; -import static ru.deadsoftware.cavecraft.GameScreen.GP; +import static ru.deadsoftware.cavedroid.GameScreen.GP; public class Drop implements Serializable { diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Item.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Item.java similarity index 92% rename from core/src/ru/deadsoftware/cavecraft/game/objects/Item.java rename to core/src/ru/deadsoftware/cavedroid/game/objects/Item.java index b34a917..3d082bf 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/objects/Item.java +++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Item.java @@ -1,4 +1,4 @@ -package ru.deadsoftware.cavecraft.game.objects; +package ru.deadsoftware.cavedroid.game.objects; public class Item { diff --git a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Player.java similarity index 94% rename from core/src/ru/deadsoftware/cavecraft/game/objects/Player.java rename to core/src/ru/deadsoftware/cavedroid/game/objects/Player.java index 93f68b5..5fd04f9 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/objects/Player.java +++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Player.java @@ -1,16 +1,16 @@ -package ru.deadsoftware.cavecraft.game.objects; +package ru.deadsoftware.cavedroid.game.objects; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavecraft.game.GameItems; -import ru.deadsoftware.cavecraft.game.mobs.Mob; -import ru.deadsoftware.cavecraft.misc.Assets; +import ru.deadsoftware.cavedroid.game.GameItems; +import ru.deadsoftware.cavedroid.game.mobs.Mob; +import ru.deadsoftware.cavedroid.misc.Assets; import java.io.Serializable; -import static ru.deadsoftware.cavecraft.GameScreen.GP; +import static ru.deadsoftware.cavedroid.GameScreen.GP; public class Player extends Mob implements Serializable { diff --git a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java b/core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java similarity index 87% rename from core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java rename to core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java index bdaf2b1..212003e 100644 --- a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java @@ -1,15 +1,15 @@ -package ru.deadsoftware.cavecraft.menu; +package ru.deadsoftware.cavedroid.menu; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.utils.Array; -import ru.deadsoftware.cavecraft.CaveGame; -import ru.deadsoftware.cavecraft.GameScreen; -import ru.deadsoftware.cavecraft.game.GameItems; -import ru.deadsoftware.cavecraft.game.GameSaver; -import ru.deadsoftware.cavecraft.menu.objects.Button; -import ru.deadsoftware.cavecraft.misc.AppState; -import ru.deadsoftware.cavecraft.misc.Assets; -import ru.deadsoftware.cavecraft.misc.Renderer; +import ru.deadsoftware.cavedroid.CaveGame; +import ru.deadsoftware.cavedroid.GameScreen; +import ru.deadsoftware.cavedroid.game.GameItems; +import ru.deadsoftware.cavedroid.game.GameSaver; +import ru.deadsoftware.cavedroid.menu.objects.Button; +import ru.deadsoftware.cavedroid.misc.AppState; +import ru.deadsoftware.cavedroid.misc.Assets; +import ru.deadsoftware.cavedroid.misc.Renderer; public class MenuRenderer extends Renderer { @@ -25,7 +25,7 @@ public class MenuRenderer extends Renderer { menuMainBtns.add(new Button("Quit", getWidth() / 2 - 100, getHeight() / 4 + 60)); //new game menu menuNGBtns = new Array