Rename project

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 9fcb35dbcaad2dc966972dfc54acbe93f58511a7..522b4b8dfecd72e5628627a3d880be3c77718c7d 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ru.deadsoftware.cavecraft" >
+          package="ru.deadsoftware.cavedroid">
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="20" />
 
@@ -12,10 +12,10 @@
         android:label="@string/app_name"
         android:theme="@style/GdxTheme" >
         <activity
-            android:name="ru.deadsoftware.cavecraft.AndroidLauncher"
-            android:label="@string/app_name" 
-            android:screenOrientation="landscape"
-            android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize">
+                android:name="ru.deadsoftware.cavedroid.AndroidLauncher"
+                android:label="@string/app_name"
+                android:screenOrientation="landscape"
+                android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/android/assets/gamelogo.png b/android/assets/gamelogo.png
index 7984a531e2529c3c87d2c79e197152b8e064048f..af9629192431e6204e5e596e085543dcf1f0563d 100644 (file)
Binary files a/android/assets/gamelogo.png and b/android/assets/gamelogo.png differ

diff --git a/android/build.gradle b/android/build.gradle
index 4beaa6e2dd6650aaf0bac53c0fc489a0c29399fa..9ab1ade2fdc0ed7a3ca1d2ee598750bcd707769c 100644 (file)
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -20,7 +20,7 @@ android {
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
     defaultConfig {
-        applicationId "ru.deadsoftware.cavecraft"
+        applicationId "ru.deadsoftware.cavedroid"
         minSdkVersion 9
         targetSdkVersion 20
         versionCode 5
@@ -81,7 +81,7 @@ task run(type: Exec) {
     }
 
     def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'ru.deadsoftware.cavecraft/ru.deadsoftware.cavecraft.AndroidLauncher'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', 'ru.deadsoftware.cavedroid/ru.deadsoftware.cavedroid.AndroidLauncher'
 }
 // sets up the Android Eclipse project, using the old Ant based build.
 eclipse {

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index b0a5213accea3ccac54b2cf8da418bee3b45de80..67fd74a07fd42a77072d1d24489bbe875504d6ef 100644 (file)
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">CaveCraft</string>
+    <string name="app_name">CaveDroid</string>
 
 </resources>

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 1a0a92977e992cc5740019034c5a18c9f4f2d7f6..0851de431211c8580fd5c665e43e7568b89dbfde 100644 (file)
--- 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 c413ee9e6136abd4059bfa55318543a2c25ae309..8e69a31fb4dcccf5be3b6c447cdb27f1aafceb45 100644 (file)
--- 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 b70038b905e60e0ee3584ee535a8255c7baae6b1..ca1118675451390d5d289f8469bc6d77d90514df 100644 (file)
--- 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 0bbd9966f6a95af78c0f23313ede6657b053b102..6b5382e0909261a4f0b49f3f92958f821084ca81 100644 (file)
--- 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 e2877e3d23c267ec4c7faea3442c0884f36f2d9c..50ad5e4bf3b8dc34e7b763e3f79d61e64ee75bf0 100644 (file)
--- 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 42b0a75f882df2082963859acbb4e34a21ede9ce..39b9dfacff283c046f2ac41cb4637f2641c8370c 100644 (file)
--- 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 80274ab459da9ea957ef42d3dc77a911540fbbaa..fb0d6ed911e155e1d65d23186164d01e42640cc4 100644 (file)
--- 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 d946942fdfa53bfaa1a787288e0c98a3f965c0e9..7364e5967c767fcb3cc9be56d27400080c95a7a5 100644 (file)
--- 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 c5ec8df7aa5a7c842b9df33c2fa6916282226336..762492f4282d1bad8158f8fa1bb2395bec196ca8 100644 (file)
--- 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 5f8743dc8710a3f054b597fea29a9be5a19e6538..edc29e3f01c2ff97b16c60fade7ab31b1fb5921f 100644 (file)
--- 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 e6c5633ba78c016b76a521be8244bd929f172787..6aefd8945b760f3b25f8c92f56fa7904122712fc 100644 (file)
--- 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 974cef4d39fd073bbabd9be170f2e3e89a76e50b..faacb252ba36fd2dfd06b8f5c748d44203742a3d 100644 (file)
--- 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 23515f40a4079f5d311e666ee3a549f96d6154b0..f30faefb4375e55715f921332f74d2bada5c19d9 100644 (file)
--- 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 aa12a87561e2a08a25ab5ae184e069111213c97c..6194e4e93f1143c6edb108d6662e2f654f7975bf 100644 (file)
--- 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 f776ff5111ca0800b25c7ff127c969d182023cab..3b7edae21ed1748870f7b0d663407a11f33e4cd6 100644 (file)
--- 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 1dd9f9a2a659d46afb80f1fbf9e56fe99cd679f3..5bc0426eaac7c86e28edce896cd5d69a3124a4fb 100644 (file)
--- 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 58714852ea514847d09c29bc68a7e913b2f99b55..defbd3b3dcc920bbbfe5d5851d2978637ed45d57 100644 (file)
--- 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 f541daa2090b2855ec4fc102262f5944a6d9a16c..ed8d4ac08259515d887af14499296a9921b28a99 100644 (file)
--- 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 b34a91778ad9f61596afd9fe62a1d83e9fa0714b..3d082bf4d8ef46b3232d1ec61eb68633113e6a3f 100644 (file)
--- 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 93f68b5d43243e09c11251fb3d19f018d7218a8a..5fd04f902f2a99feee334803aad4c338849dd067 100644 (file)
--- 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 bdaf2b1a1f842eda665444000e363528c77a2b54..212003e74f59938f4c4cfd1288d439a84cd4f12b 100644 (file)
--- 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<Button>();
-        menuNGBtns.add(new Button("Survival", getWidth() / 2 - 100, getHeight() / 4, 1));
+        menuNGBtns.add(new Button("Survival", getWidth() / 2 - 100, getHeight() / 4, 0));
         menuNGBtns.add(new Button("Creative", getWidth() / 2 - 100, getHeight() / 4 + 30));
         menuNGBtns.add(new Button("Back", getWidth() / 2 - 100, getHeight() / 4 + 60));
 
@@ -83,7 +83,7 @@ public class MenuRenderer extends Renderer {
                 spriter.draw(Assets.shade, x * 16, y * 16);
             }
         }
-        spriter.draw(Assets.gameLogo, getWidth() / 2 - Assets.gameLogo.getWidth() / 2, 0);
+        spriter.draw(Assets.gameLogo, getWidth() / 2 - Assets.gameLogo.getWidth() / 2, 8);
 
         switch (CaveGame.STATE) {
             case MENU_MAIN:
@@ -101,8 +101,8 @@ public class MenuRenderer extends Renderer {
                 break;
         }
 
-        drawString("CaveCraft " + CaveGame.VERSION, 0,
-                getHeight() - Assets.getStringHeight("CaveCraft " + CaveGame.VERSION) * 1.5f);
+        drawString("CaveDroid " + CaveGame.VERSION, 0,
+                getHeight() - Assets.getStringHeight("CaveDroid " + CaveGame.VERSION) * 1.5f);
         spriter.end();
 
         switch (CaveGame.STATE) {

diff --git a/core/src/ru/deadsoftware/cavecraft/menu/objects/Button.java b/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
similarity index 96%
rename from core/src/ru/deadsoftware/cavecraft/menu/objects/Button.java
rename to core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
index d08370ef8506b3fa0b8d369dca58b0c83a5b5b45..f0da583f5c0e9c0127402e8eb067778b77211337 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/menu/objects/Button.java
+++ b/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
@@ -1,4 +1,4 @@
-package ru.deadsoftware.cavecraft.menu.objects;
+package ru.deadsoftware.cavedroid.menu.objects;
 
 import com.badlogic.gdx.math.Rectangle;
 

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/AppState.java b/core/src/ru/deadsoftware/cavedroid/misc/AppState.java
similarity index 83%
rename from core/src/ru/deadsoftware/cavecraft/misc/AppState.java
rename to core/src/ru/deadsoftware/cavedroid/misc/AppState.java
index f80e7f6a8a99fd1426b5ce12d534b86c2344e910..8af512773ef4fcb6bd2f85b8dac50c9392c4afed 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/AppState.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/AppState.java
@@ -1,4 +1,4 @@
-package ru.deadsoftware.cavecraft.misc;
+package ru.deadsoftware.cavedroid.misc;
 
 public enum AppState {
     GOTO_NEW_GAME,

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
similarity index 98%
rename from core/src/ru/deadsoftware/cavecraft/misc/Assets.java
rename to core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index 676ed38f1a57c96b3c9d822b838d2a00bc239b79..9066d4bfeede1ce9991eaf35791b2812a9e98bb9 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
@@ -1,4 +1,4 @@
-package ru.deadsoftware.cavecraft.misc;
+package ru.deadsoftware.cavedroid.misc;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
@@ -6,7 +6,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import ru.deadsoftware.cavecraft.CaveGame;
+import ru.deadsoftware.cavedroid.CaveGame;
 
 public class Assets {
 

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java b/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerGame.java
similarity index 93%
rename from core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
rename to core/src/ru/deadsoftware/cavedroid/misc/InputHandlerGame.java
index b8460e018de1eab888bf21fe902043ba853c0c4b..3eeb6f9f68368ec2b1ba3bf2d9cfaced828e3b40 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerGame.java
@@ -1,13 +1,11 @@
-package ru.deadsoftware.cavecraft.misc;
+package ru.deadsoftware.cavedroid.misc;
 
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.InputProcessor;
-import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.game.GameInput;
+import ru.deadsoftware.cavedroid.CaveGame;
+import ru.deadsoftware.cavedroid.game.GameInput;
 
-import static ru.deadsoftware.cavecraft.GameScreen.getHeight;
-import static ru.deadsoftware.cavecraft.GameScreen.getWidth;
-import static ru.deadsoftware.cavecraft.GameScreen.GP;
+import static ru.deadsoftware.cavedroid.GameScreen.*;
 
 public class InputHandlerGame implements InputProcessor {
 

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java b/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java
similarity index 89%
rename from core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java
rename to core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java
index 108da51eb2628bbc0c7f567582f7f5ff41ebdf45..8f9108df597c5c7b1470b6971fd6d90286c521b8 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerMenu.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java
@@ -1,10 +1,10 @@
-package ru.deadsoftware.cavecraft.misc;
+package ru.deadsoftware.cavedroid.misc;
 
 import com.badlogic.gdx.InputProcessor;
-import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.GameScreen;
-import ru.deadsoftware.cavecraft.menu.MenuRenderer;
-import ru.deadsoftware.cavecraft.menu.objects.Button;
+import ru.deadsoftware.cavedroid.CaveGame;
+import ru.deadsoftware.cavedroid.GameScreen;
+import ru.deadsoftware.cavedroid.menu.MenuRenderer;
+import ru.deadsoftware.cavedroid.menu.objects.Button;
 
 public class InputHandlerMenu implements InputProcessor {
 

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/Renderer.java b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
similarity index 95%
rename from core/src/ru/deadsoftware/cavecraft/misc/Renderer.java
rename to core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
index b2acb6d67c988014a6965652173cfdb939b7ea7d..637eed7c3b3f6dfd3f73fb35b94bbb122f7cec10 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/Renderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
@@ -1,10 +1,10 @@
-package ru.deadsoftware.cavecraft.misc;
+package ru.deadsoftware.cavedroid.misc;
 
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.SpriteCache;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavedroid.GameScreen;
 
 public abstract class Renderer {
 

diff --git a/desktop/build.gradle b/desktop/build.gradle
index 8c919ce28f1304c4756e341e1c55249cf31edb28..bd50a043363d17ad8d144c55a387eab4246e7e6e 100644 (file)
--- 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 = "ru.deadsoftware.cavecraft.desktop.DesktopLauncher"
+project.ext.mainClassName = "ru.deadsoftware.cavedroid.desktop.DesktopLauncher"
 project.ext.assetsDir = new File("../android/assets");
 
 task run(dependsOn: classes, type: JavaExec) {

diff --git a/desktop/src/ru/deadsoftware/cavecraft/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
similarity index 73%
rename from desktop/src/ru/deadsoftware/cavecraft/desktop/DesktopLauncher.java
rename to desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
index 492adecc51f8e89f87865510592a904d82b426c6..bdfdd7783b364bf16b91aee3f1d1d194c22f8619 100644 (file)
--- a/desktop/src/ru/deadsoftware/cavecraft/desktop/DesktopLauncher.java
+++ b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
@@ -1,9 +1,9 @@
-package ru.deadsoftware.cavecraft.desktop;
+package ru.deadsoftware.cavedroid.desktop;
 
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-import ru.deadsoftware.cavecraft.CaveGame;
+import ru.deadsoftware.cavedroid.CaveGame;
 
 public class DesktopLauncher {
        public static void main (String[] arg) {
@@ -11,7 +11,7 @@ public class DesktopLauncher {
                config.addIcon("icons/icon256.png", Files.FileType.Internal);
                config.addIcon("icons/icon128.png", Files.FileType.Internal);
                config.foregroundFPS = 60;
-               config.title = "CaveCraft";
+        config.title = "CaveDroid";
                config.width = 960;
                config.height = 540;
 
@@ -19,6 +19,6 @@ public class DesktopLauncher {
                for (String anArg : arg) {
                        if (anArg.equals("--touch")) touch = true;
                }
-               new LwjglApplication(new CaveGame(System.getProperty("user.home") + "/.cavecraft", touch), config);
+        new LwjglApplication(new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch), config);
        }
 }