1.4.12 | add cape params to embed

InventivetalentDev · Apr 16, 2023 · f037d04 · f037d04
1 parent 39828b3
commit f037d04
Show file tree

Hide file tree

Showing 14 changed files with 493 additions and 408 deletions.
diff --git a/dist/all.js b/dist/all.js
diff --git a/dist/all.min.js b/dist/all.min.js
diff --git a/dist/entity.js b/dist/entity.js
diff --git a/dist/entity.min.js b/dist/entity.min.js
diff --git a/dist/gui.js b/dist/gui.js
diff --git a/dist/gui.min.js b/dist/gui.min.js
diff --git a/dist/model.js b/dist/model.js
diff --git a/dist/model.min.js b/dist/model.min.js
diff --git a/dist/skin.js b/dist/skin.js
diff --git a/dist/skin.min.js b/dist/skin.min.js
diff --git a/embed/skin/index.html b/embed/skin/index.html
@@ -48,6 +48,11 @@
             skin.data           Skin Data (Base64)
             skin.name           Skin Username
 
+            cape                Set this param to enable capes - Cape type from capes.dev or direct link to cape data
+            cape.user           Cape username / uuid
+            cape.url            Cape URL
+            cape.data           Cape Data (Base64)
+
             controls            enable/disable controls
             controls.zoom       enable/disable zoom controls
             controls.rotate     enable/disable rotation controls
@@ -81,6 +86,16 @@
                     return;
                 }
 
+                if (params.get("cape")) {
+                    renderParams.cape = params.get("cape");
+                } else if (params.get("cape.user")) {
+                    renderParams.capeUser = params.get("cape.user");
+                } else if (params.get("cape.url")) {
+                    renderParams.capeUrl = params.get("cape.url")
+                } else if (params.get("cape.data")) {
+                    renderParams.capeData = params.get("cape.data");
+                }
+
                 if (params.get("skin.slim")) {
                     renderParams.slim = params.get("skin.slim") === "true";
                 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minerender",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "",
   "main": "src/combined/index.js",
   "scripts": {

diff --git a/src/skin/index.js b/src/skin/index.js
@@ -112,7 +112,7 @@ class SkinRender extends Render {
         skinRender._skinImage.crossOrigin = "anonymous";
         skinRender._capeImage = new Image();
         skinRender._capeImage.crossOrigin = "anonymous";
-        let hasCape = texture.cape !== undefined || texture.capeUrl !== undefined || texture.capeData !== undefined || texture.mineskin !== undefined;
+        let hasCape = texture.cape !== undefined || texture.capeUser !== undefined || texture.capeUrl !== undefined || texture.capeData !== undefined || texture.mineskin !== undefined;
         let slim = false;
         let skinLoaded = false;
         let capeLoaded = false;
@@ -270,10 +270,16 @@ class SkinRender extends Render {
                 if (texture.cape.length > 36) { // Likely either a cape ID or URL
                     let capeDataUrl = texture.cape.startsWith("http") ? texture.cape : "https://api.capes.dev/get/" + texture.cape;
                     getJSON(capeDataUrl, function (err, data) {
-                        if (err) return console.log(err);
+                        if (err) {
+                            console.log("failed to get capes.dev")
+                            skinRender._capeImage.onload(); // avoid getting stuck
+                            return console.log(err);
+                        }
                         if (data.exists) {
                             texture._capeType = data.type;
                             skinRender._capeImage.src = data.imageUrls.base.full;
+                        } else {
+                            skinRender._capeImage.onload(); // avoid getting stuck
                         }
                     })
                 } else { // Type
@@ -290,11 +296,17 @@ class SkinRender extends Render {
                     capeLoadUrl += "/" + texture.cape; // append type
 
                     getJSON(capeLoadUrl, function (err, data) {
-                        if (err) return console.log(err);
+                        if (err) {
+                            console.log("failed to get capes.dev")
+                            skinRender._capeImage.onload(); // avoid getting stuck
+                            return console.log(err);
+                        }
                         // Should be a single object of the requested type
                         if (data.exists) {
                             texture._capeType = data.type;
                             skinRender._capeImage.src = data.imageUrls.base.full;
+                        } else {
+                            skinRender._capeImage.onload(); // avoid getting stuck
                         }
                     })
                 }