From: fred-boy <fred-boy@protonmail.com>
Date: Mon, 18 Feb 2019 19:44:28 +0000 (+0700)
Subject: Rename project
X-Git-Tag: alpha0.4~68
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=0a855ca3c1d0c84de41a928cc99fd8544a933015;p=cavedroid.git
Rename project
---
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 @@
<?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 7984a53..af96291 100644
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 4beaa6e..9ab1ade 100644
--- 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 b0a5213..67fd74a 100644
--- 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 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<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 d08370e..f0da583 100644
--- 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 f80e7f6..8af5127 100644
--- 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 676ed38..9066d4b 100644
--- 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 b8460e0..3eeb6f9 100644
--- 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 108da51..8f9108d 100644
--- 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 b2acb6d..637eed7 100644
--- 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 8c919ce..bd50a04 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 = "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 492adec..bdfdd77 100644
--- 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);
}
}