Update version script

diff --git a/android/build.gradle b/android/build.gradle
deleted file mode 100644 (file)
index d52b9e9..0000000
--- a/android/build.gradle
+++ /dev/null
@@ -1,147 +0,0 @@
-buildscript {
-    configurations { natives }
-}
-
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-}
-
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-android {
-    namespace "ru.deadsoftware.cavedroid"
-    compileSdkVersion 34
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-            jniLibs.srcDirs = ['libs']
-        }
-        debug {
-            res.srcDirs = ['debug/res']
-        }
-    }
-    compileOptions {
-        sourceCompatibility 17
-        targetCompatibility 17
-    }
-    packagingOptions {
-        exclude 'META-INF/robovm/ios/robovm.xml'
-    }
-    defaultConfig {
-        applicationId "ru.deadsoftware.cavedroid"
-        minSdkVersion 19
-        targetSdkVersion 34
-        versionCode 25
-        versionName "alpha0.9.2"
-
-        multiDexEnabled true
-    }
-    applicationVariants.all { variant ->
-        variant.outputs.all {
-            outputFileName = "android-${versionName}.apk"
-        }
-    }
-
-    signingConfigs {
-        release_config {
-            storeFile file(keystoreProperties['releaseKeystorePath'])
-            storePassword keystoreProperties['releaseKeystorePassword']
-            keyAlias keystoreProperties['releaseKeyAlias']
-            keyPassword keystoreProperties['releaseKeyPassword']
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            signingConfig signingConfigs.release_config
-        }
-        debug {
-            applicationIdSuffix ".debug"
-        }
-    }
-    buildFeatures {
-        buildConfig true
-    }
-
-}
-
-
-// called every time gradle gets executed, takes the native dependencies of
-// the natives configuration, and extracts them to the proper libs/ folders
-// so they get packed with the APK.
-task copyAndroidNatives {
-    doFirst {
-        file("libs/armeabi/").mkdirs()
-        file("libs/armeabi-v7a/").mkdirs()
-        file("libs/arm64-v8a/").mkdirs()
-        file("libs/x86_64/").mkdirs()
-        file("libs/x86/").mkdirs()
-
-        configurations.natives.files.each { jar ->
-            def outputDir = null
-            if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
-            if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
-            if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
-            if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
-            if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
-            if(outputDir != null) {
-                copy {
-                    from zipTree(jar)
-                    into outputDir
-                    include "*.so"
-                }
-            }
-        }
-    }
-}
-
-tasks.whenTaskAdded { packageTask ->
-    if (packageTask.name.contains("package")) {
-        packageTask.dependsOn 'copyAndroidNatives'
-    }
-}
-
-task run(type: Exec) {
-    def path
-    def localProperties = project.file("../local.properties")
-    if (localProperties.exists()) {
-        Properties properties = new Properties()
-        localProperties.withInputStream { instr ->
-            properties.load(instr)
-        }
-        def sdkDir = properties.getProperty('sdk.dir')
-        if (sdkDir) {
-            path = sdkDir
-        } else {
-            path = "$System.env.ANDROID_HOME"
-        }
-    } else {
-        path = "$System.env.ANDROID_HOME"
-    }
-
-    def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'ru.deadsoftware.cavedroid/ru.deadsoftware.cavedroid.AndroidLauncher'
-}
-
-dependencies {
-    implementation project(":core")
-    implementation platform("org.jetbrains.kotlin:kotlin-bom:$kotlinVersion")
-    api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
-
-    configurations.implementation {
-        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
-    }
-}
\ No newline at end of file

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
new file mode 100644 (file)
index 0000000..40e158e
--- /dev/null
+++ b/android/build.gradle.kts
@@ -0,0 +1,131 @@
+import java.io.FileInputStream
+import java.util.Properties
+
+private val natives by configurations.creating
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+}
+
+private val keystorePropertiesFile = rootProject.file("keystore.properties")
+private val keystoreProperties = if (keystorePropertiesFile.exists()) {
+    Properties().apply {
+        load(FileInputStream(keystorePropertiesFile))
+    }
+} else {
+    null
+}
+
+
+android {
+    namespace = ApplicationInfo.packageName
+    compileSdk = 34
+
+    sourceSets {
+
+        named("main") {
+            jniLibs.srcDir("libs")
+        }
+
+        named("debug") {
+            res.srcDir("src/debug/res")
+        }
+
+    }
+
+    compileOptions {
+        sourceCompatibility = ApplicationInfo.sourceCompatibility
+        targetCompatibility = ApplicationInfo.sourceCompatibility
+    }
+
+    defaultConfig {
+        applicationId = ApplicationInfo.packageName
+        minSdk = 19
+        targetSdk = 34
+
+        versionCode = ApplicationInfo.versionCode
+        versionName = ApplicationInfo.versionName
+
+        multiDexEnabled = true
+    }
+
+    applicationVariants.asSequence()
+        .flatMap { variant -> variant.outputs.asSequence() }
+        .mapNotNull { output -> output as? com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+        .forEach { output -> output.outputFileName = "android-${ApplicationInfo.versionName}.apk" }
+
+    val releaseConfig = signingConfigs.create("release_config")
+    with(releaseConfig) {
+        storeFile = keystoreProperties?.get("releaseKeystorePath")?.let(::file)
+        storePassword = keystoreProperties?.get("releaseKeystorePassword")?.toString()
+        keyAlias = keystoreProperties?.get("releaseKeyAlias")?.toString()
+        keyPassword = keystoreProperties?.get("releaseKeyPassword")?.toString()
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            signingConfig = releaseConfig
+        }
+
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+}
+
+// called every time gradle gets executed, takes the native dependencies of
+// the natives configuration, and extracts them to the proper libs/ folders
+// so they get packed with the APK.
+task("copyAndroidNatives") {
+    doFirst {
+        val armeabiV7Dir = file("libs/armeabi-v7a/").apply { mkdirs() }
+        val arm64Dir = file("libs/arm64-v8a/").apply { mkdirs() }
+        val x86Dir = file("libs/x86/").apply { mkdirs() }
+        val amd64Dir = file("libs/x86_64/").apply { mkdirs() }
+
+        natives.files.forEach { jar ->
+            val outputDir = when {
+                jar.name.endsWith("natives-armeabi-v7a.jar") -> armeabiV7Dir
+                jar.name.endsWith("natives-arm64-v8a.jar") -> arm64Dir
+                jar.name.endsWith("natives-x86.jar") -> x86Dir
+                jar.name.endsWith("natives-x86_64.jar") -> amd64Dir
+                else -> null
+            }
+
+            if (outputDir != null) {
+                copy {
+                    from(zipTree(jar))
+                    into(outputDir)
+                    include("*.so")
+                }
+            }
+        }
+    }
+}
+
+tasks.whenTaskAdded {
+    if (name.contains("package")) {
+        dependsOn("copyAndroidNatives")
+    }
+}
+
+dependencies {
+    implementation((project(":core")))
+    implementation(platform(Dependencies.Kotlin.bom))
+
+    implementation(Dependencies.LibGDX.gdx)
+    implementation(Dependencies.LibGDX.Android.backend)
+
+    natives(Dependencies.LibGDX.Android.Natives.armeabi)
+    natives(Dependencies.LibGDX.Android.Natives.arm64)
+    natives(Dependencies.LibGDX.Android.Natives.x86)
+    natives(Dependencies.LibGDX.Android.Natives.x86_64)
+
+    configurations["implementation"].exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
+}
\ No newline at end of file

diff --git a/android/project.properties b/android/project.properties
deleted file mode 100644 (file)
index 3fefa92..0000000
--- a/android/project.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is used by the Eclipse ADT plugin. It is unnecessary for IDEA and Android Studio projects, which
-# configure Proguard and the Android target via the build.gradle file.
-
-# To enable ProGuard to work with Eclipse ADT, uncomment this (available properties: sdk.dir, user.home)
-# and ensure proguard.jar in the Android SDK is up to date (or alternately reduce the android target to 23 or lower):
-# proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-rules.pro
-
-# Project target.
-target=android-19

diff --git a/android/debug/res/drawable-hdpi/ic_launcher.png b/android/src/debug/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/debug/res/drawable-hdpi/ic_launcher.png
rename to android/src/debug/res/drawable-hdpi/ic_launcher.png

diff --git a/android/debug/res/drawable-mdpi/ic_launcher.png b/android/src/debug/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/debug/res/drawable-mdpi/ic_launcher.png
rename to android/src/debug/res/drawable-mdpi/ic_launcher.png

diff --git a/android/debug/res/drawable-xhdpi/ic_launcher.png b/android/src/debug/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from android/debug/res/drawable-xhdpi/ic_launcher.png
rename to android/src/debug/res/drawable-xhdpi/ic_launcher.png

diff --git a/android/debug/res/drawable-xxhdpi/ic_launcher.png b/android/src/debug/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/debug/res/drawable-xxhdpi/ic_launcher.png
rename to android/src/debug/res/drawable-xxhdpi/ic_launcher.png

diff --git a/android/debug/res/drawable-xxxhdpi/ic_launcher.png b/android/src/debug/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/debug/res/drawable-xxxhdpi/ic_launcher.png
rename to android/src/debug/res/drawable-xxxhdpi/ic_launcher.png

diff --git a/android/debug/res/drawable/ic_launcher_foreground.xml b/android/src/debug/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from android/debug/res/drawable/ic_launcher_foreground.xml
rename to android/src/debug/res/drawable/ic_launcher_foreground.xml

diff --git a/android/debug/res/values/strings.xml b/android/src/debug/res/values/strings.xml
similarity index 100%
rename from android/debug/res/values/strings.xml
rename to android/src/debug/res/values/strings.xml

diff --git a/android/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
similarity index 100%
rename from android/AndroidManifest.xml
rename to android/src/main/AndroidManifest.xml

diff --git a/android/src/main/assets b/android/src/main/assets
new file mode 120000 (symlink)
index 0000000..2978ef3
--- /dev/null
+++ b/android/src/main/assets
@@ -0,0 +1 @@
+../../../assets
\ No newline at end of file

diff --git a/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt
new file mode 100644 (file)
index 0000000..b6fff78
--- /dev/null
+++ b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidLauncher.kt
@@ -0,0 +1,34 @@
+package ru.deadsoftware.cavedroid
+
+import android.os.Bundle
+import com.badlogic.gdx.backends.android.AndroidApplication
+import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration
+
+class AndroidLauncher : AndroidApplication() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val gameDataDirectoryPath = packageManager.getPackageInfo(packageName, 0)
+            .applicationInfo.dataDir;
+
+        val config = AndroidApplicationConfiguration()
+        config.useImmersiveMode = true
+
+        initialize(
+            /* listener = */ CaveGame(
+                gameDataDirectoryPath = gameDataDirectoryPath,
+                isTouchScreen = true,
+                isDebug = BuildConfig.DEBUG,
+                preferencesStore = AndroidPreferencesStore(applicationContext)
+            ),
+            /* config = */ config
+        )
+    }
+
+    @Suppress("OVERRIDE_DEPRECATION")
+    override fun onBackPressed() {
+        // ignore
+    }
+
+}
\ No newline at end of file

diff --git a/android/src/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt b/android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt
similarity index 100%
rename from android/src/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt
rename to android/src/main/kotlin/ru/deadsoftware/cavedroid/AndroidPreferencesStore.kt

diff --git a/android/res/drawable-anydpi-v26/ic_launcher.xml b/android/src/main/res/drawable-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from android/res/drawable-anydpi-v26/ic_launcher.xml
rename to android/src/main/res/drawable-anydpi-v26/ic_launcher.xml

diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-hdpi/ic_launcher.png
rename to android/src/main/res/drawable-hdpi/ic_launcher.png

diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-mdpi/ic_launcher.png
rename to android/src/main/res/drawable-mdpi/ic_launcher.png

diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xhdpi/ic_launcher.png
rename to android/src/main/res/drawable-xhdpi/ic_launcher.png

diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xxhdpi/ic_launcher.png
rename to android/src/main/res/drawable-xxhdpi/ic_launcher.png

diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/src/main/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from android/res/drawable-xxxhdpi/ic_launcher.png
rename to android/src/main/res/drawable-xxxhdpi/ic_launcher.png

diff --git a/android/res/drawable/ic_launcher_background.xml b/android/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from android/res/drawable/ic_launcher_background.xml
rename to android/src/main/res/drawable/ic_launcher_background.xml

diff --git a/android/res/drawable/ic_launcher_foreground.xml b/android/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from android/res/drawable/ic_launcher_foreground.xml
rename to android/src/main/res/drawable/ic_launcher_foreground.xml

diff --git a/android/res/values/strings.xml b/android/src/main/res/values/strings.xml
similarity index 100%
rename from android/res/values/strings.xml
rename to android/src/main/res/values/strings.xml

diff --git a/android/res/values/styles.xml b/android/src/main/res/values/styles.xml
similarity index 100%
rename from android/res/values/styles.xml
rename to android/src/main/res/values/styles.xml

diff --git a/android/res/xml/backup_descriptor.xml b/android/src/main/res/xml/backup_descriptor.xml
similarity index 100%
rename from android/res/xml/backup_descriptor.xml
rename to android/src/main/res/xml/backup_descriptor.xml

diff --git a/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java b/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java
deleted file mode 100644 (file)
index 3f38ad4..0000000
--- a/android/src/ru/deadsoftware/cavedroid/AndroidLauncher.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package ru.deadsoftware.cavedroid;
-
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import com.badlogic.gdx.backends.android.AndroidApplication;
-import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-
-public class AndroidLauncher extends AndroidApplication {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-        config.useImmersiveMode = true;
-        String gameFolder = "";
-        try {
-            gameFolder = getPackageManager().getPackageInfo(getPackageName(), 0).applicationInfo.dataDir;
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            exit();
-        }
-        CaveGame caveGame = new CaveGame(gameFolder, true,
-                new AndroidPreferencesStore(getApplicationContext()), null);
-        caveGame.setDebug(BuildConfig.DEBUG);
-        initialize(caveGame, config);
-    }
-
-    @Override
-    public void onBackPressed() {
-    }
-}

diff --git a/android/assets/font.fnt b/assets/font.fnt
similarity index 100%
rename from android/assets/font.fnt
rename to assets/font.fnt

diff --git a/android/assets/font.png b/assets/font.png
similarity index 100%
rename from android/assets/font.png
rename to assets/font.png

diff --git a/android/assets/gamelogo.png b/assets/gamelogo.png
similarity index 100%
rename from android/assets/gamelogo.png
rename to assets/gamelogo.png

diff --git a/android/assets/icons/icon128.png b/assets/icons/icon128.png
similarity index 100%
rename from android/assets/icons/icon128.png
rename to assets/icons/icon128.png

diff --git a/android/assets/icons/icon256.png b/assets/icons/icon256.png
similarity index 100%
rename from android/assets/icons/icon256.png
rename to assets/icons/icon256.png

diff --git a/android/assets/icons/icon512.png b/assets/icons/icon512.png
similarity index 100%
rename from android/assets/icons/icon512.png
rename to assets/icons/icon512.png

diff --git a/android/assets/joy_background.png b/assets/joy_background.png
similarity index 100%
rename from android/assets/joy_background.png
rename to assets/joy_background.png

diff --git a/android/assets/joy_stick.png b/assets/joy_stick.png
similarity index 100%
rename from android/assets/joy_stick.png
rename to assets/joy_stick.png

diff --git a/android/assets/json/crafting.json b/assets/json/crafting.json
similarity index 100%
rename from android/assets/json/crafting.json
rename to assets/json/crafting.json

diff --git a/android/assets/json/game_items.json b/assets/json/game_items.json
similarity index 100%
rename from android/assets/json/game_items.json
rename to assets/json/game_items.json

diff --git a/android/assets/json/menu_main_buttons.json b/assets/json/menu_main_buttons.json
similarity index 100%
rename from android/assets/json/menu_main_buttons.json
rename to assets/json/menu_main_buttons.json

diff --git a/android/assets/json/menu_new_game_buttons.json b/assets/json/menu_new_game_buttons.json
similarity index 100%
rename from android/assets/json/menu_new_game_buttons.json
rename to assets/json/menu_new_game_buttons.json

diff --git a/android/assets/json/menu_options_buttons.json b/assets/json/menu_options_buttons.json
similarity index 100%
rename from android/assets/json/menu_options_buttons.json
rename to assets/json/menu_options_buttons.json

diff --git a/android/assets/json/texture_regions.json b/assets/json/texture_regions.json
similarity index 100%
rename from android/assets/json/texture_regions.json
rename to assets/json/texture_regions.json

diff --git a/android/assets/json/touch_buttons.json b/assets/json/touch_buttons.json
similarity index 100%
rename from android/assets/json/touch_buttons.json
rename to assets/json/touch_buttons.json

diff --git a/android/assets/pp/allitems.png b/assets/pp/allitems.png
similarity index 100%
rename from android/assets/pp/allitems.png
rename to assets/pp/allitems.png

diff --git a/android/assets/pp/background.png b/assets/pp/background.png
similarity index 100%
rename from android/assets/pp/background.png
rename to assets/pp/background.png

diff --git a/android/assets/pp/background_top.png b/assets/pp/background_top.png
similarity index 100%
rename from android/assets/pp/background_top.png
rename to assets/pp/background_top.png

diff --git a/android/assets/pp/break.png b/assets/pp/break.png
similarity index 100%
rename from android/assets/pp/break.png
rename to assets/pp/break.png

diff --git a/android/assets/pp/buttons.png b/assets/pp/buttons.png
similarity index 100%
rename from android/assets/pp/buttons.png
rename to assets/pp/buttons.png

diff --git a/android/assets/pp/chest.png b/assets/pp/chest.png
similarity index 100%
rename from android/assets/pp/chest.png
rename to assets/pp/chest.png

diff --git a/android/assets/pp/chest_large.png b/assets/pp/chest_large.png
similarity index 100%
rename from android/assets/pp/chest_large.png
rename to assets/pp/chest_large.png

diff --git a/android/assets/pp/crafting_table.png b/assets/pp/crafting_table.png
similarity index 100%
rename from android/assets/pp/crafting_table.png
rename to assets/pp/crafting_table.png

diff --git a/android/assets/pp/furnace.png b/assets/pp/furnace.png
similarity index 100%
rename from android/assets/pp/furnace.png
rename to assets/pp/furnace.png

diff --git a/android/assets/pp/gui.png b/assets/pp/gui.png
similarity index 100%
rename from android/assets/pp/gui.png
rename to assets/pp/gui.png

diff --git a/android/assets/pp/health.png b/assets/pp/health.png
similarity index 100%
rename from android/assets/pp/health.png
rename to assets/pp/health.png

diff --git a/android/assets/pp/inventory.png b/assets/pp/inventory.png
similarity index 100%
rename from android/assets/pp/inventory.png
rename to assets/pp/inventory.png

diff --git a/android/assets/pp/mobs/char/0_0.png b/assets/pp/mobs/char/0_0.png
similarity index 100%
rename from android/assets/pp/mobs/char/0_0.png
rename to assets/pp/mobs/char/0_0.png

diff --git a/android/assets/pp/mobs/char/0_1.png b/assets/pp/mobs/char/0_1.png
similarity index 100%
rename from android/assets/pp/mobs/char/0_1.png
rename to assets/pp/mobs/char/0_1.png

diff --git a/android/assets/pp/mobs/char/0_2.png b/assets/pp/mobs/char/0_2.png
similarity index 100%
rename from android/assets/pp/mobs/char/0_2.png
rename to assets/pp/mobs/char/0_2.png

diff --git a/android/assets/pp/mobs/char/0_3.png b/assets/pp/mobs/char/0_3.png
similarity index 100%
rename from android/assets/pp/mobs/char/0_3.png
rename to assets/pp/mobs/char/0_3.png

diff --git a/android/assets/pp/mobs/char/1_0.png b/assets/pp/mobs/char/1_0.png
similarity index 100%
rename from android/assets/pp/mobs/char/1_0.png
rename to assets/pp/mobs/char/1_0.png

diff --git a/android/assets/pp/mobs/char/1_1.png b/assets/pp/mobs/char/1_1.png
similarity index 100%
rename from android/assets/pp/mobs/char/1_1.png
rename to assets/pp/mobs/char/1_1.png

diff --git a/android/assets/pp/mobs/char/1_2.png b/assets/pp/mobs/char/1_2.png
similarity index 100%
rename from android/assets/pp/mobs/char/1_2.png
rename to assets/pp/mobs/char/1_2.png

diff --git a/android/assets/pp/mobs/char/1_3.png b/assets/pp/mobs/char/1_3.png
similarity index 100%
rename from android/assets/pp/mobs/char/1_3.png
rename to assets/pp/mobs/char/1_3.png

diff --git a/android/assets/pp/mobs/pig/0_0.png b/assets/pp/mobs/pig/0_0.png
similarity index 100%
rename from android/assets/pp/mobs/pig/0_0.png
rename to assets/pp/mobs/pig/0_0.png

diff --git a/android/assets/pp/mobs/pig/0_1.png b/assets/pp/mobs/pig/0_1.png
similarity index 100%
rename from android/assets/pp/mobs/pig/0_1.png
rename to assets/pp/mobs/pig/0_1.png

diff --git a/android/assets/pp/mobs/pig/1_0.png b/assets/pp/mobs/pig/1_0.png
similarity index 100%
rename from android/assets/pp/mobs/pig/1_0.png
rename to assets/pp/mobs/pig/1_0.png

diff --git a/android/assets/pp/mobs/pig/1_1.png b/assets/pp/mobs/pig/1_1.png
similarity index 100%
rename from android/assets/pp/mobs/pig/1_1.png
rename to assets/pp/mobs/pig/1_1.png

diff --git a/android/assets/pp/shade.png b/assets/pp/shade.png
similarity index 100%
rename from android/assets/pp/shade.png
rename to assets/pp/shade.png

diff --git a/android/assets/pp/textures/blocks/bed_l.png b/assets/pp/textures/blocks/bed_l.png
similarity index 100%
rename from android/assets/pp/textures/blocks/bed_l.png
rename to assets/pp/textures/blocks/bed_l.png

diff --git a/android/assets/pp/textures/blocks/bed_r.png b/assets/pp/textures/blocks/bed_r.png
similarity index 100%
rename from android/assets/pp/textures/blocks/bed_r.png
rename to assets/pp/textures/blocks/bed_r.png

diff --git a/android/assets/pp/textures/blocks/bedrock.png b/assets/pp/textures/blocks/bedrock.png
similarity index 100%
rename from android/assets/pp/textures/blocks/bedrock.png
rename to assets/pp/textures/blocks/bedrock.png

