From: fred-boy <fredboy@protonmail.com>
Date: Sat, 28 Sep 2019 13:29:56 +0000 (+0700)
Subject: Add Google Guava
X-Git-Tag: alpha0.4~40
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=fe4608f2ebca50f37bd9534891187d87018e7bf5;p=cavedroid.git

Add Google Guava
---

diff --git a/android/assets/game_items.json b/android/assets/game_items.json
deleted file mode 100644
index b539082..0000000
--- a/android/assets/game_items.json
+++ /dev/null
@@ -1,607 +0,0 @@
-{
-  "blocks": {
-    "none": {
-      "collision": false,
-      "transparent": true
-    },
-    "stone": {
-      "hp": 450,
-      "drop": "cobblestone"
-    },
-    "grass": {
-      "hp": 54,
-      "drop": "dirt"
-    },
-    "dirt": {
-      "hp": 45
-    },
-    "cobblestone": {
-      "hp": 600
-    },
-    "planks": {
-      "hp": 180
-    },
-    "sapling": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "bedrock": {
-      "hp": -1
-    },
-    "water": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "fluid": true,
-      "meta": "water"
-    },
-    "lava": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "fluid": true,
-      "meta": "lava"
-    },
-    "sand": {
-      "hp": 45
-    },
-    "gravel": {
-      "hp": 54
-    },
-    "gold_ore": {
-      "hp": 900
-    },
-    "iron_ore": {
-      "hp": 900
-    },
-    "coal_ore":{
-      "hp": 900,
-      "drop": "coal"
-    },
-    "log": {
-      "hp": 180
-    },
-    "leaves": {
-      "hp": 21
-    },
-    "sponge": {
-      "hp": 54
-    },
-    "glass": {
-      "hp": 27,
-      "drop": "none",
-      "background": false,
-      "transparent": true
-    },
-    "lapis_ore": {
-      "hp": 900,
-      "drop": "lapis"
-    },
-    "lapis_block": {
-      "hp": 900
-    },
-    "sandstone": {
-      "hp": 240
-    },
-    "noteblock": {
-      "hp": 75
-    },
-    "bed_l": {
-      "hp": 21,
-      "drop": "none",
-      "collision": false,
-      "background": true,
-      "transparent": true
-    },
-    "bed_r": {
-      "hp": 21,
-      "drop": "none",
-      "collision": false,
-      "background": true,
-      "transparent": true
-    },
-    "web": {
-      "hp": 1200,
-      "collision": false,
-      "background": false,
-      "transparent": true
-    },
-    "tallgrass": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "deadbush": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "bricks": {
-      "hp": 600
-    },
-    "dandelion": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "rose": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "mushroom_brown": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "mushroom_red": {
-      "hp": 0,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "block_required": true
-    },
-    "wool": {
-      "hp": 75
-    },
-    "wool_orange": {
-      "hp": 75
-    },
-    "wool_magenta": {
-      "hp": 75
-    },
-    "wool_lightblue": {
-      "hp": 75
-    },
-    "wool_yellow": {
-      "hp": 75
-    },
-    "wool_lime": {
-      "hp": 75
-    },
-    "wool_pink": {
-      "hp": 75
-    },
-    "wool_gray": {
-      "hp": 75
-    },
-    "wool_lightgray": {
-      "hp": 75
-    },
-    "wool_cyan": {
-      "hp": 75
-    },
-    "wool_purple": {
-      "hp": 75
-    },
-    "wool_blue": {
-      "hp": 75
-    },
-    "wool_brown": {
-      "hp": 75
-    },
-    "wool_green": {
-      "hp": 75
-    },
-    "wool_red": {
-      "hp": 75
-    },
-    "wool_black": {
-      "hp": 75
-    },
-    "gold_block": {
-      "hp": 900
-    },
-    "iron_block": {
-      "hp": 1500
-    },
-    "stone_slab": {
-      "top": 8,
-      "hp": 600,
-      "transparent": true
-    },
-    "double_stone_slab": {
-      "hp": 600,
-      "drop": "stone_slab"
-    },
-    "sandstone_slab": {
-      "top": 8,
-      "hp": 600,
-      "transparent": true
-    },
-    "wooden_slab": {
-      "top": 8,
-      "hp": 180,
-      "transparent": true
-    },
-    "cobblestone_slab": {
-      "top": 8,
-      "hp": 600,
-      "transparent": true
-    },
-    "brick_slab": {
-      "top": 8,
-      "hp": 600,
-      "transparent": true
-    },
-    "stonebrick": {
-      "hp": 450
-    },
-    "stonebrick_slab": {
-      "top": 8,
-      "hp": 450,
-      "transparent": true
-    },
-    "cactus": {
-      "left": 1,
-      "right": 1,
-      "hp": 39,
-      "transparent": true,
-      "block_required": true
-    },
-    "water_16": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "texture": "water",
-      "fluid": true,
-      "meta": "water"
-    },
-    "water_12": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "fluid": true,
-      "meta": "water"
-    },
-    "water_8": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "fluid": true,
-      "meta": "water"
-    },
-    "water_4": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "transparent": true,
-      "fluid": true,
-      "meta": "water"
-    },
-    "lava_16": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "texture": "lava",
-      "fluid": true,
-      "meta": "lava"
-    },
-    "lava_12": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "fluid": true,
-      "meta": "lava"
-    },
-    "lava_8": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "fluid": true,
-      "meta": "lava"
-    },
-    "lava_4": {
-      "hp": -1,
-      "collision": false,
-      "background": false,
-      "fluid": true,
-      "meta": "lava"
-    },
-    "obsidian": {
-      "hp": 1500
-    }
-  },
-
-  "items": {
-    "none": {
-      "name": "",
-      "type": "block"
-    },
-    "stone": {
-      "name": "Stone",
-      "type": "block"
-    },
-    "grass": {
-      "name": "Grass",
-      "type": "block"
-    },
-    "dirt": {
-      "name": "Dirt",
-      "type": "block"
-    },
-    "cobblestone": {
-      "name": "Cobblestone",
-      "type": "block"
-    },
-    "planks": {
-      "name": "Planks",
-      "type": "block"
-    },
-    "sapling": {
-      "name": "Sapling",
-      "type": "block"
-    },
-    "bedrock": {
-      "name": "Bedrock",
-      "type": "block"
-    },
-    "water": {
-      "name": "Water",
-      "type": "block"
-    },
-    "lava": {
-      "name": "Lava",
-      "type": "block"
-    },
-    "sand": {
-      "name": "Sand",
-      "type": "block"
-    },
-    "gravel": {
-      "name": "Gravel",
-      "type": "block"
-    },
-    "gold_ore": {
-      "name": "Golden Ore",
-      "type": "block"
-    },
-    "iron_ore": {
-      "name": "Iron Ore",
-      "type": "block"
-    },
-    "coal_ore": {
-      "name": "Coal Ore",
-      "type": "block"
-    },
-    "log": {
-      "name": "Wood",
-      "type": "block"
-    },
-    "leaves": {
-      "name": "Leaves",
-      "type": "block"
-    },
-    "glass": {
-      "name": "Glass",
-      "type": "block"
-    },
-    "lapis_ore": {
-      "name": "Lapis Ore",
-      "type": "block"
-    },
-    "lapis_block": {
-      "name": "Lapis Block",
-      "type": "block"
-    },
-    "sandstone": {
-      "name": "Sandstone",
-      "type": "block"
-    },
-    "web": {
-      "name": "Cobweb",
-      "type": "block"
-    },
-    "tallgrass": {
-      "name": "Tall Grass",
-      "type": "block"
-    },
-    "deadbush": {
-      "name": "Dead Bush",
-      "type": "block"
-    },
-    "bricks": {
-      "name": "Bricks",
-      "type": "block"
-    },
-    "dandelion": {
-      "name": "Dandelion",
-      "type": "block"
-    },
-    "rose": {
-      "name": "Rose",
-      "type": "block"
-    },
-    "mushroom_brown": {
-      "name": "Mushroom",
-      "type": "block"
-    },
-    "mushroom_red": {
-      "name": "Mushroom",
-      "type": "block"
-    },
-    "wool": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_orange": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_magenta": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_lightblue": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_yellow": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_lime": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_pink": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_gray": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_lightgray": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_cyan": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_purple": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_blue": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_brown": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_green": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_red": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "wool_black": {
-      "name": "Wool",
-      "type": "block"
-    },
-    "gold_block": {
-      "name": "Gold Block",
-      "type": "block"
-    },
-    "iron_block": {
-      "name": "Iron Block",
-      "type": "block"
-    },
-    "stone_slab": {
-      "name": "Stone Slab",
-      "type": "block",
-      "meta": "slab"
-    },
-    "sandstone_slab": {
-      "name": "Sandstone Slab",
-      "type": "block",
-      "meta": "slab"
-    },
-    "wooden_slab": {
-      "name": "Wooden Slab",
-      "type": "block",
-      "meta": "slab"
-    },
-    "cobblestone_slab": {
-      "name": "Cobblestone Slab",
-      "type": "block",
-      "meta": "slab"
-    },
-    "brick_slab": {
-      "name": "Brick Slab",
-      "type": "block",
-      "meta": "slab"
-    },
-    "stonebrick": {
-      "name": "Stone Brick",
-      "type": "block"
-    },
-    "stonebrick_slab": {
-      "name": "Stone Brick Slab",
-      "type": "block",
-      "meta": "slab"
-    },
-    "cactus": {
-      "name": "Cactus",
-      "type": "block"
-    },
-    "obsidian": {
-      "name": "Obsidian",
-      "type": "block"
-    },
-    "wood_sword": {
-      "name": "Wooden Sword",
-      "type": "tool"
-    },
-    "stone_sword": {
-      "name": "Stone Sword",
-      "type": "tool"
-    },
-    "iron_sword": {
-      "name": "Iron Sword",
-      "type": "tool"
-    },
-    "diamond_sword": {
-      "name": "Diamond Sword",
-      "type": "tool"
-    },
-    "gold_sword": {
-      "name": "Golden Sword",
-      "type": "tool"
-    },
-    "wood_shovel": {
-      "name": "Wooden Shovel",
-      "type": "tool"
-    },
-    "stone_shovel": {
-      "name": "Stone Shovel",
-      "type": "tool"
-    },
-    "iron_shovel": {
-      "name": "Iron Shovel",
-      "type": "tool"
-    },
-    "diamond_shovel": {
-      "name": "Diamond Shovel",
-      "type": "tool"
-    },
-    "gold_shovel": {
-      "name": "Golden Shovel",
-      "type": "tool"
-    },
-    "bucket_empty": {
-      "name": "Empty Bucket",
-      "type": "tool"
-    },
-    "bucket_water": {
-      "name": "Water Bucket",
-      "type": "tool"
-    },
-    "bucket_lava": {
-      "name": "Lava Bucket",
-      "type": "tool"
-    }
-  }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1a9b554..7155a60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,7 @@ allprojects {
         box2DLightsVersion = '1.4'
         ashleyVersion = '1.7.0'
         aiVersion = '1.8.0'
+        guavaVersion = '28.1'
     }
 
     repositories {
@@ -46,7 +47,6 @@ project(":desktop") {
         implementation project(":core")
         api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
         api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-
     }
 }
 
@@ -63,7 +63,6 @@ project(":android") {
         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"
-
     }
 }
 
@@ -73,6 +72,6 @@ project(":core") {
 
     dependencies {
         api "com.badlogicgames.gdx:gdx:$gdxVersion"
-
+        api "com.google.guava:guava:$guavaVersion-android"
     }
 }
\ No newline at end of file