minerender 2.0.0-alpha.7 → 2.0.0-alpha.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (157) hide show
  1. package/ava.config.js +10 -0
  2. package/build.mjs +2 -2
  3. package/dist/bundle.js +12824 -2556
  4. package/dist/bundle.js.map +4 -5
  5. package/dist/cjs/UVMapper.js +6 -2
  6. package/dist/cjs/UVMapper.js.map +1 -1
  7. package/dist/cjs/assets/AssetKey.js.map +1 -1
  8. package/dist/cjs/assets/AssetLoader.d.ts +6 -20
  9. package/dist/cjs/assets/AssetLoader.js +34 -123
  10. package/dist/cjs/assets/AssetLoader.js.map +1 -1
  11. package/dist/cjs/assets/BlockStates.d.ts +1 -0
  12. package/dist/cjs/assets/BlockStates.js +8 -4
  13. package/dist/cjs/assets/BlockStates.js.map +1 -1
  14. package/dist/cjs/assets/ModelTextures.js +3 -2
  15. package/dist/cjs/assets/ModelTextures.js.map +1 -1
  16. package/dist/cjs/assets/Models.js +3 -4
  17. package/dist/cjs/assets/Models.js.map +1 -1
  18. package/dist/cjs/assets/index.d.ts +1 -0
  19. package/dist/cjs/assets/index.js +1 -0
  20. package/dist/cjs/assets/index.js.map +1 -1
  21. package/dist/cjs/assets/source/AssetSource.d.ts +8 -0
  22. package/dist/cjs/assets/source/AssetSource.js +9 -0
  23. package/dist/cjs/assets/source/AssetSource.js.map +1 -0
  24. package/dist/cjs/assets/source/HostedAssetSource.d.ts +33 -0
  25. package/dist/cjs/assets/source/HostedAssetSource.js +190 -0
  26. package/dist/cjs/assets/source/HostedAssetSource.js.map +1 -0
  27. package/dist/cjs/assets/source/archive/ArchiveAssetSource.d.ts +17 -0
  28. package/dist/cjs/assets/source/archive/ArchiveAssetSource.js +126 -0
  29. package/dist/cjs/assets/source/archive/ArchiveAssetSource.js.map +1 -0
  30. package/dist/cjs/assets/source/archive/ArchiveEntry.d.ts +5 -0
  31. package/dist/cjs/assets/source/archive/ArchiveEntry.js +3 -0
  32. package/dist/cjs/assets/source/archive/ArchiveEntry.js.map +1 -0
  33. package/dist/cjs/assets/source/archive/ArchiveProxy.d.ts +4 -0
  34. package/dist/cjs/assets/source/archive/ArchiveProxy.js +3 -0
  35. package/dist/cjs/assets/source/archive/ArchiveProxy.js.map +1 -0
  36. package/dist/cjs/assets/source/archive/BrowserArchiveProxy.d.ts +9 -0
  37. package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js +34 -0
  38. package/dist/cjs/assets/source/archive/BrowserArchiveProxy.js.map +1 -0
  39. package/dist/cjs/assets/source/archive/index.d.ts +4 -0
  40. package/dist/cjs/assets/source/archive/index.js +21 -0
  41. package/dist/cjs/assets/source/archive/index.js.map +1 -0
  42. package/dist/cjs/assets/source/index.d.ts +4 -0
  43. package/dist/cjs/assets/source/index.js +22 -0
  44. package/dist/cjs/assets/source/index.js.map +1 -0
  45. package/dist/cjs/assets/source/parser/AssetParsers.d.ts +9 -0
  46. package/dist/cjs/assets/source/parser/AssetParsers.js +14 -0
  47. package/dist/cjs/assets/source/parser/AssetParsers.js.map +1 -0
  48. package/dist/cjs/assets/source/parser/ResponseParser.d.ts +7 -0
  49. package/dist/cjs/assets/source/parser/ResponseParser.js +3 -0
  50. package/dist/cjs/assets/source/parser/ResponseParser.js.map +1 -0
  51. package/dist/cjs/assets/source/parser/index.d.ts +2 -0
  52. package/dist/cjs/assets/source/parser/index.js +20 -0
  53. package/dist/cjs/assets/source/parser/index.js.map +1 -0
  54. package/dist/cjs/cache/Caching.js +9 -0
  55. package/dist/cjs/cache/Caching.js.map +1 -1
  56. package/dist/cjs/index.d.ts +2 -0
  57. package/dist/cjs/index.js +2 -0
  58. package/dist/cjs/index.js.map +1 -1
  59. package/dist/cjs/model/scene/ModelObject.js +1 -1
  60. package/dist/cjs/model/scene/ModelObject.js.map +1 -1
  61. package/dist/cjs/renderer/MineRenderScene.d.ts +1 -1
  62. package/dist/cjs/renderer/MineRenderScene.js +5 -6
  63. package/dist/cjs/renderer/MineRenderScene.js.map +1 -1
  64. package/dist/cjs/renderer/SceneObject.js +1 -0
  65. package/dist/cjs/renderer/SceneObject.js.map +1 -1
  66. package/dist/cjs/three/index.d.ts +0 -2
  67. package/dist/cjs/three/index.js +0 -2
  68. package/dist/cjs/three/index.js.map +1 -1
  69. package/dist/esm/UVMapper.js +6 -2
  70. package/dist/esm/UVMapper.js.map +1 -1
  71. package/dist/esm/assets/AssetKey.js.map +1 -1
  72. package/dist/esm/assets/AssetLoader.d.ts +6 -20
  73. package/dist/esm/assets/AssetLoader.js +35 -124
  74. package/dist/esm/assets/AssetLoader.js.map +1 -1
  75. package/dist/esm/assets/BlockStates.d.ts +1 -0
  76. package/dist/esm/assets/BlockStates.js +8 -4
  77. package/dist/esm/assets/BlockStates.js.map +1 -1
  78. package/dist/esm/assets/ModelTextures.js +3 -2
  79. package/dist/esm/assets/ModelTextures.js.map +1 -1
  80. package/dist/esm/assets/Models.js +3 -4
  81. package/dist/esm/assets/Models.js.map +1 -1
  82. package/dist/esm/assets/index.d.ts +1 -0
  83. package/dist/esm/assets/index.js +1 -0
  84. package/dist/esm/assets/index.js.map +1 -1
  85. package/dist/esm/assets/source/AssetSource.d.ts +8 -0
  86. package/dist/esm/assets/source/AssetSource.js +5 -0
  87. package/dist/esm/assets/source/AssetSource.js.map +1 -0
  88. package/dist/esm/assets/source/HostedAssetSource.d.ts +33 -0
  89. package/dist/esm/assets/source/HostedAssetSource.js +183 -0
  90. package/dist/esm/assets/source/HostedAssetSource.js.map +1 -0
  91. package/dist/esm/assets/source/archive/ArchiveAssetSource.d.ts +17 -0
  92. package/dist/esm/assets/source/archive/ArchiveAssetSource.js +122 -0
  93. package/dist/esm/assets/source/archive/ArchiveAssetSource.js.map +1 -0
  94. package/dist/esm/assets/source/archive/ArchiveEntry.d.ts +5 -0
  95. package/dist/esm/assets/source/archive/ArchiveEntry.js +2 -0
  96. package/dist/esm/assets/source/archive/ArchiveEntry.js.map +1 -0
  97. package/dist/esm/assets/source/archive/ArchiveProxy.d.ts +4 -0
  98. package/dist/esm/assets/source/archive/ArchiveProxy.js +2 -0
  99. package/dist/esm/assets/source/archive/ArchiveProxy.js.map +1 -0
  100. package/dist/esm/assets/source/archive/BrowserArchiveProxy.d.ts +9 -0
  101. package/dist/esm/assets/source/archive/BrowserArchiveProxy.js +30 -0
  102. package/dist/esm/assets/source/archive/BrowserArchiveProxy.js.map +1 -0
  103. package/dist/esm/assets/source/archive/index.d.ts +4 -0
  104. package/dist/esm/assets/source/archive/index.js +5 -0
  105. package/dist/esm/assets/source/archive/index.js.map +1 -0
  106. package/dist/esm/assets/source/index.d.ts +4 -0
  107. package/dist/esm/assets/source/index.js +6 -0
  108. package/dist/esm/assets/source/index.js.map +1 -0
  109. package/dist/esm/assets/source/parser/AssetParsers.d.ts +9 -0
  110. package/dist/esm/assets/source/parser/AssetParsers.js +11 -0
  111. package/dist/esm/assets/source/parser/AssetParsers.js.map +1 -0
  112. package/dist/esm/assets/source/parser/ResponseParser.d.ts +7 -0
  113. package/dist/esm/assets/source/parser/ResponseParser.js +2 -0
  114. package/dist/esm/assets/source/parser/ResponseParser.js.map +1 -0
  115. package/dist/esm/assets/source/parser/index.d.ts +2 -0
  116. package/dist/esm/assets/source/parser/index.js +4 -0
  117. package/dist/esm/assets/source/parser/index.js.map +1 -0
  118. package/dist/esm/cache/Caching.js +9 -0
  119. package/dist/esm/cache/Caching.js.map +1 -1
  120. package/dist/esm/index.d.ts +2 -0
  121. package/dist/esm/index.js +2 -0
  122. package/dist/esm/index.js.map +1 -1
  123. package/dist/esm/model/scene/ModelObject.js +1 -1
  124. package/dist/esm/model/scene/ModelObject.js.map +1 -1
  125. package/dist/esm/renderer/MineRenderScene.d.ts +1 -1
  126. package/dist/esm/renderer/MineRenderScene.js +5 -6
  127. package/dist/esm/renderer/MineRenderScene.js.map +1 -1
  128. package/dist/esm/renderer/SceneObject.js +1 -0
  129. package/dist/esm/renderer/SceneObject.js.map +1 -1
  130. package/dist/esm/three/index.d.ts +0 -2
  131. package/dist/esm/three/index.js +0 -2
  132. package/dist/esm/three/index.js.map +1 -1
  133. package/package.json +11 -5
  134. package/src/UVMapper.ts +10 -6
  135. package/src/assets/AssetKey.ts +0 -1
  136. package/src/assets/AssetLoader.ts +42 -119
  137. package/src/assets/BlockStates.ts +9 -5
  138. package/src/assets/ModelTextures.ts +3 -2
  139. package/src/assets/Models.ts +5 -5
  140. package/src/assets/index.ts +9 -8
  141. package/src/assets/source/AssetSource.ts +13 -0
  142. package/src/assets/source/HostedAssetSource.ts +191 -0
  143. package/src/assets/source/archive/ArchiveAssetSource.ts +124 -0
  144. package/src/assets/source/archive/ArchiveEntry.ts +5 -0
  145. package/src/assets/source/archive/ArchiveProxy.ts +7 -0
  146. package/src/assets/source/archive/BrowserArchiveProxy.ts +27 -0
  147. package/src/assets/source/archive/index.ts +4 -0
  148. package/src/assets/source/index.ts +5 -0
  149. package/src/assets/source/parser/AssetParsers.ts +11 -0
  150. package/src/assets/source/parser/ResponseParser.ts +9 -0
  151. package/src/assets/source/parser/index.ts +3 -0
  152. package/src/cache/Caching.ts +9 -0
  153. package/src/index.ts +68 -66
  154. package/src/model/scene/ModelObject.ts +1 -1
  155. package/src/renderer/MineRenderScene.ts +4 -5
  156. package/src/renderer/SceneObject.ts +1 -0
  157. package/src/three/index.ts +3 -5
