voxel type work

assets/Data/game/voxelTypes.json

@@ -34,17 +34,17 @@
         },
         {
             "id" : 6,
-            "name" : "stone",
+            "name" : "rock_shale",
             "texture" : "/Textures/Ground/cliff1_256.png"
         },
         {
             "id" : 7,
-            "name" : "rock",
+            "name" : "rock_gneiss",
             "texture" : "/Textures/Ground/rock2_256.png"
         },
         {
             "id" : 8,
-            "name" : "rock",
+            "name" : "rock_slate",
             "texture" : "/Textures/Ground/rock3_256.png"
         }
     ]

docs/src/progress/renderertodo.md

@@ -1467,6 +1467,7 @@ Transparency support for component decorations
 Cloth sack model
 Pickaxe model
 More rock models
+Voxel type work
 
 
 

src/main/java/electrosphere/game/data/voxel/VoxelData.java

@@ -6,7 +6,10 @@ import java.util.Set;
  * A list of all voxel types in game
  */
 public class VoxelData {
-    //The set of all voxel types
+
+    /**
+     * The set of all voxel types
+     */
     Set<VoxelType> types;
 
     /**

src/main/java/electrosphere/game/data/voxel/VoxelType.java

@@ -6,15 +6,32 @@ import java.util.List;
  * Data about a particular type of voxel
  */
 public class VoxelType {
-    //the id of this voxel type
+
+    /**
+     * the id of this voxel type
+     */
     int id;
-    //the name of the type
+
+    /**
+     * the name of the type
+     */
     String name;
-    //any ambient foliage that can be placed on this voxel type
+
+    /**
+     * any ambient foliage that can be placed on this voxel type
+     */
     List<String> ambientFoliage;
-    //the texture for the voxel type
+
+    /**
+     * the texture for the voxel type
+     */
     String texture;
 
+    /**
+     * The corresponding item
+     */
+    String correspondingItem;
+
     /**
      * Gets the id of the voxel type
      * @return The id
@@ -46,4 +63,12 @@ public class VoxelType {
     public String getTexture(){
         return texture;
     }
+
+    /**
+     * Gets the corresponding item
+     * @return The corresponding item
+     */
+    public String getCorrespondingItem(){
+        return correspondingItem;
+    }
 }