wires are now separated from blocks

REFERENCING.md

@@ -9,8 +9,9 @@ where Prefix is predefined (see below), Integer ID is arbitrarily chosen within
 ### Prefixes
 |Name|Description|
 |----|-----------|
-|wall|Wall, only used by the Inventory to differentiate walls from blocks (therefore wall shares same "ID Space" with blocks/fluids/wires)|
+|wall|Wall, only used by the Inventory to differentiate walls from blocks (therefore wall shares same "ID Space" with blocks)|
-|item|Item (Static), uses different "ID Space" with blocks/walls/fluids/wires|
+|item|Item (Static)|
+|wire|Wires|
 
 Notes: 
 - BlockCodex and ItemCodex will not store prefix part of the ID, as blocks and walls are identical in properties

src/net/torvald/terrarum/ModMgr.kt

@@ -223,11 +223,9 @@ object ModMgr {
 
 
     object GameBlockLoader {
-        val blockPath = "blocks/"
-
         @JvmStatic operator fun invoke(module: String) {
-            BlockCodex(module, blockPath + "blocks.csv")
+            BlockCodex(module, "blocks/blocks.csv")
-            WireCodex(module, blockPath + "wires.csv")
+            WireCodex(module, "wires/wires.csv")
         }
     }
 

src/net/torvald/terrarum/worlddrawer/BlocksDrawerNew.kt

@@ -103,7 +103,7 @@ internal object BlocksDrawer {
         )
 
         //TODO make wire work with the TileAtlas system
-        tilesWire = TextureRegionPack(ModMgr.getGdxFile("basegame", "blocks/wire.tga"), TILE_SIZE, TILE_SIZE)
+        tilesWire = TextureRegionPack(ModMgr.getGdxFile("basegame", "wires/wire.tga"), TILE_SIZE, TILE_SIZE)
         tilesFluid = TextureRegionPack(Texture(AppLoader.tileMaker.atlasFluid), TILE_SIZE, TILE_SIZE)
         tilesGlow = TextureRegionPack(Texture(AppLoader.tileMaker.atlasGlow), TILE_SIZE, TILE_SIZE)