diff --git a/android/assets/pp/textures/blocks/bookshelf.png b/assets/pp/textures/blocks/bookshelf.png
similarity index 100%
rename from android/assets/pp/textures/blocks/bookshelf.png
rename to assets/pp/textures/blocks/bookshelf.png

diff --git a/android/assets/pp/textures/blocks/bricks.png b/assets/pp/textures/blocks/bricks.png
similarity index 100%
rename from android/assets/pp/textures/blocks/bricks.png
rename to assets/pp/textures/blocks/bricks.png

diff --git a/android/assets/pp/textures/blocks/cactus.png b/assets/pp/textures/blocks/cactus.png
similarity index 100%
rename from android/assets/pp/textures/blocks/cactus.png
rename to assets/pp/textures/blocks/cactus.png

diff --git a/android/assets/pp/textures/blocks/cake.png b/assets/pp/textures/blocks/cake.png
similarity index 100%
rename from android/assets/pp/textures/blocks/cake.png
rename to assets/pp/textures/blocks/cake.png

diff --git a/android/assets/pp/textures/blocks/chest.png b/assets/pp/textures/blocks/chest.png
similarity index 100%
rename from android/assets/pp/textures/blocks/chest.png
rename to assets/pp/textures/blocks/chest.png

diff --git a/android/assets/pp/textures/blocks/clay.png b/assets/pp/textures/blocks/clay.png
similarity index 100%
rename from android/assets/pp/textures/blocks/clay.png
rename to assets/pp/textures/blocks/clay.png

diff --git a/android/assets/pp/textures/blocks/coal_block.png b/assets/pp/textures/blocks/coal_block.png
similarity index 100%
rename from android/assets/pp/textures/blocks/coal_block.png
rename to assets/pp/textures/blocks/coal_block.png

diff --git a/android/assets/pp/textures/blocks/coal_ore.png b/assets/pp/textures/blocks/coal_ore.png
similarity index 100%
rename from android/assets/pp/textures/blocks/coal_ore.png
rename to assets/pp/textures/blocks/coal_ore.png

diff --git a/android/assets/pp/textures/blocks/cobblestone.png b/assets/pp/textures/blocks/cobblestone.png
similarity index 100%
rename from android/assets/pp/textures/blocks/cobblestone.png
rename to assets/pp/textures/blocks/cobblestone.png

diff --git a/android/assets/pp/textures/blocks/cobblestone_mossy.png b/assets/pp/textures/blocks/cobblestone_mossy.png
similarity index 100%
rename from android/assets/pp/textures/blocks/cobblestone_mossy.png
rename to assets/pp/textures/blocks/cobblestone_mossy.png

diff --git a/android/assets/pp/textures/blocks/crafting_table.png b/assets/pp/textures/blocks/crafting_table.png
similarity index 100%
rename from android/assets/pp/textures/blocks/crafting_table.png
rename to assets/pp/textures/blocks/crafting_table.png

diff --git a/android/assets/pp/textures/blocks/dandelion.png b/assets/pp/textures/blocks/dandelion.png
similarity index 100%
rename from android/assets/pp/textures/blocks/dandelion.png
rename to assets/pp/textures/blocks/dandelion.png

diff --git a/android/assets/pp/textures/blocks/deadbush.png b/assets/pp/textures/blocks/deadbush.png
similarity index 100%
rename from android/assets/pp/textures/blocks/deadbush.png
rename to assets/pp/textures/blocks/deadbush.png

diff --git a/android/assets/pp/textures/blocks/diamond_block.png b/assets/pp/textures/blocks/diamond_block.png
similarity index 100%
rename from android/assets/pp/textures/blocks/diamond_block.png
rename to assets/pp/textures/blocks/diamond_block.png

diff --git a/android/assets/pp/textures/blocks/diamond_ore.png b/assets/pp/textures/blocks/diamond_ore.png
similarity index 100%
rename from android/assets/pp/textures/blocks/diamond_ore.png
rename to assets/pp/textures/blocks/diamond_ore.png

diff --git a/android/assets/pp/textures/blocks/dirt.png b/assets/pp/textures/blocks/dirt.png
similarity index 100%
rename from android/assets/pp/textures/blocks/dirt.png
rename to assets/pp/textures/blocks/dirt.png

diff --git a/android/assets/pp/textures/blocks/furnace.png b/assets/pp/textures/blocks/furnace.png
similarity index 100%
rename from android/assets/pp/textures/blocks/furnace.png
rename to assets/pp/textures/blocks/furnace.png

diff --git a/android/assets/pp/textures/blocks/glass.png b/assets/pp/textures/blocks/glass.png
similarity index 100%
rename from android/assets/pp/textures/blocks/glass.png
rename to assets/pp/textures/blocks/glass.png

diff --git a/android/assets/pp/textures/blocks/gold_block.png b/assets/pp/textures/blocks/gold_block.png
similarity index 100%
rename from android/assets/pp/textures/blocks/gold_block.png
rename to assets/pp/textures/blocks/gold_block.png

diff --git a/android/assets/pp/textures/blocks/gold_ore.png b/assets/pp/textures/blocks/gold_ore.png
similarity index 100%
rename from android/assets/pp/textures/blocks/gold_ore.png
rename to assets/pp/textures/blocks/gold_ore.png

diff --git a/android/assets/pp/textures/blocks/grass.png b/assets/pp/textures/blocks/grass.png
similarity index 100%
rename from android/assets/pp/textures/blocks/grass.png
rename to assets/pp/textures/blocks/grass.png

diff --git a/android/assets/pp/textures/blocks/grass_snowed.png b/assets/pp/textures/blocks/grass_snowed.png
similarity index 100%
rename from android/assets/pp/textures/blocks/grass_snowed.png
rename to assets/pp/textures/blocks/grass_snowed.png

diff --git a/android/assets/pp/textures/blocks/gravel.png b/assets/pp/textures/blocks/gravel.png
similarity index 100%
rename from android/assets/pp/textures/blocks/gravel.png
rename to assets/pp/textures/blocks/gravel.png

diff --git a/android/assets/pp/textures/blocks/iron_bars.png b/assets/pp/textures/blocks/iron_bars.png
similarity index 100%
rename from android/assets/pp/textures/blocks/iron_bars.png
rename to assets/pp/textures/blocks/iron_bars.png

diff --git a/android/assets/pp/textures/blocks/iron_block.png b/assets/pp/textures/blocks/iron_block.png
similarity index 100%
rename from android/assets/pp/textures/blocks/iron_block.png
rename to assets/pp/textures/blocks/iron_block.png

diff --git a/android/assets/pp/textures/blocks/iron_ore.png b/assets/pp/textures/blocks/iron_ore.png
similarity index 100%
rename from android/assets/pp/textures/blocks/iron_ore.png
rename to assets/pp/textures/blocks/iron_ore.png

diff --git a/android/assets/pp/textures/blocks/ladder.png b/assets/pp/textures/blocks/ladder.png
similarity index 100%
rename from android/assets/pp/textures/blocks/ladder.png
rename to assets/pp/textures/blocks/ladder.png

diff --git a/android/assets/pp/textures/blocks/lapis_block.png b/assets/pp/textures/blocks/lapis_block.png
similarity index 100%
rename from android/assets/pp/textures/blocks/lapis_block.png
rename to assets/pp/textures/blocks/lapis_block.png

diff --git a/android/assets/pp/textures/blocks/lapis_ore.png b/assets/pp/textures/blocks/lapis_ore.png
similarity index 100%
rename from android/assets/pp/textures/blocks/lapis_ore.png
rename to assets/pp/textures/blocks/lapis_ore.png

diff --git a/android/assets/pp/textures/blocks/lava_flow.png b/assets/pp/textures/blocks/lava_flow.png
similarity index 100%
rename from android/assets/pp/textures/blocks/lava_flow.png
rename to assets/pp/textures/blocks/lava_flow.png

diff --git a/android/assets/pp/textures/blocks/lava_still.png b/assets/pp/textures/blocks/lava_still.png
similarity index 100%
rename from android/assets/pp/textures/blocks/lava_still.png
rename to assets/pp/textures/blocks/lava_still.png

diff --git a/android/assets/pp/textures/blocks/leaves_oak.png b/assets/pp/textures/blocks/leaves_oak.png
similarity index 100%
rename from android/assets/pp/textures/blocks/leaves_oak.png
rename to assets/pp/textures/blocks/leaves_oak.png

diff --git a/android/assets/pp/textures/blocks/leaves_spruce.png b/assets/pp/textures/blocks/leaves_spruce.png
similarity index 100%
rename from android/assets/pp/textures/blocks/leaves_spruce.png
rename to assets/pp/textures/blocks/leaves_spruce.png

diff --git a/android/assets/pp/textures/blocks/log_birch.png b/assets/pp/textures/blocks/log_birch.png
similarity index 100%
rename from android/assets/pp/textures/blocks/log_birch.png
rename to assets/pp/textures/blocks/log_birch.png

diff --git a/android/assets/pp/textures/blocks/log_oak.png b/assets/pp/textures/blocks/log_oak.png
similarity index 100%
rename from android/assets/pp/textures/blocks/log_oak.png
rename to assets/pp/textures/blocks/log_oak.png

diff --git a/android/assets/pp/textures/blocks/log_spruce.png b/assets/pp/textures/blocks/log_spruce.png
similarity index 100%
rename from android/assets/pp/textures/blocks/log_spruce.png
rename to assets/pp/textures/blocks/log_spruce.png

diff --git a/android/assets/pp/textures/blocks/mushroom_brown.png b/assets/pp/textures/blocks/mushroom_brown.png
similarity index 100%
rename from android/assets/pp/textures/blocks/mushroom_brown.png
rename to assets/pp/textures/blocks/mushroom_brown.png

diff --git a/android/assets/pp/textures/blocks/mushroom_red.png b/assets/pp/textures/blocks/mushroom_red.png
similarity index 100%
rename from android/assets/pp/textures/blocks/mushroom_red.png
rename to assets/pp/textures/blocks/mushroom_red.png

diff --git a/android/assets/pp/textures/blocks/noteblock.png b/assets/pp/textures/blocks/noteblock.png
similarity index 100%
rename from android/assets/pp/textures/blocks/noteblock.png
rename to assets/pp/textures/blocks/noteblock.png

diff --git a/android/assets/pp/textures/blocks/obsidian.png b/assets/pp/textures/blocks/obsidian.png
similarity index 100%
rename from android/assets/pp/textures/blocks/obsidian.png
rename to assets/pp/textures/blocks/obsidian.png

diff --git a/android/assets/pp/textures/blocks/planks_birch.png b/assets/pp/textures/blocks/planks_birch.png
similarity index 100%
rename from android/assets/pp/textures/blocks/planks_birch.png
rename to assets/pp/textures/blocks/planks_birch.png

diff --git a/android/assets/pp/textures/blocks/planks_oak.png b/assets/pp/textures/blocks/planks_oak.png
similarity index 100%
rename from android/assets/pp/textures/blocks/planks_oak.png
rename to assets/pp/textures/blocks/planks_oak.png

diff --git a/android/assets/pp/textures/blocks/planks_spruce.png b/assets/pp/textures/blocks/planks_spruce.png
similarity index 100%
rename from android/assets/pp/textures/blocks/planks_spruce.png
rename to assets/pp/textures/blocks/planks_spruce.png

diff --git a/android/assets/pp/textures/blocks/rose.png b/assets/pp/textures/blocks/rose.png
similarity index 100%
rename from android/assets/pp/textures/blocks/rose.png
rename to assets/pp/textures/blocks/rose.png