@@ -1 +1 @@
1
- {"version":3,"file":"BlockStates.js","sourceRoot":"src/","sources":["assets/BlockStates.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,kBAAkB,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,OAAO,WAAW;IAIpB,iCAAiC;IAEb,AAAb,MAAM,CAAO,OAAO;;YACvB,OAAO,WAAW,CAAC,uBAAuB,CAAC,IAAI,QAAQ,CACnD,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,SAAS,EACT,QAAQ,EACR,OAAO,EACP,YAAY,CACf,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QACnD,CAAC;KAAA;IAEM,MAAM,CAAC,eAAe,CAAC,GAAa;QACvC,OAAO,kBAAkB,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;IACrF,CAAC;IAEM,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC;aACjC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;aAC3B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC3C,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBAChD,OAAO,WAAW,CAAC,uBAAuB,CAAC,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBACjF,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACZ,IAAI,KAAK,EAAE;oBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;iBACnB;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAC,MAAM,CAAC,IAAqC;QACtD,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;;AAhDc,4BAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAI7D;IADnB,OAAO,EAAE;gCAWT"}
1
+ {"version":3,"file":"BlockStates.js","sourceRoot":"src/","sources":["assets/BlockStates.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,kBAAkB,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAG3D,MAAM,OAAO,WAAW;IAIpB,iCAAiC;IAEb,AAAb,MAAM,CAAO,OAAO;;YACvB,OAAO,WAAW,CAAC,GAAG,CAAY,IAAI,QAAQ,CAC1C,iBAAiB,EACjB,OAAO,EACP,aAAa,EACb,SAAS,EACT,QAAQ,EACR,OAAO,EACP,YAAY,CACf,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC,CAAC;QACnD,CAAC;KAAA;IAEM,MAAM,CAAC,eAAe,CAAC,GAAa;QACvC,OAAO,kBAAkB,CAAC,YAAY,GAAG,GAAG,CAAC,IAAI,CAA+B,CAAC;IACrF,CAAC;IAEM,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,aAAa,CAAC;aACjC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE;gBAChB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;aAC3B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC3C,OAAO,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBAChD,OAAO,WAAW,CAAC,GAAG,CAAa,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;gBACpE,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACZ,IAAI,KAAK,EAAE;oBACP,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;iBACnB;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAC,MAAM,CAAC,IAAqC;QACtD,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QACxC,CAAC;KAAA;;AAlDc,4BAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAI7D;IADnB,OAAO,EAAE;gCAWT"}
@@ -12,6 +12,7 @@ import { AssetLoader } from "./AssetLoader";
12
12
  import { ImageLoader } from "../image/ImageLoader";
13
13
  import { PersistentCache } from "../cache/PersistentCache";
14
14
  import { AssetKey } from "./AssetKey";
15
+ import { AssetParser } from "./source/parser/AssetParsers";
15
16
  export class ModelTextures {
16
17
  static get(key) {
17
18
  return __awaiter(this, void 0, void 0, function* () {
@@ -26,7 +27,7 @@ export class ModelTextures {
26
27
  return __awaiter(this, void 0, void 0, function* () {
27
28
  const keyStr = key.serialize();
28
29
  return Caching.textureAssetCache.get(keyStr, k => {
29
- return AssetLoader.loadOrRetryWithDefaults(key, AssetLoader.IMAGE).then(asset => {
30
+ return AssetLoader.get(key, AssetParser.IMAGE).then(asset => {
30
31
  if (asset)
31
32
  asset.key = key;
32
33
  return asset;
@@ -43,7 +44,7 @@ export class ModelTextures {
43
44
  const keyStr = key.serialize();
44
45
  return Caching.textureMetaCache.get(keyStr, k => {
45
46
  return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
46
- return AssetLoader.loadOrRetryWithDefaults(key, AssetLoader.META).then(asset => {
47
+ return AssetLoader.get(key, AssetParser.META).then(asset => {
47
48
  if (asset)
48
49
  asset.key = key;
49
50
  return asset;
@@ -1 +1 @@
1
- {"version":3,"file":"ModelTextures.js","sourceRoot":"src/","sources":["assets/ModelTextures.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,OAAO,aAAa;IAIf,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACP,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC9C;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC7C,OAAO,WAAW,CAAC,uBAAuB,CAAe,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC1F,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;aAC9B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAE/B,OAAO,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBACrD,OAAO,WAAW,CAAC,uBAAuB,CAAuB,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBACjG,IAAI,KAAK;4BACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;wBACpB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAC7C,CAAC;KAAA;;AAzCc,mCAAqB,GAAG,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}
1
+ {"version":3,"file":"ModelTextures.js","sourceRoot":"src/","sources":["assets/ModelTextures.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,MAAM,OAAO,aAAa;IAIf,MAAM,CAAO,GAAG,CAAC,GAAa;;YACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,EAAE;gBACP,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC9C;YACD,OAAO,SAAS,CAAC;QACrB,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC7C,OAAO,WAAW,CAAC,GAAG,CAAe,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBACtE,IAAI,KAAK;wBACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;oBACpB,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,OAAO,CAAC,GAAa;;YACrC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACtD,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC/C,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;aAC9B;YACD,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YAE/B,OAAO,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE;gBAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;oBACrD,OAAO,WAAW,CAAC,GAAG,CAAuB,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;wBAC7E,IAAI,KAAK;4BACL,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;wBACpB,OAAO,KAAK,CAAC;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;IAEM,MAAM,CAAO,UAAU;;YAC1B,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;QAC7C,CAAC;KAAA;;AAzCc,mCAAqB,GAAG,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC"}
@@ -20,10 +20,11 @@ import { Memoize } from "typescript-memoize";
20
20
  import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "./Assets";
21
21
  import { PersistentCache } from "../cache/PersistentCache";
22
22
  import { AssetKey } from "./AssetKey";
23
+ import { AssetParser } from "./source/parser/AssetParsers";
23
24
  export class Models {
24
25
  static getItemList() {
25
26
  return __awaiter(this, void 0, void 0, function* () {
26
- return AssetLoader.loadOrRetryWithDefaults(new AssetKey(DEFAULT_NAMESPACE, "_list", "models", "item", "assets", ".json", DEFAULT_ROOT), AssetLoader.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
27
+ return AssetLoader.get(new AssetKey(DEFAULT_NAMESPACE, "_list", "models", "item", "assets", ".json", DEFAULT_ROOT), AssetParser.LIST).then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.files) !== null && _a !== void 0 ? _a : []; });
27
28
  });
28
29
  }
29
30
  static loadAndMerge(key) {
@@ -46,9 +47,7 @@ export class Models {
46
47
  const keyStr = key.serialize();
47
48
  return Caching.rawModelCache.get(keyStr, k => {
48
49
  return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
49
- return AssetLoader.loadOrRetryWithDefaults(key, AssetLoader.MODEL).then(asset => {
50
- return asset;
51
- });
50
+ return AssetLoader.get(key, AssetParser.MODEL);
52
51
  });
53
52
  }).then(asset => {
54
53
  if (asset) {
@@ -1 +1 @@
1
- {"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Models.js","sourceRoot":"src/","sources":["assets/Models.ts"],"names":[],"mappings":"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"}
@@ -5,3 +5,4 @@ export * from './BlockStates';
5
5
  export * from './Entities';
6
6
  export * from './ModelTextures';
7
7
  export * from './Models';
8
+ export * from './source';
@@ -6,4 +6,5 @@ export * from './BlockStates';
6
6
  export * from './Entities';
7
7
  export * from './ModelTextures';
8
8
  export * from './Models';
9
+ export * from './source';
9
10
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}
@@ -0,0 +1,8 @@
1
+ import { MinecraftAsset } from "../../MinecraftAsset";
2
+ import { AssetKey } from "../AssetKey";
3
+ import { Maybe } from "../../util";
4
+ import { AssetParser } from "./parser/AssetParsers";
5
+ export declare abstract class AssetSource {
6
+ protected constructor();
7
+ abstract get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
8
+ }
@@ -0,0 +1,5 @@
1
+ export class AssetSource {
2
+ constructor() {
3
+ }
4
+ }
5
+ //# sourceMappingURL=AssetSource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AssetSource.js","sourceRoot":"src/","sources":["assets/source/AssetSource.ts"],"names":[],"mappings":"AAKA,MAAM,OAAgB,WAAW;IAE7B;IACA,CAAC;CAIJ"}
@@ -0,0 +1,33 @@
1
+ import { AssetSource } from ".";
2
+ import { BlockState, Model, TextureAsset } from "../../model";
3
+ import { Maybe } from "../../util";
4
+ import { MinecraftTextureMeta } from "../../MinecraftTextureMeta";
5
+ import { NBTAsset } from "../../nbt";
6
+ import { ListAsset } from "../../ListAsset";
7
+ import { MinecraftAsset } from "../../MinecraftAsset";
8
+ import { AssetKey } from "../AssetKey";
9
+ import { AssetParser } from "./parser";
10
+ import { ResponseParser } from "./parser";
11
+ export declare class HostedAssetSource extends AssetSource {
12
+ static readonly MODEL: ResponseParser<Model>;
13
+ static readonly BLOCKSTATE: ResponseParser<BlockState>;
14
+ static readonly META: ResponseParser<MinecraftTextureMeta>;
15
+ static readonly NBT: ResponseParser<NBTAsset>;
16
+ static readonly IMAGE: ResponseParser<TextureAsset>;
17
+ static readonly LIST: ResponseParser<ListAsset>;
18
+ static readonly JSON: ResponseParser<any>;
19
+ static readonly PARSER_MAP: Map<AssetParser, ResponseParser<any>>;
20
+ loadOrRetryWithDefaults<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
21
+ protected load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
22
+ assetBasePath(key: AssetKey): string;
23
+ private readonly _root;
24
+ private readonly _options;
25
+ constructor(root: string, options?: Partial<HostedAssetSourceOptions>);
26
+ get root(): string;
27
+ get options(): HostedAssetSourceOptions;
28
+ get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser): Promise<Maybe<T>>;
29
+ }
30
+ interface HostedAssetSourceOptions {
31
+ retryDefaults: boolean;
32
+ }
33
+ export {};
@@ -0,0 +1,183 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ import { AssetSource } from ".";
11
+ import { prefix } from "../../util";
12
+ import { NBTHelper } from "../../nbt";
13
+ import { ImageLoader } from "../../image";
14
+ import { AssetKey } from "../AssetKey";
15
+ import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "../Assets";
16
+ import { Requests } from "../../request";
17
+ import { AssetLoader } from "../AssetLoader";
18
+ import { AssetParser } from "./parser";
19
+ import merge from "ts-deepmerge";
20
+ const p = prefix("HostedAssetSource");
21
+ const DEFAULT_OPTIONS = {
22
+ retryDefaults: true
23
+ };
24
+ export class HostedAssetSource extends AssetSource {
25
+ loadOrRetryWithDefaults(key, parser) {
26
+ return __awaiter(this, void 0, void 0, function* () {
27
+ const direct = yield this.load(key, parser);
28
+ if (typeof direct !== "undefined") {
29
+ return direct;
30
+ }
31
+ if (key.namespace !== DEFAULT_NAMESPACE) {
32
+ console.info(p, "Retrying", key, "with default namespace");
33
+ // Try on the same host but with default minecraft: namespace
34
+ const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
35
+ const namespaced = yield this.load(namespaceKey, parser);
36
+ if (typeof namespaced !== "undefined") {
37
+ return namespaced;
38
+ }
39
+ if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
40
+ console.info(p, "Retrying", key, "with default root+namespace");
41
+ // Try both defaults
42
+ const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
43
+ const namespacedRooted = yield this.load(namespacedRootedKey, parser);
44
+ if (typeof namespacedRooted !== "undefined") {
45
+ return namespacedRooted;
46
+ }
47
+ }
48
+ }
49
+ else if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
50
+ console.info(p, "Retrying", key, "with default root");
51
+ // Try on default root
52
+ const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
53
+ const rooted = yield this.load(rootKey, parser);
54
+ if (typeof rooted !== "undefined") {
55
+ return rooted;
56
+ }
57
+ }
58
+ return undefined;
59
+ });
60
+ }
61
+ load(key, parser) {
62
+ return __awaiter(this, void 0, void 0, function* () {
63
+ console.info(p, "Loading", key);
64
+ const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
65
+ console.debug(p, url);
66
+ let req = {
67
+ url: url
68
+ };
69
+ parser.config(req);
70
+ // @ts-ignore
71
+ return yield Requests.mcAssetRequest(req)
72
+ .then(response => {
73
+ if (response && response.data) {
74
+ try {
75
+ return parser.parse(response);
76
+ }
77
+ catch (e) {
78
+ console.warn("Parser failed to process response", response, e);
79
+ throw e;
80
+ }
81
+ }
82
+ return undefined;
83
+ })
84
+ .catch(err => {
85
+ if (err.response) {
86
+ let response = err.response;
87
+ if (response.status === 404) {
88
+ console.debug(p, key, "not found");
89
+ return undefined;
90
+ }
91
+ }
92
+ console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
93
+ return undefined;
94
+ });
95
+ });
96
+ }
97
+ assetBasePath(key) {
98
+ var _a, _b;
99
+ return `${(_b = (_a = key.root) !== null && _a !== void 0 ? _a : this.root) !== null && _b !== void 0 ? _b : AssetLoader.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
100
+ }
101
+ constructor(root, options) {
102
+ super();
103
+ this._root = root;
104
+ this._options = merge({}, DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
105
+ }
106
+ get root() {
107
+ return this._root;
108
+ }
109
+ get options() {
110
+ return this._options;
111
+ }
112
+ get(key, parser) {
113
+ const responseParser = HostedAssetSource.PARSER_MAP.get(parser);
114
+ if (this.options.retryDefaults) {
115
+ return this.loadOrRetryWithDefaults(key, responseParser);
116
+ }
117
+ return this.load(key, responseParser);
118
+ }
119
+ }
120
+ HostedAssetSource.MODEL = {
121
+ config(request) {
122
+ },
123
+ parse(response) {
124
+ return response.data;
125
+ }
126
+ };
127
+ HostedAssetSource.BLOCKSTATE = {
128
+ config(request) {
129
+ },
130
+ parse(response) {
131
+ return response.data;
132
+ }
133
+ };
134
+ HostedAssetSource.META = {
135
+ config(request) {
136
+ // request.responseType = "arraybuffer";
137
+ },
138
+ parse(response) {
139
+ return response.data;
140
+ }
141
+ };
142
+ HostedAssetSource.NBT = {
143
+ config(request) {
144
+ request.responseType = "arraybuffer";
145
+ },
146
+ parse(response) {
147
+ return NBTHelper.fromBuffer(Buffer.from(response.data));
148
+ }
149
+ };
150
+ HostedAssetSource.IMAGE = {
151
+ config(request) {
152
+ request.responseType = "arraybuffer";
153
+ },
154
+ parse(response) {
155
+ return __awaiter(this, void 0, void 0, function* () {
156
+ return yield ImageLoader.processResponse(response);
157
+ });
158
+ }
159
+ };
160
+ HostedAssetSource.LIST = {
161
+ config(request) {
162
+ },
163
+ parse(response) {
164
+ return response.data;
165
+ }
166
+ };
167
+ HostedAssetSource.JSON = {
168
+ config(request) {
169
+ },
170
+ parse(response) {
171
+ return response.data;
172
+ }
173
+ };
174
+ HostedAssetSource.PARSER_MAP = new Map([
175
+ [AssetParser.MODEL, HostedAssetSource.MODEL],
176
+ [AssetParser.BLOCKSTATE, HostedAssetSource.BLOCKSTATE],
177
+ [AssetParser.META, HostedAssetSource.META],
178
+ [AssetParser.NBT, HostedAssetSource.NBT],
179
+ [AssetParser.IMAGE, HostedAssetSource.IMAGE],
180
+ [AssetParser.LIST, HostedAssetSource.LIST],
181
+ [AssetParser.JSON, HostedAssetSource.JSON],
182
+ ]);
183
+ //# sourceMappingURL=HostedAssetSource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"HostedAssetSource.js","sourceRoot":"src/","sources":["assets/source/HostedAssetSource.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ import { AssetSource } from "../AssetSource";
2
+ import { ArchiveProxy } from "./ArchiveProxy";
3
+ import { ArchiveEntry } from "./ArchiveEntry";
4
+ import { MinecraftAsset } from "../../../MinecraftAsset";
5
+ import { AssetKey } from "../../AssetKey";
6
+ import { AssetParser, ResponseParser } from "../parser";
7
+ import { Maybe } from "../../../util";
8
+ export declare class ArchiveAssetSource extends AssetSource implements ArchiveProxy {
9
+ readonly _archiveProxy: ArchiveProxy;
10
+ constructor(archiveProxy: ArchiveProxy);
11
+ static blob(blob: Blob): ArchiveAssetSource;
12
+ getEntries(): Promise<ArchiveEntry[]>;
13
+ getEntry(path: string): Promise<Maybe<ArchiveEntry>>;
14
+ get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
15
+ protected load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>>;
16
+ assetBasePath(key: AssetKey): string;
17
+ }
@@ -0,0 +1,122 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ import { AssetSource } from "../AssetSource";
11
+ import { prefix } from "../../../util";
12
+ import { Requests } from "../../../request";
13
+ import { HostedAssetSource } from "../HostedAssetSource";
14
+ import { BrowserArchiveProxy } from "./BrowserArchiveProxy";
15
+ const p = prefix("ArchiveAssetSource");
16
+ export class ArchiveAssetSource extends AssetSource {
17
+ constructor(archiveProxy) {
18
+ super();
19
+ console.log(archiveProxy);
20
+ this._archiveProxy = archiveProxy;
21
+ }
22
+ static blob(blob) {
23
+ return new ArchiveAssetSource(new BrowserArchiveProxy(blob));
24
+ }
25
+ getEntries() {
26
+ return __awaiter(this, void 0, void 0, function* () {
27
+ return this._archiveProxy.getEntries();
28
+ });
29
+ }
30
+ getEntry(path) {
31
+ return __awaiter(this, void 0, void 0, function* () {
32
+ const entries = yield this.getEntries();
33
+ return entries.find(e => e.filename === path);
34
+ });
35
+ }
36
+ get(key, parser) {
37
+ return __awaiter(this, void 0, void 0, function* () {
38
+ const responseParser = HostedAssetSource.PARSER_MAP.get(parser);
39
+ console.log("ArchiveAssetSource.get", key, parser);
40
+ let entries = (yield this.getEntries());
41
+ const path = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
42
+ console.log(path);
43
+ const entry = yield this.getEntry(path);
44
+ console.log(entry);
45
+ if (!entry) {
46
+ return undefined;
47
+ }
48
+ let blob = yield entry.getData();
49
+ const url = URL.createObjectURL(blob);
50
+ console.log(url);
51
+ let req = {
52
+ url: url,
53
+ };
54
+ responseParser.config(req);
55
+ return Requests.genericRequest(req)
56
+ .then(response => {
57
+ if (response && response.data) {
58
+ try {
59
+ return responseParser.parse(response);
60
+ }
61
+ catch (e) {
62
+ console.warn("Parser failed to process response", response, e);
63
+ throw e;
64
+ }
65
+ }
66
+ return undefined;
67
+ })
68
+ .catch(err => {
69
+ if (err.response) {
70
+ let response = err.response;
71
+ if (response.status === 404) {
72
+ console.debug(p, key, "not found");
73
+ return undefined;
74
+ }
75
+ }
76
+ console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
77
+ return undefined;
78
+ });
79
+ });
80
+ }
81
+ //TODO: abstract this
82
+ load(key, parser) {
83
+ return __awaiter(this, void 0, void 0, function* () {
84
+ console.info(p, "Loading", key);
85
+ const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
86
+ console.debug(p, url);
87
+ let req = {
88
+ url: url
89
+ };
90
+ parser.config(req);
91
+ // @ts-ignore
92
+ return yield Requests.genericRequest(req)
93
+ .then(response => {
94
+ if (response && response.data) {
95
+ try {
96
+ return parser.parse(response);
97
+ }
98
+ catch (e) {
99
+ console.warn("Parser failed to process response", response, e);
100
+ throw e;
101
+ }
102
+ }
103
+ return undefined;
104
+ })
105
+ .catch(err => {
106
+ if (err.response) {
107
+ let response = err.response;
108
+ if (response.status === 404) {
109
+ console.debug(p, key, "not found");
110
+ return undefined;
111
+ }
112
+ }
113
+ console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
114
+ return undefined;
115
+ });
116
+ });
117
+ }
118
+ assetBasePath(key) {
119
+ return `${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
120
+ }
121
+ }
122
+ //# sourceMappingURL=ArchiveAssetSource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ArchiveAssetSource.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveAssetSource.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ export interface ArchiveEntry {
2
+ filename: string;
3
+ directory: boolean;
4
+ getData(): Promise<Blob>;
5
+ }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=ArchiveEntry.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ArchiveEntry.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveEntry.ts"],"names":[],"mappings":""}
@@ -0,0 +1,4 @@
1
+ import { ArchiveEntry } from "./ArchiveEntry";
2
+ export interface ArchiveProxy {
3
+ getEntries(): Promise<ArchiveEntry[]>;
4
+ }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=ArchiveProxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ArchiveProxy.js","sourceRoot":"src/","sources":["assets/source/archive/ArchiveProxy.ts"],"names":[],"mappings":""}
@@ -0,0 +1,9 @@
1
+ import { ArchiveProxy } from "./ArchiveProxy";
2
+ import { ZipReader } from "@zip.js/zip.js";
3
+ import { ArchiveEntry } from "./ArchiveEntry";
4
+ export declare class BrowserArchiveProxy implements ArchiveProxy {
5
+ readonly _blob: Blob;
6
+ readonly _reader: ZipReader<Blob>;
7
+ constructor(blob: Blob);
8
+ getEntries(): Promise<ArchiveEntry[]>;
9
+ }
@@ -0,0 +1,30 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ import { BlobReader, BlobWriter, ZipReader } from "@zip.js/zip.js";
11
+ export class BrowserArchiveProxy {
12
+ constructor(blob) {
13
+ this._blob = blob;
14
+ this._reader = new ZipReader(new BlobReader(this._blob));
15
+ }
16
+ getEntries() {
17
+ return __awaiter(this, void 0, void 0, function* () {
18
+ return (yield this._reader.getEntries()).map(e => {
19
+ return {
20
+ filename: e.filename,
21
+ directory: e.directory,
22
+ getData() {
23
+ return e.getData(new BlobWriter());
24
+ }
25
+ };
26
+ });
27
+ });
28
+ }
29
+ }
30
+ //# sourceMappingURL=BrowserArchiveProxy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"BrowserArchiveProxy.js","sourceRoot":"src/","sources":["assets/source/archive/BrowserArchiveProxy.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGnE,MAAM,OAAO,mBAAmB;IAK5B,YAAY,IAAU;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7D,CAAC;IAEY,UAAU;;YACnB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;gBAC7C,OAAO;oBACH,QAAQ,EAAE,CAAC,CAAC,QAAQ;oBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,OAAO;wBACH,OAAO,CAAC,CAAC,OAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAA;oBACvC,CAAC;iBACJ,CAAA;YACL,CAAC,CAAC,CAAA;QACN,CAAC;KAAA;CAEJ"}
@@ -0,0 +1,4 @@
1
+ export * from "./ArchiveEntry";
2
+ export * from "./ArchiveProxy";
3
+ export * from "./BrowserArchiveProxy";
4
+ export * from "./ArchiveAssetSource";
@@ -0,0 +1,5 @@
1
+ export * from "./ArchiveEntry";
2
+ export * from "./ArchiveProxy";
3
+ export * from "./BrowserArchiveProxy";
4
+ export * from "./ArchiveAssetSource";
5
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/archive/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC"}
@@ -0,0 +1,4 @@
1
+ export * from './AssetSource';
2
+ export * from './HostedAssetSource';
3
+ export * from './parser';
4
+ export * from './archive';
@@ -0,0 +1,6 @@
1
+ // autogenerated
2
+ export * from './AssetSource';
3
+ export * from './HostedAssetSource';
4
+ export * from './parser';
5
+ export * from './archive';
6
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC"}
@@ -0,0 +1,9 @@
1
+ export declare enum AssetParser {
2
+ MODEL = "model",
3
+ BLOCKSTATE = "blockstate",
4
+ META = "meta",
5
+ NBT = "nbt",
6
+ IMAGE = "image",
7
+ LIST = "list",
8
+ JSON = "json"
9
+ }