Fixes and cleanup

- Compile error fixes (blame @biggles2206). Fixes #53.
- UVLModelLoader is now cross compatible with vanilla (vanilla can use
uvl parents who have vanilla parents).
- Due to it, now using uvlMarker instead of .uvl.
- General code reformatting and cleanup.

src/test/resources/assets/uvlightmapjsontest/blockstates/uvlblock.json

@@ -1,5 +1,5 @@
 {
     "variants": {
-        "normal": { "model": "UVLightmapJsonTest:uvlblock.uvl" }
+        "normal": { "model": "uvlightmapjsontest:uvlblock_vanilla" }
     }
 }

src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json

@@ -1,4 +1,5 @@
 {
+    "uvlMarker": true,
     "textures": {
         "0": "blocks/obsidian",
         "1": "uvlightmapjsontest:blocks/BlockControllerLights"

src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock_vanilla.json

@@ -0,0 +1,6 @@
+{
+    "parent": "uvlightmapjsontest:block/uvlblock",
+    "textures": {
+        "0": "blocks/diamond_block"
+    }
+}

src/test/resources/assets/uvlightmapjsontest/models/item/uvlblock.json

@@ -1,3 +1,3 @@
 {
-    "parent": "uvlightmapjsontest:block/uvlblock.uvl"
+    "parent": "uvlightmapjsontest:block/uvlblock"
 }