diff --git a/android/assets/pp/textures/blocks/sand.png b/assets/pp/textures/blocks/sand.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sand.png
rename to assets/pp/textures/blocks/sand.png

diff --git a/android/assets/pp/textures/blocks/sandstone.png b/assets/pp/textures/blocks/sandstone.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sandstone.png
rename to assets/pp/textures/blocks/sandstone.png

diff --git a/android/assets/pp/textures/blocks/sapling_birch.png b/assets/pp/textures/blocks/sapling_birch.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sapling_birch.png
rename to assets/pp/textures/blocks/sapling_birch.png

diff --git a/android/assets/pp/textures/blocks/sapling_oak.png b/assets/pp/textures/blocks/sapling_oak.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sapling_oak.png
rename to assets/pp/textures/blocks/sapling_oak.png

diff --git a/android/assets/pp/textures/blocks/sapling_spruce.png b/assets/pp/textures/blocks/sapling_spruce.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sapling_spruce.png
rename to assets/pp/textures/blocks/sapling_spruce.png

diff --git a/android/assets/pp/textures/blocks/snow.png b/assets/pp/textures/blocks/snow.png
similarity index 100%
rename from android/assets/pp/textures/blocks/snow.png
rename to assets/pp/textures/blocks/snow.png

diff --git a/android/assets/pp/textures/blocks/sponge.png b/assets/pp/textures/blocks/sponge.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sponge.png
rename to assets/pp/textures/blocks/sponge.png

diff --git a/android/assets/pp/textures/blocks/sponge_wet.png b/assets/pp/textures/blocks/sponge_wet.png
similarity index 100%
rename from android/assets/pp/textures/blocks/sponge_wet.png
rename to assets/pp/textures/blocks/sponge_wet.png

diff --git a/android/assets/pp/textures/blocks/stone.png b/assets/pp/textures/blocks/stone.png
similarity index 100%
rename from android/assets/pp/textures/blocks/stone.png
rename to assets/pp/textures/blocks/stone.png

diff --git a/android/assets/pp/textures/blocks/stone_slab.png b/assets/pp/textures/blocks/stone_slab.png
similarity index 100%
rename from android/assets/pp/textures/blocks/stone_slab.png
rename to assets/pp/textures/blocks/stone_slab.png

diff --git a/android/assets/pp/textures/blocks/stonebrick.png b/assets/pp/textures/blocks/stonebrick.png
similarity index 100%
rename from android/assets/pp/textures/blocks/stonebrick.png
rename to assets/pp/textures/blocks/stonebrick.png

diff --git a/android/assets/pp/textures/blocks/tallgrass.png b/assets/pp/textures/blocks/tallgrass.png
similarity index 100%
rename from android/assets/pp/textures/blocks/tallgrass.png
rename to assets/pp/textures/blocks/tallgrass.png

diff --git a/android/assets/pp/textures/blocks/water_flow.png b/assets/pp/textures/blocks/water_flow.png
similarity index 100%
rename from android/assets/pp/textures/blocks/water_flow.png
rename to assets/pp/textures/blocks/water_flow.png

diff --git a/android/assets/pp/textures/blocks/water_still.png b/assets/pp/textures/blocks/water_still.png
similarity index 100%
rename from android/assets/pp/textures/blocks/water_still.png
rename to assets/pp/textures/blocks/water_still.png

diff --git a/android/assets/pp/textures/blocks/web.png b/assets/pp/textures/blocks/web.png
similarity index 100%
rename from android/assets/pp/textures/blocks/web.png
rename to assets/pp/textures/blocks/web.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_black.png b/assets/pp/textures/blocks/wool_colored_black.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_black.png
rename to assets/pp/textures/blocks/wool_colored_black.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_blue.png b/assets/pp/textures/blocks/wool_colored_blue.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_blue.png
rename to assets/pp/textures/blocks/wool_colored_blue.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_brown.png b/assets/pp/textures/blocks/wool_colored_brown.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_brown.png
rename to assets/pp/textures/blocks/wool_colored_brown.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_cyan.png b/assets/pp/textures/blocks/wool_colored_cyan.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_cyan.png
rename to assets/pp/textures/blocks/wool_colored_cyan.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_gray.png b/assets/pp/textures/blocks/wool_colored_gray.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_gray.png
rename to assets/pp/textures/blocks/wool_colored_gray.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_green.png b/assets/pp/textures/blocks/wool_colored_green.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_green.png
rename to assets/pp/textures/blocks/wool_colored_green.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_light_blue.png b/assets/pp/textures/blocks/wool_colored_light_blue.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_light_blue.png
rename to assets/pp/textures/blocks/wool_colored_light_blue.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_lime.png b/assets/pp/textures/blocks/wool_colored_lime.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_lime.png
rename to assets/pp/textures/blocks/wool_colored_lime.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_magenta.png b/assets/pp/textures/blocks/wool_colored_magenta.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_magenta.png
rename to assets/pp/textures/blocks/wool_colored_magenta.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_orange.png b/assets/pp/textures/blocks/wool_colored_orange.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_orange.png
rename to assets/pp/textures/blocks/wool_colored_orange.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_pink.png b/assets/pp/textures/blocks/wool_colored_pink.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_pink.png
rename to assets/pp/textures/blocks/wool_colored_pink.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_purple.png b/assets/pp/textures/blocks/wool_colored_purple.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_purple.png
rename to assets/pp/textures/blocks/wool_colored_purple.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_red.png b/assets/pp/textures/blocks/wool_colored_red.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_red.png
rename to assets/pp/textures/blocks/wool_colored_red.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_silver.png b/assets/pp/textures/blocks/wool_colored_silver.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_silver.png
rename to assets/pp/textures/blocks/wool_colored_silver.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_white.png b/assets/pp/textures/blocks/wool_colored_white.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_white.png
rename to assets/pp/textures/blocks/wool_colored_white.png

diff --git a/android/assets/pp/textures/blocks/wool_colored_yellow.png b/assets/pp/textures/blocks/wool_colored_yellow.png
similarity index 100%
rename from android/assets/pp/textures/blocks/wool_colored_yellow.png
rename to assets/pp/textures/blocks/wool_colored_yellow.png

diff --git a/android/assets/pp/textures/items/bed.png b/assets/pp/textures/items/bed.png
similarity index 100%
rename from android/assets/pp/textures/items/bed.png
rename to assets/pp/textures/items/bed.png

diff --git a/android/assets/pp/textures/items/bucket_empty.png b/assets/pp/textures/items/bucket_empty.png
similarity index 100%
rename from android/assets/pp/textures/items/bucket_empty.png
rename to assets/pp/textures/items/bucket_empty.png

diff --git a/android/assets/pp/textures/items/bucket_lava.png b/assets/pp/textures/items/bucket_lava.png
similarity index 100%
rename from android/assets/pp/textures/items/bucket_lava.png
rename to assets/pp/textures/items/bucket_lava.png

diff --git a/android/assets/pp/textures/items/bucket_milk.png b/assets/pp/textures/items/bucket_milk.png
similarity index 100%
rename from android/assets/pp/textures/items/bucket_milk.png
rename to assets/pp/textures/items/bucket_milk.png

diff --git a/android/assets/pp/textures/items/bucket_water.png b/assets/pp/textures/items/bucket_water.png
similarity index 100%
rename from android/assets/pp/textures/items/bucket_water.png
rename to assets/pp/textures/items/bucket_water.png

diff --git a/android/assets/pp/textures/items/charcoal.png b/assets/pp/textures/items/charcoal.png
similarity index 100%
rename from android/assets/pp/textures/items/charcoal.png
rename to assets/pp/textures/items/charcoal.png

diff --git a/android/assets/pp/textures/items/coal.png b/assets/pp/textures/items/coal.png
similarity index 100%
rename from android/assets/pp/textures/items/coal.png
rename to assets/pp/textures/items/coal.png

diff --git a/android/assets/pp/textures/items/diamond.png b/assets/pp/textures/items/diamond.png
similarity index 100%
rename from android/assets/pp/textures/items/diamond.png
rename to assets/pp/textures/items/diamond.png

diff --git a/android/assets/pp/textures/items/diamond_axe.png b/assets/pp/textures/items/diamond_axe.png
similarity index 100%
rename from android/assets/pp/textures/items/diamond_axe.png
rename to assets/pp/textures/items/diamond_axe.png

diff --git a/android/assets/pp/textures/items/diamond_hoe.png b/assets/pp/textures/items/diamond_hoe.png
similarity index 100%
rename from android/assets/pp/textures/items/diamond_hoe.png
rename to assets/pp/textures/items/diamond_hoe.png

diff --git a/android/assets/pp/textures/items/diamond_pickaxe.png b/assets/pp/textures/items/diamond_pickaxe.png
similarity index 100%
rename from android/assets/pp/textures/items/diamond_pickaxe.png
rename to assets/pp/textures/items/diamond_pickaxe.png

diff --git a/android/assets/pp/textures/items/diamond_shovel.png b/assets/pp/textures/items/diamond_shovel.png
similarity index 100%
rename from android/assets/pp/textures/items/diamond_shovel.png
rename to assets/pp/textures/items/diamond_shovel.png

diff --git a/android/assets/pp/textures/items/diamond_sword.png b/assets/pp/textures/items/diamond_sword.png
similarity index 100%
rename from android/assets/pp/textures/items/diamond_sword.png
rename to assets/pp/textures/items/diamond_sword.png

diff --git a/android/assets/pp/textures/items/gold_axe.png b/assets/pp/textures/items/gold_axe.png
similarity index 100%
rename from android/assets/pp/textures/items/gold_axe.png
rename to assets/pp/textures/items/gold_axe.png

diff --git a/android/assets/pp/textures/items/gold_hoe.png b/assets/pp/textures/items/gold_hoe.png
similarity index 100%
rename from android/assets/pp/textures/items/gold_hoe.png
rename to assets/pp/textures/items/gold_hoe.png

diff --git a/android/assets/pp/textures/items/gold_ingot.png b/assets/pp/textures/items/gold_ingot.png
similarity index 100%
rename from android/assets/pp/textures/items/gold_ingot.png
rename to assets/pp/textures/items/gold_ingot.png

diff --git a/android/assets/pp/textures/items/gold_pickaxe.png b/assets/pp/textures/items/gold_pickaxe.png
similarity index 100%
rename from android/assets/pp/textures/items/gold_pickaxe.png
rename to assets/pp/textures/items/gold_pickaxe.png

diff --git a/android/assets/pp/textures/items/gold_shovel.png b/assets/pp/textures/items/gold_shovel.png
similarity index 100%
rename from android/assets/pp/textures/items/gold_shovel.png
rename to assets/pp/textures/items/gold_shovel.png

diff --git a/android/assets/pp/textures/items/gold_sword.png b/assets/pp/textures/items/gold_sword.png
similarity index 100%
rename from android/assets/pp/textures/items/gold_sword.png
rename to assets/pp/textures/items/gold_sword.png

diff --git a/android/assets/pp/textures/items/iron_axe.png b/assets/pp/textures/items/iron_axe.png
similarity index 100%
rename from android/assets/pp/textures/items/iron_axe.png
rename to assets/pp/textures/items/iron_axe.png

diff --git a/android/assets/pp/textures/items/iron_hoe.png b/assets/pp/textures/items/iron_hoe.png
similarity index 100%
rename from android/assets/pp/textures/items/iron_hoe.png
rename to assets/pp/textures/items/iron_hoe.png

