Merge pull request #50 from TibiNonEst/bust

Add bust rendering
nodecraft · Mar 21, 2022 · 879ac58 · 879ac58
2 parents de7931b + 4931a5f
commit 879ac58
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -26,6 +26,7 @@ enum RenderType {
     Helm,
     Cube,
     Body,
+    Bust,
     Cape,
 }
 
@@ -44,6 +45,9 @@ impl RenderType {
             RenderType::Cube   => img.render_cube(true, size),
             RenderType::Body   => img.render_body(options)
                 .resize(size, size * 2, image::imageops::FilterType::Nearest),
+            RenderType::Bust   => img.render_body(options)
+                .crop(0, 0, 16, 16)
+                .resize(size, size, image::imageops::FilterType::Nearest),
             RenderType::Cape   => img.get_cape()
                 .resize(size, size, image::imageops::FilterType::Nearest),
         }
@@ -56,6 +60,7 @@ fn what_to_render_type(what: String) -> Option<RenderType> {
         "helm"   => Some(RenderType::Helm),
         "cube"   => Some(RenderType::Cube),
         "body"   => Some(RenderType::Body),
+        "bust"   => Some(RenderType::Bust),
         "cape"   => Some(RenderType::Cape),
         _        => None
     }

diff --git a/website/index.html b/website/index.html
@@ -132,6 +132,20 @@ <h3>Fetch a player's body</h3>
                 </code>
                 <img src="/armor/body/Reply/32" class="render-pixelate" alt="Default example" width="32" height="64">
             </div>
+
+            <h3>Fetch a player's bust</h3>
+            <div class="example">
+                <code>
+                    GET https://crafthead.net/bust/6a085b2c19fb4986b453231aa942bbec
+                </code>
+                <img src="/bust/6a085b2c19fb4986b453231aa942bbec/32" class="render-pixelate" alt="Default example" width="32" height="32">
+            </div>
+            <div class="example">
+                <code>
+                    GET https://crafthead.net/armor/bust/Reply
+                </code>
+                <img src="/armor/bust/Reply/32" class="render-pixelate" alt="Default example" width="32" height="32">
+            </div>
 
             <h3>Fetch a player's skin</h3>
             <div class="example">

diff --git a/worker/index.ts b/worker/index.ts
@@ -99,7 +99,8 @@ async function processRequest(skinService: MojangRequestService, interpreted: Cr
         case RequestedKind.Avatar:
         case RequestedKind.Helm:
         case RequestedKind.Cube:
-        case RequestedKind.Body: {
+        case RequestedKind.Body:
+        case RequestedKind.Bust: {
             const skin = await skinService.retrieveSkin(interpreted, gatherer);
             return renderImage(skin, interpreted);
         }
@@ -144,6 +145,9 @@ async function renderImage(skin: Response, request: CraftheadRequest): Promise<R
         case RequestedKind.Body:
             which = "body";
             break;
+        case RequestedKind.Bust:
+            which = "bust";
+            break;
         case RequestedKind.Cape:
             which = "cape";
             break;

diff --git a/worker/request.ts b/worker/request.ts
@@ -5,6 +5,7 @@ export enum RequestedKind {
     Helm,
     Cube,
     Body,
+    Bust,
     Cape,
     Profile
 }
@@ -40,6 +41,8 @@ function stringKindToRequestedKind(kind: string): RequestedKind | null {
             return RequestedKind.Helm;
         case "body":
             return RequestedKind.Body;
+        case "bust":
+            return RequestedKind.Bust;
         case "cape":
             return RequestedKind.Cape;
         case "profile":
@@ -58,7 +61,7 @@ export function interpretRequest(request: Request): CraftheadRequest | null {
     let armored = false
     let sliceAmt = 1
 
-    if (url.pathname.includes("armor/body")) {
+    if (url.pathname.includes("armor/body") || url.pathname.includes("armor/bust")) {
         armored = true
         sliceAmt = 2
     }

diff --git a/worker/util/cache-bust.ts b/worker/util/cache-bust.ts
@@ -1 +1 @@
-export default 4;
+export default 5;