From 1e6c502641d96162792242f4c945417bad6da620 Mon Sep 17 00:00:00 2001 From: gered Date: Tue, 15 Apr 2014 15:10:20 -0400 Subject: [PATCH] rename 'json' subpackage to something a bit more appropriate --- .../tilemap3d/{json => assets}/prefabs/JsonTilePrefab.java | 2 +- .../{json => assets}/prefabs/TilePrefabJsonLoader.java | 4 ++-- .../tilemap3d/{json => assets}/prefabs/TilePrefabLoader.java | 2 +- .../tilemap3d/{json => assets}/prefabs/TilePrefabSaver.java | 4 ++-- .../gdx/tilemap3d/{json => assets}/tilemap/JsonTileMap.java | 2 +- .../{json => assets}/tilemap/TileDataSerializer.java | 2 +- .../tilemap3d/{json => assets}/tilemap/TileMapJsonLoader.java | 2 +- .../gdx/tilemap3d/{json => assets}/tilemap/TileMapLoader.java | 2 +- .../gdx/tilemap3d/{json => assets}/tilemap/TileMapSaver.java | 2 +- .../{json => assets}/tilemesh/JsonMaterialMapping.java | 2 +- .../gdx/tilemap3d/{json => assets}/tilemesh/JsonTileMesh.java | 2 +- .../{json => assets}/tilemesh/JsonTileMeshCollection.java | 2 +- .../tilemesh/MaterialTileMappingJsonLoader.java | 2 +- .../{json => assets}/tilemesh/MaterialTileMappingLoader.java | 2 +- .../tilemesh/TileMeshCollectionJsonLoader.java | 2 +- .../{json => assets}/tilemesh/TileMeshCollectionLoader.java | 2 +- .../{json => assets}/tilemesh/TileMeshJsonLoader.java | 2 +- .../tilemap3d/{json => assets}/tilemesh/TileMeshLoader.java | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/prefabs/JsonTilePrefab.java (70%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/prefabs/TilePrefabJsonLoader.java (89%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/prefabs/TilePrefabLoader.java (96%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/prefabs/TilePrefabSaver.java (89%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemap/JsonTileMap.java (88%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemap/TileDataSerializer.java (97%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemap/TileMapJsonLoader.java (98%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemap/TileMapLoader.java (96%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemap/TileMapSaver.java (97%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/JsonMaterialMapping.java (85%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/JsonTileMesh.java (95%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/JsonTileMeshCollection.java (76%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/MaterialTileMappingJsonLoader.java (95%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/MaterialTileMappingLoader.java (97%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/TileMeshCollectionJsonLoader.java (95%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/TileMeshCollectionLoader.java (97%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/TileMeshJsonLoader.java (99%) rename src/main/java/ca/blarg/gdx/tilemap3d/{json => assets}/tilemesh/TileMeshLoader.java (97%) diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/JsonTilePrefab.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/JsonTilePrefab.java similarity index 70% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/JsonTilePrefab.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/JsonTilePrefab.java index 4c4bf72..3038302 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/JsonTilePrefab.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/JsonTilePrefab.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.prefabs; +package ca.blarg.gdx.tilemap3d.assets.prefabs; public class JsonTilePrefab { public int width; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabJsonLoader.java similarity index 89% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabJsonLoader.java index 56b3d5c..df72d4d 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabJsonLoader.java @@ -1,7 +1,7 @@ -package ca.blarg.gdx.tilemap3d.json.prefabs; +package ca.blarg.gdx.tilemap3d.assets.prefabs; import ca.blarg.gdx.Strings; -import ca.blarg.gdx.tilemap3d.json.tilemap.TileDataSerializer; +import ca.blarg.gdx.tilemap3d.assets.tilemap.TileDataSerializer; import ca.blarg.gdx.tilemap3d.prefabs.TilePrefab; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.files.FileHandle; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabLoader.java similarity index 96% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabLoader.java index 1dbb56e..afa65a9 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.prefabs; +package ca.blarg.gdx.tilemap3d.assets.prefabs; import ca.blarg.gdx.tilemap3d.prefabs.TilePrefab; import com.badlogic.gdx.assets.AssetDescriptor; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabSaver.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabSaver.java similarity index 89% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabSaver.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabSaver.java index 0c9f7d9..a9ca3c9 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/prefabs/TilePrefabSaver.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/prefabs/TilePrefabSaver.java @@ -1,6 +1,6 @@ -package ca.blarg.gdx.tilemap3d.json.prefabs; +package ca.blarg.gdx.tilemap3d.assets.prefabs; -import ca.blarg.gdx.tilemap3d.json.tilemap.TileDataSerializer; +import ca.blarg.gdx.tilemap3d.assets.tilemap.TileDataSerializer; import ca.blarg.gdx.tilemap3d.prefabs.TilePrefab; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/JsonTileMap.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/JsonTileMap.java similarity index 88% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/JsonTileMap.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/JsonTileMap.java index 3a0fca2..5e36c56 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/JsonTileMap.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/JsonTileMap.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemap; +package ca.blarg.gdx.tilemap3d.assets.tilemap; import java.util.ArrayList; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileDataSerializer.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileDataSerializer.java similarity index 97% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileDataSerializer.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileDataSerializer.java index 020c058..84b2d1b 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileDataSerializer.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileDataSerializer.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemap; +package ca.blarg.gdx.tilemap3d.assets.tilemap; import ca.blarg.gdx.tilemap3d.Tile; import ca.blarg.gdx.tilemap3d.TileRawDataContainer; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapJsonLoader.java similarity index 98% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapJsonLoader.java index 8b1b97e..d84a34b 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapJsonLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemap; +package ca.blarg.gdx.tilemap3d.assets.tilemap; import ca.blarg.gdx.Strings; import ca.blarg.gdx.tilemap3d.ChunkVertexGenerator; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapLoader.java similarity index 96% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapLoader.java index 3adf961..2f251dd 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemap; +package ca.blarg.gdx.tilemap3d.assets.tilemap; import ca.blarg.gdx.tilemap3d.TileMap; import ca.blarg.gdx.tilemap3d.tilemesh.TileMeshCollection; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapSaver.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapSaver.java similarity index 97% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapSaver.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapSaver.java index 4d781f4..70befe1 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemap/TileMapSaver.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemap/TileMapSaver.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemap; +package ca.blarg.gdx.tilemap3d.assets.tilemap; import ca.blarg.gdx.tilemap3d.TileChunk; import ca.blarg.gdx.tilemap3d.TileMap; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonMaterialMapping.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonMaterialMapping.java similarity index 85% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonMaterialMapping.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonMaterialMapping.java index 31bfd30..cc97362 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonMaterialMapping.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonMaterialMapping.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import java.util.ArrayList; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMesh.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonTileMesh.java similarity index 95% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMesh.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonTileMesh.java index 9137136..6ee5ff1 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMesh.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonTileMesh.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector3; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMeshCollection.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonTileMeshCollection.java similarity index 76% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMeshCollection.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonTileMeshCollection.java index 190e832..36d6628 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/JsonTileMeshCollection.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/JsonTileMeshCollection.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import java.util.ArrayList; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/MaterialTileMappingJsonLoader.java similarity index 95% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingJsonLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/MaterialTileMappingJsonLoader.java index babbffa..7d865e7 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/MaterialTileMappingJsonLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/MaterialTileMappingLoader.java similarity index 97% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/MaterialTileMappingLoader.java index 68a6e22..a704815 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/MaterialTileMappingLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/MaterialTileMappingLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionJsonLoader.java similarity index 95% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionJsonLoader.java index 81fc892..11fff88 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionJsonLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.tilemap3d.tilemesh.TileMesh; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java similarity index 97% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java index 7be07c1..60edc39 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshCollectionLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshCollectionLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshJsonLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshJsonLoader.java similarity index 99% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshJsonLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshJsonLoader.java index c45ee1c..81ec2f0 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshJsonLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshJsonLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import ca.blarg.gdx.Bitfield; import ca.blarg.gdx.graphics.atlas.TextureAtlas; diff --git a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshLoader.java b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java similarity index 97% rename from src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshLoader.java rename to src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java index c4432ea..a1ec552 100644 --- a/src/main/java/ca/blarg/gdx/tilemap3d/json/tilemesh/TileMeshLoader.java +++ b/src/main/java/ca/blarg/gdx/tilemap3d/assets/tilemesh/TileMeshLoader.java @@ -1,4 +1,4 @@ -package ca.blarg.gdx.tilemap3d.json.tilemesh; +package ca.blarg.gdx.tilemap3d.assets.tilemesh; import ca.blarg.gdx.graphics.atlas.TextureAtlas; import ca.blarg.gdx.tilemap3d.tilemesh.MaterialTileMapping;