diff --git a/android/assets/pp/textures/items/iron_ingot.png b/assets/pp/textures/items/iron_ingot.png
similarity index 100%
rename from android/assets/pp/textures/items/iron_ingot.png
rename to assets/pp/textures/items/iron_ingot.png

diff --git a/android/assets/pp/textures/items/iron_pickaxe.png b/assets/pp/textures/items/iron_pickaxe.png
similarity index 100%
rename from android/assets/pp/textures/items/iron_pickaxe.png
rename to assets/pp/textures/items/iron_pickaxe.png

diff --git a/android/assets/pp/textures/items/iron_shovel.png b/assets/pp/textures/items/iron_shovel.png
similarity index 100%
rename from android/assets/pp/textures/items/iron_shovel.png
rename to assets/pp/textures/items/iron_shovel.png

diff --git a/android/assets/pp/textures/items/iron_sword.png b/assets/pp/textures/items/iron_sword.png
similarity index 100%
rename from android/assets/pp/textures/items/iron_sword.png
rename to assets/pp/textures/items/iron_sword.png

diff --git a/android/assets/pp/textures/items/lapis_lazuli.png b/assets/pp/textures/items/lapis_lazuli.png
similarity index 100%
rename from android/assets/pp/textures/items/lapis_lazuli.png
rename to assets/pp/textures/items/lapis_lazuli.png

diff --git a/android/assets/pp/textures/items/porkchop_cooked.png b/assets/pp/textures/items/porkchop_cooked.png
similarity index 100%
rename from android/assets/pp/textures/items/porkchop_cooked.png
rename to assets/pp/textures/items/porkchop_cooked.png

diff --git a/android/assets/pp/textures/items/porkchop_raw.png b/assets/pp/textures/items/porkchop_raw.png
similarity index 100%
rename from android/assets/pp/textures/items/porkchop_raw.png
rename to assets/pp/textures/items/porkchop_raw.png

diff --git a/android/assets/pp/textures/items/shears.png b/assets/pp/textures/items/shears.png
similarity index 100%
rename from android/assets/pp/textures/items/shears.png
rename to assets/pp/textures/items/shears.png

diff --git a/android/assets/pp/textures/items/snowball.png b/assets/pp/textures/items/snowball.png
similarity index 100%
rename from android/assets/pp/textures/items/snowball.png
rename to assets/pp/textures/items/snowball.png

diff --git a/android/assets/pp/textures/items/spawn_egg.png b/assets/pp/textures/items/spawn_egg.png
similarity index 100%
rename from android/assets/pp/textures/items/spawn_egg.png
rename to assets/pp/textures/items/spawn_egg.png

diff --git a/android/assets/pp/textures/items/stick.png b/assets/pp/textures/items/stick.png
similarity index 100%
rename from android/assets/pp/textures/items/stick.png
rename to assets/pp/textures/items/stick.png

diff --git a/android/assets/pp/textures/items/stone_axe.png b/assets/pp/textures/items/stone_axe.png
similarity index 100%
rename from android/assets/pp/textures/items/stone_axe.png
rename to assets/pp/textures/items/stone_axe.png

diff --git a/android/assets/pp/textures/items/stone_hoe.png b/assets/pp/textures/items/stone_hoe.png
similarity index 100%
rename from android/assets/pp/textures/items/stone_hoe.png
rename to assets/pp/textures/items/stone_hoe.png

diff --git a/android/assets/pp/textures/items/stone_pickaxe.png b/assets/pp/textures/items/stone_pickaxe.png
similarity index 100%
rename from android/assets/pp/textures/items/stone_pickaxe.png
rename to assets/pp/textures/items/stone_pickaxe.png

diff --git a/android/assets/pp/textures/items/stone_shovel.png b/assets/pp/textures/items/stone_shovel.png
similarity index 100%
rename from android/assets/pp/textures/items/stone_shovel.png
rename to assets/pp/textures/items/stone_shovel.png

diff --git a/android/assets/pp/textures/items/stone_sword.png b/assets/pp/textures/items/stone_sword.png
similarity index 100%
rename from android/assets/pp/textures/items/stone_sword.png
rename to assets/pp/textures/items/stone_sword.png

diff --git a/android/assets/pp/textures/items/wood_axe.png b/assets/pp/textures/items/wood_axe.png
similarity index 100%
rename from android/assets/pp/textures/items/wood_axe.png
rename to assets/pp/textures/items/wood_axe.png

diff --git a/android/assets/pp/textures/items/wood_hoe.png b/assets/pp/textures/items/wood_hoe.png
similarity index 100%
rename from android/assets/pp/textures/items/wood_hoe.png
rename to assets/pp/textures/items/wood_hoe.png

diff --git a/android/assets/pp/textures/items/wood_pickaxe.png b/assets/pp/textures/items/wood_pickaxe.png
similarity index 100%
rename from android/assets/pp/textures/items/wood_pickaxe.png
rename to assets/pp/textures/items/wood_pickaxe.png

diff --git a/android/assets/pp/textures/items/wood_shovel.png b/assets/pp/textures/items/wood_shovel.png
similarity index 100%
rename from android/assets/pp/textures/items/wood_shovel.png
rename to assets/pp/textures/items/wood_shovel.png

diff --git a/android/assets/pp/textures/items/wood_sword.png b/assets/pp/textures/items/wood_sword.png
similarity index 100%
rename from android/assets/pp/textures/items/wood_sword.png
rename to assets/pp/textures/items/wood_sword.png

diff --git a/android/assets/touch_gui.png b/assets/touch_gui.png
similarity index 100%
rename from android/assets/touch_gui.png
rename to assets/touch_gui.png

diff --git a/build.gradle b/build.gradle
deleted file mode 100644 (file)
index 60a1bb3..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-buildscript {
-    ext {
-        appName = "CaveDroid"
-
-        gdxVersion = '1.12.0'
-
-        guavaVersion = '28.1'
-
-        daggerVersion = '2.51.1'
-
-        kotlinVersion = '1.9.24'
-        kspVersion = '1.9.24-1.0.20'
-        kotlinSerializationVersion = '1.6.3'
-
-        kotlinpoetKspVersion = '1.16.0'
-    }
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven { url "https://plugins.gradle.org/m2/" }
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        google()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-    }
-}
-
-allprojects {
-    version = 'alpha0.9.2'
-
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        google()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        maven { url "https://oss.sonatype.org/content/repositories/releases/" }
-        maven { url "https://jitpack.io" }
-        maven { url "https://mvn.fredboy.ru/releases/" }
-    }
-}

diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 (file)
index 0000000..203acec
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,30 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
+        maven { url = uri("https://oss.sonatype.org/content/repositories/releases/") }
+        maven { url = uri("https://jitpack.io") }
+        maven { url = uri("https://mvn.fredboy.ru/releases/") }
+    }
+
+    dependencies {
+        classpath(Dependencies.androidGradlePlugin)
+        classpath(Dependencies.Kotlin.gradlePlugin)
+    }
+}
+
+allprojects {
+    version = ApplicationInfo.versionName
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
+        maven { url = uri("https://oss.sonatype.org/content/repositories/releases/") }
+        maven { url = uri("https://jitpack.io") }
+        maven { url = uri("https://mvn.fredboy.ru/releases/") }
+    }
+}
\ No newline at end of file

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644 (file)
index 0000000..876c922
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}

diff --git a/buildSrc/src/main/kotlin/ApplicationInfo.kt b/buildSrc/src/main/kotlin/ApplicationInfo.kt
new file mode 100644 (file)
index 0000000..05676c4
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ApplicationInfo.kt
@@ -0,0 +1,11 @@
+import org.gradle.api.JavaVersion
+
+object ApplicationInfo {
+    const val name = "CaveDroid"
+    const val versionName = "alpha0.9.2"
+    const val versionCode = 25
+
+    const val packageName = "ru.deadsoftware.cavedroid"
+
+    val sourceCompatibility = JavaVersion.VERSION_17
+}
\ No newline at end of file

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
new file mode 100644 (file)
index 0000000..bfe2c54
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -0,0 +1,49 @@
+object Dependencies {
+
+    object LibGDX {
+        const val gdx = "com.badlogicgames.gdx:gdx:${Versions.gdx}"
+
+        object Android {
+            const val backend = "com.badlogicgames.gdx:gdx-backend-android:${Versions.gdx}"
+
+            object Natives {
+                const val armeabi = "com.badlogicgames.gdx:gdx-platform:${Versions.gdx}:natives-armeabi-v7a"
+                const val arm64 = "com.badlogicgames.gdx:gdx-platform:${Versions.gdx}:natives-arm64-v8a"
+                const val x86 = "com.badlogicgames.gdx:gdx-platform:${Versions.gdx}:natives-x86"
+                const val x86_64 = "com.badlogicgames.gdx:gdx-platform:${Versions.gdx}:natives-x86_64"
+            }
+        }
+
+        object Desktop {
+            const val backend = "com.badlogicgames.gdx:gdx-backend-lwjgl3:${Versions.gdx}"
+            const val natives = "com.badlogicgames.gdx:gdx-platform:${Versions.gdx}:natives-desktop"
+        }
+    }
+
+    object Dagger {
+        const val dagger = "com.google.dagger:dagger:${Versions.dagger}"
+        const val compiler = "com.google.dagger:dagger-compiler:${Versions.dagger}"
+    }
+
+    object Kotlin {
+        const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
+        const val bom = "org.jetbrains.kotlin:kotlin-bom:${Versions.kotlin}"
+        const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
+
+        object Serialization {
+            const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}"
+            const val protobuf = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${Versions.kotlinxSerialization}"
+        }
+    }
+
+    object Automultibind {
+        const val annotations = "ru.fredboy:automultibind-annotations:${Versions.automultibind}"
+        const val ksp = "ru.fredboy:automultibind-ksp:${Versions.automultibind}"
+    }
+
+    const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.agp}"
+
+    // TODO: Remove after complete kotlin migration
+    const val jetbrainsAnnotations = "org.jetbrains:annotations:${Versions.jetbrainsAnnotations}"
+
+}
\ No newline at end of file

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
new file mode 100644 (file)
index 0000000..69bfd29
--- /dev/null
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -0,0 +1,63 @@
+object Versions {
+
+    /**
+     * Android gradle plugin version
+     */
+    const val agp = "8.2.2"
+
+    /**
+     * LibGDX version
+     *
+     * [Source](https://github.com/libgdx/libgdx)
+     */
+    const val gdx = "1.12.0"
+
+    /**
+     * Dagger version
+     *
+     * [Source](https://github.com/google/dagger)
+     */
+    const val dagger = "2.51.1"
+
+    /**
+     * Kotlin version
+     *
+     * [Source](https://github.com/JetBrains/kotlin)
+     */
+    const val kotlin = "1.9.24"
+
+    /**
+     * Kotlinx serialization version
+     *
+     * [Source](https://github.com/Kotlin/kotlinx.serialization/)
+     */
+    const val kotlinxSerialization = "1.6.3"
+
+    /**
+     * Kotlin Symbol Processing version
+     *
+     * [Source](https://github.com/google/ksp)
+     */
+    const val ksp = "1.9.24-1.0.20"
+
+    /**
+     * Kotlin poet version
+     *
+     * [Source](https://github.com/square/kotlinpoet)
+     */
+    const val kotlinPoetKsp = "1.16.0"
+
+    /**
+     * JetBrains annotations version
+     *
+     * [Source](https://github.com/JetBrains/java-annotations)
+     */
+    const val jetbrainsAnnotations = "23.1.0"
+
+    /**
+     * Automultibind version
+     *
+     * [Source](https://github.com/fredboy/automultibind)
+     */
+    const val automultibind = "1.0.0"
+}
\ No newline at end of file

diff --git a/core/build.gradle b/core/build.gradle
deleted file mode 100644 (file)
index bd932c3..0000000
--- a/core/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-plugins {
-    id "java-library"
-    id "org.jetbrains.kotlin.jvm"
-    id "kotlin"
-    id "idea"
-    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion"
-    id 'com.google.devtools.ksp' version "$kspVersion"
-}
-
-java.targetCompatibility = JavaVersion.VERSION_17
-java.sourceCompatibility = JavaVersion.VERSION_17
-
-sourceSets.main.java.srcDirs = ["src/"]
-
-dependencies {
-    implementation "ru.fredboy:automultibind-annotations:1.0.0"
-    ksp "ru.fredboy:automultibind-ksp:1.0.0"
-
-    api "com.badlogicgames.gdx:gdx:$gdxVersion"
-    api "com.google.dagger:dagger:$daggerVersion"
-    implementation 'org.jetbrains:annotations:23.1.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion"
-    ksp "com.google.dagger:dagger-compiler:$daggerVersion"
-}

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
new file mode 100644 (file)
index 0000000..276f49d
--- /dev/null
+++ b/core/build.gradle.kts
@@ -0,0 +1,26 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+    id("kotlin")
+    id("idea")
+    id("org.jetbrains.kotlin.plugin.serialization") version Versions.kotlin
+    id ("com.google.devtools.ksp") version Versions.ksp
+}
+
+java.sourceCompatibility = ApplicationInfo.sourceCompatibility
+java.targetCompatibility = ApplicationInfo.sourceCompatibility
+
+dependencies {
+    implementation(Dependencies.Automultibind.annotations)
+    ksp(Dependencies.Automultibind.ksp)
+
+    implementation(Dependencies.LibGDX.gdx)
+    implementation(Dependencies.Dagger.dagger)
+
+    implementation(Dependencies.jetbrainsAnnotations)
+    implementation(Dependencies.Kotlin.stdlib)
+    implementation(Dependencies.Kotlin.Serialization.json)
+    implementation(Dependencies.Kotlin.Serialization.protobuf)
+
+    ksp(Dependencies.Dagger.compiler)
+}
\ No newline at end of file

diff --git a/core/src/ru/deadsoftware/cavedroid/MainConfig.java b/core/src/main/java/ru/deadsoftware/cavedroid/MainConfig.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/MainConfig.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/MainConfig.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameComponent.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameComponent.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameComponent.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameComponent.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameModule.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameModule.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameModule.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameModule.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GamePhysics.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GamePhysics.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameProc.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameProc.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameProc.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameRenderer.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameRenderer.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameScope.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameScope.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameScope.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameScope.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameScreen.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameScreen.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameScreen.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameUiWindow.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/GameUiWindow.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameUiWindow.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/GameUiWindow.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/mobs/Mob.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/mobs/Mob.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/player/Player.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/mobs/player/Player.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/player/Player.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/mobs/player/Player.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/TouchButton.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/objects/TouchButton.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/TouchButton.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/objects/TouchButton.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/drop/DropController.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/objects/drop/DropController.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/drop/DropController.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/objects/drop/DropController.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/main/java/ru/deadsoftware/cavedroid/game/world/GameWorld.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/game/world/GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuComponent.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuComponent.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/MenuComponent.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuComponent.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuProc.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuProc.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/MenuProc.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuProc.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuScope.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuScope.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/MenuScope.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuScope.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuScreen.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuScreen.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/MenuScreen.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/MenuScreen.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/objects/Button.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/objects/Button.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/objects/ButtonEventListener.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/objects/ButtonEventListener.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/objects/ButtonEventListener.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/objects/ButtonEventListener.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/objects/ButtonRenderer.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/objects/ButtonRenderer.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/objects/ButtonRenderer.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/objects/ButtonRenderer.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/submenus/Menu.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/submenus/Menu.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/submenus/Menu.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/submenus/Menu.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/submenus/MenuMain.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/submenus/MenuMain.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/submenus/MenuMain.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/submenus/MenuMain.java

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/submenus/MenuNewGame.java b/core/src/main/java/ru/deadsoftware/cavedroid/menu/submenus/MenuNewGame.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/submenus/MenuNewGame.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/menu/submenus/MenuNewGame.java

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/main/java/ru/deadsoftware/cavedroid/misc/Assets.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/Assets.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/misc/Assets.java

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java b/core/src/main/java/ru/deadsoftware/cavedroid/misc/Renderer.java
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
rename to core/src/main/java/ru/deadsoftware/cavedroid/misc/Renderer.java

diff --git a/core/src/main/kotlin/ru/deadsoftware/cavedroid/CaveGame.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/CaveGame.kt
new file mode 100644 (file)
index 0000000..225dd3a
--- /dev/null
+++ b/core/src/main/kotlin/ru/deadsoftware/cavedroid/CaveGame.kt
@@ -0,0 +1,89 @@
+package ru.deadsoftware.cavedroid
+
+import com.badlogic.gdx.Application
+import com.badlogic.gdx.Game
+import com.badlogic.gdx.Gdx
+import ru.deadsoftware.cavedroid.misc.Assets
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader
+import ru.deadsoftware.cavedroid.misc.utils.ratio
+import ru.deadsoftware.cavedroid.prefs.PreferencesStore
+
+class CaveGame(
+    private val gameDataDirectoryPath: String,
+    private val isTouchScreen: Boolean,
+    private val isDebug: Boolean,
+    private val preferencesStore: PreferencesStore,
+) : Game() {
+
+    private val mainComponent: MainComponent
+    private val mainConfig: MainConfig
+
+    private val assetLoader: AssetLoader
+
+    init {
+        mainComponent = DaggerMainComponent.builder()
+            .caveGame(this)
+            .preferencesStore(preferencesStore)
+            .build()
+
+        mainConfig = mainComponent.mainConfig
+        assetLoader = mainComponent.assetLoader
+    }
+
+    private fun initMainConfig() {
+        val width = DEFAULT_VIEWPORT_WIDTH
+        val height = width / Gdx.graphics.ratio
+
+        mainConfig.mainComponent = mainComponent
+        mainConfig.gameFolder = gameDataDirectoryPath
+        mainConfig.isTouch = isTouchScreen
+        mainConfig.width = width
+        mainConfig.height = height
+        mainConfig.isShowInfo = isDebug
+
+        Gdx.app.logLevel = if (isDebug) Application.LOG_DEBUG else Application.LOG_ERROR
+
+        mainConfig.setFullscreenToggleListener { isFullscreen ->
+            if (isFullscreen) {
+                Gdx.graphics.setFullscreenMode(Gdx.graphics.displayMode);
+            } else {
+                Gdx.graphics.setWindowedMode(width.toInt(), height.toInt());
+            }
+        }
+    }
+
+    fun newGame(gameMode: Int) {
+        setScreen(mainComponent.gameScreen.apply { newGame(gameMode) })
+    }
+
+    fun loadGame() {
+        setScreen(mainComponent.gameScreen.apply { loadGame() })
+    }
+
+    fun quitGame() {
+        screen?.dispose()
+        setScreen(mainComponent.menuScreen)
+    }
+
+    override fun create() {
+        Gdx.files.absolute(gameDataDirectoryPath).mkdirs()
+        initMainConfig()
+
+        Assets.load(assetLoader)
+        setScreen(mainComponent.menuScreen)
+    }
+
+    override fun dispose() {
+        screen?.dispose()
+        Assets.dispose()
+    }
+
+
+    companion object {
+        private const val TAG = "CaveGame"
+        private const val DEFAULT_VIEWPORT_WIDTH = 480f
+
+        const val VERSION = "alpha 0.9.2"
+    }
+
+}
\ No newline at end of file

diff --git a/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt
new file mode 100644 (file)
index 0000000..b2a77ee
--- /dev/null
+++ b/core/src/main/kotlin/ru/deadsoftware/cavedroid/MainComponent.kt
@@ -0,0 +1,22 @@
+package ru.deadsoftware.cavedroid
+
+import dagger.Component
+import ru.deadsoftware.cavedroid.game.GameScreen
+import ru.deadsoftware.cavedroid.menu.MenuScreen
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader
+import ru.deadsoftware.cavedroid.prefs.PreferencesStore
+import javax.inject.Singleton
+
+@Singleton
+@Component(dependencies = [CaveGame::class, PreferencesStore::class])
+interface MainComponent {
+
+    val gameScreen: GameScreen
+
+    val menuScreen: MenuScreen
+
+    val mainConfig: MainConfig
+
+    val assetLoader: AssetLoader
+
+}
\ No newline at end of file

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItemsHolder.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/GameItemsHolder.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/GameItemsHolder.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/GameItemsHolder.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/CommonBlockActionUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/IPlaceBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/IPlaceBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/IPlaceBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/IPlaceBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToBackgroundAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToBackgroundAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToBackgroundAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToBackgroundAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToForegroundAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToForegroundAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToForegroundAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceBlockItemToForegroundAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceSlabAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceSlabAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceSlabAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/placeblock/PlaceSlabAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/IUpdateBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/IUpdateBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/IUpdateBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/IUpdateBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedLeftAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedLeftAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedLeftAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedLeftAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedRightAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedRightAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedRightAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateBedRightAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateGrassAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateGrassAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateGrassAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateGrassAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateRequiresBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateRequiresBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateRequiresBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateRequiresBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSnowedGrassAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSnowedGrassAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSnowedGrassAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/updateblock/UpdateSnowedGrassAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useblock/IUseBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/IUseBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useblock/IUseBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/IUseBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useblock/UseChestAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/UseChestAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useblock/UseChestAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/UseChestAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useblock/UseCraftingTableAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/UseCraftingTableAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useblock/UseCraftingTableAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/UseCraftingTableAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useblock/UseFurnaceAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/UseFurnaceAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useblock/UseFurnaceAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useblock/UseFurnaceAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/IUseItemAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/IUseItemAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useitem/IUseItemAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/IUseItemAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseBedAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseBedAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseBedAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseBedAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseEmptyBucketAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseEmptyBucketAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseEmptyBucketAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseEmptyBucketAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseLavaBucketAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseLavaBucketAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseLavaBucketAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseLavaBucketAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UsePigSpawnEggAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UsePigSpawnEggAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UsePigSpawnEggAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UsePigSpawnEggAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/actions/useitem/UseWaterBucketAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/debug/DebugInfoStringsProvider.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/IGameInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/IGameInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/IGameInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/IGameInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/InputUtils.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/InputUtils.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/InputUtils.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/InputUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/Joystick.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/Joystick.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/Joystick.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/Joystick.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/action/IGameInputAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/IGameInputAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/action/IGameInputAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/IGameInputAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/action/KeyboardInputAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/KeyboardInputAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/action/KeyboardInputAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/KeyboardInputAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/action/MouseInputAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/MouseInputAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/action/MouseInputAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/MouseInputAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/action/keys/KeyboardInputActionKey.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/keys/KeyboardInputActionKey.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/action/keys/KeyboardInputActionKey.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/keys/KeyboardInputActionKey.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/action/keys/MouseInputActionKey.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/keys/MouseInputActionKey.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/action/keys/MouseInputActionKey.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/action/keys/MouseInputActionKey.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/CloseGameWindowKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/DropItemKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyDownKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyDownKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyDownKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyDownKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyUpKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyUpKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyUpKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/FlyUpKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoLeftKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoLeftKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoLeftKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoLeftKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoRightKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoRightKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoRightKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/GoRightKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/JumpKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/JumpKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/JumpKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/JumpKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/MoveCursorControlsModeKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/OpenInventoryKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/PauseGameKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/PauseGameKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/PauseGameKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/PauseGameKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SelectHotbarSlotKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/StopSwimKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/StopSwimKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/StopSwimKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/StopSwimKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SwimUpKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SwimUpKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SwimUpKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/SwimUpKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleControlsModeKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleDebugInfoKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleGameModeKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/ToggleMinimapKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/keyboard/TurnOnFlyModeKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AttackMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/AttackMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AttackMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/AttackMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/CreativeInventoryScrollMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CursorMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/CursorMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CursorMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/CursorMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectChestInventoryItemMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCraftingInventoryItemMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectCreativeInventoryItemMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectFurnaceInventoryItemMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/UseItemMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/UseItemMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/UseItemMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/mouse/UseItemMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/handler/touch/JoystickInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/mapper/KeyboardInputActionMapper.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/mapper/KeyboardInputActionMapper.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/mapper/KeyboardInputActionMapper.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/mapper/KeyboardInputActionMapper.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/mapper/MouseInputActionMapper.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/mapper/MouseInputActionMapper.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/input/mapper/MouseInputActionMapper.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/input/mapper/MouseInputActionMapper.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingBlock.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/FallingBlock.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/FallingBlock.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/FallingBlock.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/MobSaveDataMapper.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/MobSaveDataMapper.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/MobSaveDataMapper.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/MobSaveDataMapper.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/MobsController.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/MobsController.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/MobsController.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/MobsController.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/PeacefulMob.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/PeacefulMob.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/PeacefulMob.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/PeacefulMob.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/Pig.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/Pig.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/player/Inventory.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/player/Inventory.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/mobs/player/Inventory.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/mobs/player/Inventory.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/Block.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/block/Block.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/Block.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/BlockAnimationInfo.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/BlockAnimationInfo.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/block/BlockAnimationInfo.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/BlockAnimationInfo.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/BlockDropInfo.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/BlockDropInfo.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/block/BlockDropInfo.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/BlockDropInfo.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/BlockMargins.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/BlockMargins.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/block/BlockMargins.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/BlockMargins.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/block/CommonBlockParams.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/CommonBlockParams.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/block/CommonBlockParams.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/block/CommonBlockParams.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/craft/CraftingRecipe.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/craft/CraftingRecipe.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/craft/CraftingRecipe.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/craft/CraftingRecipe.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/dto/BlockDto.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/BlockDto.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/dto/BlockDto.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/BlockDto.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/dto/CraftingDto.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/CraftingDto.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/dto/CraftingDto.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/CraftingDto.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/dto/GameItemsDto.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/GameItemsDto.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/dto/GameItemsDto.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/GameItemsDto.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/dto/ItemDto.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/ItemDto.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/dto/ItemDto.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/ItemDto.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/dto/SaveDataDto.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/SaveDataDto.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/dto/SaveDataDto.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/dto/SaveDataDto.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/item/CommonItemParams.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/item/CommonItemParams.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/item/CommonItemParams.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/item/CommonItemParams.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/item/InventoryItem.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/item/Item.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/item/Item.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/item/Item.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/item/Item.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/mapper/BlockMapper.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/mapper/ItemMapper.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/world/Biome.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/world/Biome.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/world/Biome.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/world/Biome.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/model/world/generator/WorldGeneratorConfig.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/world/generator/WorldGeneratorConfig.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/model/world/generator/WorldGeneratorConfig.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/model/world/generator/WorldGeneratorConfig.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/container/Chest.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/Chest.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/container/Chest.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/Chest.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/container/Container.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/Container.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/container/Container.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/Container.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/container/ContainerController.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/ContainerController.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/container/ContainerController.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/ContainerController.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/container/Furnace.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/Furnace.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/container/Furnace.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/container/Furnace.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/drop/Drop.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/drop/Drop.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/objects/drop/Drop.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/objects/drop/Drop.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/BackgroundBlocksRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/BackgroundBlocksRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/BackgroundBlocksRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/BackgroundBlocksRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/BlocksRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/BlocksRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/BlocksRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/BlocksRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/DebugRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/DebugRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/DebugRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/DebugRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/DropsRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/DropsRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/DropsRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/DropsRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/ForegroundBlocksRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/ForegroundBlocksRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/ForegroundBlocksRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/ForegroundBlocksRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/HudRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/HudRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/HudRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/HudRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/IGameRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/IGameRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/IGameRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/IGameRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/MobsRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/MobsRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/MobsRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/MobsRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/WindowsRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/WindowsRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/WindowsRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/WindowsRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/AbstractWindowRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/AbstractWindowRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/windows/AbstractWindowRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/AbstractWindowRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/ChestWindowRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/ChestWindowRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/windows/ChestWindowRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/ChestWindowRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/CraftingWindowRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/CreativeWindowRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/FurnaceWindowRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/FurnaceWindowRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/windows/FurnaceWindowRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/FurnaceWindowRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/windows/SurvivalWindowRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/SurvivalWindowRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/render/windows/SurvivalWindowRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/render/windows/SurvivalWindowRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/save/GameSaveData.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/save/GameSaveData.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/save/GameSaveData.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/save/GameSaveData.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/save/GameSaveLoader.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/save/GameSaveLoader.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/save/GameSaveLoader.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/save/GameSaveLoader.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/TooltipManager.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/TooltipManager.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/TooltipManager.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/TooltipManager.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsConfigs.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/GameWindowsManager.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindow.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindow.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindow.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindow.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindowWithCraftGrid.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindowWithCraftGrid.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindowWithCraftGrid.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/AbstractInventoryWindowWithCraftGrid.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/ChestInventoryWindow.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/ChestInventoryWindow.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/ChestInventoryWindow.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/ChestInventoryWindow.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CraftingInventoryWindow.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CraftingInventoryWindow.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CraftingInventoryWindow.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CraftingInventoryWindow.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CreativeInventoryWindow.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CreativeInventoryWindow.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CreativeInventoryWindow.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/CreativeInventoryWindow.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/FurnaceInventoryWindow.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/FurnaceInventoryWindow.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/FurnaceInventoryWindow.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/FurnaceInventoryWindow.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/SurvivalInventoryWindow.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/SurvivalInventoryWindow.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/ui/windows/inventory/SurvivalInventoryWindow.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/ui/windows/inventory/SurvivalInventoryWindow.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldFluidsLogicControllerTask.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldFluidsLogicControllerTask.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/world/GameWorldFluidsLogicControllerTask.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldFluidsLogicControllerTask.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldGenerator.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldGenerator.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/world/GameWorldGenerator.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldGenerator.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldMobDamageControllerTask.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldMobDamageControllerTask.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/game/world/GameWorldMobDamageControllerTask.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/game/world/GameWorldMobDamageControllerTask.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/objects/BooleanOptionButton.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/menu/objects/BooleanOptionButton.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/objects/BooleanOptionButton.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/menu/objects/BooleanOptionButton.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/submenus/MenuOptions.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/menu/submenus/MenuOptions.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/submenus/MenuOptions.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/menu/submenus/MenuOptions.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/submenus/MenusFactory.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/menu/submenus/MenusFactory.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/menu/submenus/MenusFactory.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/menu/submenus/MenusFactory.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Saveable.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/Saveable.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/Saveable.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/Saveable.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindKeyboardInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindKeyboardInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindKeyboardInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindKeyboardInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindMouseInputHandler.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindMouseInputHandler.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindMouseInputHandler.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindMouseInputHandler.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindPlaceBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindPlaceBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindPlaceBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindPlaceBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindRenderer.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindRenderer.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindRenderer.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindRenderer.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindUpdateBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindUpdateBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindUpdateBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindUpdateBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindUseBlockAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindUseBlockAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindUseBlockAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindUseBlockAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindUseItemAction.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindUseItemAction.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/BindUseItemAction.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/BindUseItemAction.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/MultibindingConfig.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/MultibindingConfig.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/annotations/multibinding/MultibindingConfig.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/annotations/multibind/MultibindingConfig.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/ArrayMapExtensions.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/ArrayMapExtensions.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/ArrayMapExtensions.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/ArrayMapExtensions.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/AssetLoader.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/AssetLoader.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/AssetLoader.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/AssetLoader.kt

diff --git a/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/GdxExtensions.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/GdxExtensions.kt
new file mode 100644 (file)
index 0000000..1c80048
--- /dev/null
+++ b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/GdxExtensions.kt
@@ -0,0 +1,5 @@
+package ru.deadsoftware.cavedroid.misc.utils
+
+import com.badlogic.gdx.Graphics
+
+val Graphics.ratio get() = width.toFloat() / height.toFloat()
\ No newline at end of file

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/ItemUtils.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/ItemUtils.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/ItemUtils.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/ItemUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/MeasureUnitsUtils.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/MeasureUnitsUtils.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/MeasureUnitsUtils.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/MeasureUnitsUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/RenderingUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/SpriteOrigin.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/SpriteOrigin.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/SpriteOrigin.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/SpriteOrigin.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/SpriteUtils.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/SpriteUtils.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/SpriteUtils.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/SpriteUtils.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/misc/utils/mobs/MobSprites.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/mobs/MobSprites.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/misc/utils/mobs/MobSprites.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/misc/utils/mobs/MobSprites.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/prefs/PreferencesStore.kt b/core/src/main/kotlin/ru/deadsoftware/cavedroid/prefs/PreferencesStore.kt
similarity index 100%
rename from core/src/ru/deadsoftware/cavedroid/prefs/PreferencesStore.kt
rename to core/src/main/kotlin/ru/deadsoftware/cavedroid/prefs/PreferencesStore.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
deleted file mode 100644 (file)
index 219f5b4..0000000
--- a/core/src/ru/deadsoftware/cavedroid/CaveGame.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package ru.deadsoftware.cavedroid;
-
-import com.badlogic.gdx.Application;
-import com.badlogic.gdx.Game;
-import com.badlogic.gdx.Gdx;
-import org.jetbrains.annotations.Nullable;
-import ru.deadsoftware.cavedroid.game.GameScreen;
-import ru.deadsoftware.cavedroid.misc.Assets;
-import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
-import ru.deadsoftware.cavedroid.prefs.PreferencesStore;
-
-public class CaveGame extends Game {
-
-    private static final String TAG = "CaveGame";
-
-    public static final String VERSION = "alpha 0.9.2";
-
-    private final MainConfig mMainConfig;
-    private final MainComponent mMainComponent;
-    private final AssetLoader mAssetLoader;
-
-    private final String mGameFolder;
-    private final boolean mTouch;
-    private boolean mDebug;
-
-    @Nullable
-    private final String mAssetsPackPath;
-
-    public CaveGame(String gameFolder,
-                    boolean touch,
-                    PreferencesStore preferencesStore,
-                    @Nullable String assetsPackPath) {
-        mGameFolder = gameFolder;
-        mTouch = touch;
-        mAssetsPackPath = assetsPackPath;
-
-        mMainComponent = DaggerMainComponent
-                .builder()
-                .caveGame(this)
-                .preferencesStore(preferencesStore)
-                .build();
-
-        mMainConfig = mMainComponent.getMainConfig();
-        mAssetLoader = mMainComponent.getAssetLoader();
-    }
-
-    public void setDebug(boolean debug) {
-        mDebug = debug;
-    }
-
-    private void initConfig() {
-        int width = 480;
-        int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
-
-        mMainConfig.setMainComponent(mMainComponent);
-        mMainConfig.setGameFolder(mGameFolder);
-        mMainConfig.setTouch(mTouch);
-        mMainConfig.setWidth(width);
-        mMainConfig.setHeight(height);
-        mMainConfig.setShowInfo(mDebug);
-        mMainConfig.setAssetsPackPath(mAssetsPackPath);
-
-        if (mDebug) {
-            Gdx.app.setLogLevel(Application.LOG_DEBUG);
-        } else {
-            Gdx.app.setLogLevel(Application.LOG_ERROR);
-        }
-
-        mMainConfig.setFullscreenToggleListener((value) -> {
-            if (value) {
-                Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
-            } else {
-                Gdx.graphics.setWindowedMode(width, height);
-            }
-        });
-    }
-
-    public void newGame(int gameMode) {
-        GameScreen gameScreen = mMainComponent.getGameScreen();
-        gameScreen.newGame(gameMode);
-        setScreen(gameScreen);
-    }
-
-    public void loadGame() {
-        GameScreen gameScreen = mMainComponent.getGameScreen();
-        gameScreen.loadGame();
-        setScreen(gameScreen);
-    }
-
-    public void quitGame() {
-        if (screen != null) {
-            screen.dispose();
-        }
-        setScreen(mMainComponent.getMenuScreen());
-    }
-
-    @Override
-    public void create() {
-        Gdx.files.absolute(mGameFolder).mkdirs();
-        initConfig();
-
-        Gdx.app.debug(TAG, mGameFolder);
-        Assets.load(mAssetLoader);
-        setScreen(mMainComponent.getMenuScreen());
-    }
-
-    @Override
-    public void dispose() {
-        if (screen != null) {
-            screen.dispose();
-        }
-        Assets.dispose();
-    }
-}

diff --git a/core/src/ru/deadsoftware/cavedroid/MainComponent.java b/core/src/ru/deadsoftware/cavedroid/MainComponent.java
deleted file mode 100644 (file)
index b487c6d..0000000
--- a/core/src/ru/deadsoftware/cavedroid/MainComponent.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ru.deadsoftware.cavedroid;
-
-import dagger.Component;
-import ru.deadsoftware.cavedroid.game.GameScreen;
-import ru.deadsoftware.cavedroid.menu.MenuScreen;
-import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
-import ru.deadsoftware.cavedroid.prefs.PreferencesStore;
-
-import javax.inject.Singleton;
-
-@Singleton
-@Component(dependencies = {CaveGame.class, PreferencesStore.class})
-public interface MainComponent {
-    GameScreen getGameScreen();
-
-    MenuScreen getMenuScreen();
-
-    MainConfig getMainConfig();
-
-    AssetLoader getAssetLoader();
-}

diff --git a/desktop/build.gradle b/desktop/build.gradle
deleted file mode 100644 (file)
index 9127345..0000000
--- a/desktop/build.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-plugins {
-    id 'java-library'
-    id 'kotlin'
-    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion"
-}
-
-java.targetCompatibility = JavaVersion.VERSION_17
-java.sourceCompatibility = JavaVersion.VERSION_1_8
-
-sourceSets.main.java.srcDirs = ["src/"]
-sourceSets.main.resources.srcDirs = ["../android/assets"]
-
-project.ext.mainClassName = "ru.deadsoftware.cavedroid.desktop.DesktopLauncher"
-project.ext.assetsDir = new File("../android/assets")
-
-task run(dependsOn: build, type: JavaExec) {
-    main = project.mainClassName
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = project.assetsDir
-    ignoreExitValue = true as JavaExecSpec
-    args "--debug"
-}
-
-task runTouch(dependsOn: build, type: JavaExec) {
-    main = project.mainClassName
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = project.assetsDir
-    ignoreExitValue = true as JavaExecSpec
-    args "--touch", "--debug"
-}
-
-task dist(dependsOn: build, type: Jar) {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    manifest {
-        attributes 'Main-Class': project.mainClassName
-    }
-    from {
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    with jar
-}
-
-dependencies {
-    implementation project(":core")
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinSerializationVersion"
-    api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
-    api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-}

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
new file mode 100644 (file)
index 0000000..5e2203e
--- /dev/null
+++ b/desktop/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    id("kotlin")
+}
+
+java.sourceCompatibility = ApplicationInfo.sourceCompatibility
+java.targetCompatibility = ApplicationInfo.sourceCompatibility
+
+private val desktopLauncherClassName = "ru.deadsoftware.cavedroid.desktop.DesktopLauncher"
+
+tasks.register<JavaExec>("run") {
+    dependsOn("build")
+    mainClass = desktopLauncherClassName
+    classpath = sourceSets["main"].runtimeClasspath
+    workingDir = sourceSets["main"].resources.sourceDirectories.first()
+    args("--debug")
+}
+
+tasks.register<JavaExec>("runTouch") {
+    dependsOn("build")
+    mainClass = desktopLauncherClassName
+    classpath = sourceSets["main"].runtimeClasspath
+    workingDir = sourceSets["main"].resources.sourceDirectories.first()
+    args("--touch", "--debug")
+}
+
+tasks.register<Jar>("dist") {
+    dependsOn("build")
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    manifest {
+        attributes["Main-Class"] = desktopLauncherClassName
+    }
+    from(configurations.runtimeClasspath.get().resolve().map { it.takeIf(File::isDirectory) ?: zipTree(it) })
+}
+
+dependencies {
+    implementation(project(":core"))
+
+    implementation(Dependencies.LibGDX.gdx)
+    implementation(Dependencies.LibGDX.Desktop.backend)
+    implementation(Dependencies.LibGDX.Desktop.natives)
+}

diff --git a/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt
new file mode 100644 (file)
index 0000000..b4b3db4
--- /dev/null
+++ b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.kt
@@ -0,0 +1,54 @@
+package ru.deadsoftware.cavedroid.desktop
+
+import com.badlogic.gdx.Files
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
+import ru.deadsoftware.cavedroid.CaveGame
+
+internal object DesktopLauncher {
+
+    @JvmStatic
+    fun main(arg: Array<String>) {
+        val config = Lwjgl3ApplicationConfiguration()
+
+        with(config) {
+            setWindowIcon(
+                /* fileType = */ Files.FileType.Internal,
+                /* ...filePaths = */ "icons/icon512.png", "icons/icon256.png", "icons/icon128.png"
+            )
+            setTitle("CaveDroid")
+            setWindowedMode(960, 540)
+            useVsync(true)
+        }
+
+        var touch = false
+        var debug = false
+        var assetsPath: String? = null
+
+        for (anArg in arg) {
+            if (anArg == "--touch") {
+                touch = true
+            }
+
+            if (anArg == "--debug") {
+                debug = true
+            }
+
+            if (anArg.startsWith("--assets")) {
+                val splitArg: Array<String> = anArg.split("=".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                if (splitArg.size >= 2) {
+                    assetsPath = splitArg[1]
+                }
+            }
+        }
+
+        val caveGame = CaveGame(
+            gameDataDirectoryPath = System.getProperty("user.home") + "/.cavedroid",
+            isTouchScreen = touch,
+            isDebug = debug,
+            preferencesStore = DesktopPreferencesStore(),
+        )
+
+        Lwjgl3Application(caveGame, config)
+    }
+}
\ No newline at end of file

diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt b/desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt
similarity index 100%
rename from desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt
rename to desktop/src/main/kotlin/ru/deadsoftware/cavedroid/desktop/DesktopPreferencesStore.kt

diff --git a/desktop/src/main/resources b/desktop/src/main/resources
new file mode 120000 (symlink)
index 0000000..2978ef3
--- /dev/null
+++ b/desktop/src/main/resources
@@ -0,0 +1 @@
+../../../assets
\ No newline at end of file

diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
deleted file mode 100644 (file)
index 5903920..0000000
--- a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package ru.deadsoftware.cavedroid.desktop;
-
-import com.badlogic.gdx.Files;
-import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
-import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
-import ru.deadsoftware.cavedroid.CaveGame;
-
-class DesktopLauncher {
-    public static void main(String[] arg) {
-        Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration();
-        config.setWindowIcon(Files.FileType.Internal,
-                "icons/icon512.png", "icons/icon256.png", "icons/icon128.png");
-        config.setTitle("CaveDroid");
-        config.setWindowedMode(960, 540);
-        config.useVsync(true);
-
-        boolean touch = false;
-        boolean debug = false;
-        String assetsPath = null;
-
-        for (String anArg : arg) {
-            if (anArg.equals("--touch")) {
-                touch = true;
-            }
-
-            if (anArg.equals("--debug")) {
-                debug = true;
-            }
-
-            if (anArg.startsWith("--assets")) {
-                String[] splitArg = anArg.split("=");
-                if (splitArg.length >= 2) {
-                    assetsPath = splitArg[1];
-                }
-            }
-        }
-
-        CaveGame caveGame = new CaveGame(System.getProperty("user.home") + "/.cavedroid", touch,
-                new DesktopPreferencesStore(), assetsPath);
-        caveGame.setDebug(debug);
-
-        new Lwjgl3Application(caveGame, config);
-    }
-}

diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644 (file)
index 99367df..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-include 'desktop', 'android', 'core'
-

diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644 (file)
index 0000000..8b9f274
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,3 @@
+include("android")
+include("desktop")
+include("core")

diff --git a/up-version.sh b/up-version.sh
index 7637355e9d8a675c279272f2618a07d7514d8640..80fa78ebee352b6bae09cc1a4904dac8133c5379 100755 (executable)
--- a/up-version.sh
+++ b/up-version.sh
@@ -4,12 +4,12 @@ new_version=$1
 
 new_version_string=$(echo $new_version | sed 's/\(alpha\|beta\)\(.*\)/\1 \2/')
 
-sed -i 's/\(version\s=\s\)'"'"'.*'"'"'/\1'"'"''"$new_version"''"'"'/g' build.gradle
-sed -i 's/\(versionName\s\)\".*\"/\1\"'"$new_version"'\"/g' android/build.gradle
-sed -i 's/\(^\s*versionCode\s\)\([0-9]*\)/echo "\1$((\2+1))"/ge' android/build.gradle
-sed -i 's/\(public static final String VERSION = \)\".*\"/\1\"'"$new_version_string"'\"/' core/src/ru/deadsoftware/cavedroid/CaveGame.java
+sed -i 's/\(const val versionName = \)\".*\"/\1\"'"$new_version"'\"/g' buildSrc/src/main/kotlin/ApplicationInfo.kt
+sed -i 's/\(\s*const val versionCode = \)\([0-9]*\)/echo "\1$((\2+1))"/ge' buildSrc/src/main/kotlin/ApplicationInfo.kt
+sed -i 's/\(const val VERSION = \)\".*\"/\1\"'"$new_version_string"'\"/' core/src/main/kotlin/ru/deadsoftware/cavedroid/CaveGame.kt
 
-git add build.gradle android/build.gradle core/src/ru/deadsoftware/cavedroid/CaveGame.java
+git add buildSrc/src/main/kotlin/ApplicationInfo.kt core/src/main/kotlin/ru/deadsoftware/cavedroid/CaveGame.kt
 
 git commit -m "Update version"
 git tag "$new_version"
+q
\ No newline at end of file