Merge remote-tracking branch 'origin/master'

JannisX11 · Aug 25, 2024 · b39bd2f · b39bd2f
2 parents 6563fbe + 906a66a
commit b39bd2f
Show file tree

Hide file tree

Showing 52 changed files with 7,018 additions and 288 deletions.
diff --git a/plugins.json b/plugins.json
@@ -14,7 +14,7 @@
 		"author": "Titus Evans (SnaveSutit)",
 		"icon": "icon.svg",
 		"description": "A Blockbench plugin that makes complex animation a breeze in Minecraft: Java Edition.",
-		"version": "1.3.0",
+		"version": "1.4.0",
 		"min_version": "4.10.0",
 		"variant": "desktop",
 		"tags": ["Minecraft: Java Edition", "Animation", "Display Entities"],
@@ -207,7 +207,7 @@
 		"author": "Ewan Howell",
 		"description": "Load template Java Edition entity models for use with OptiFine CEM. Also includes an animation editor, so that you can create custom entity animations.",
 		"tags": ["Minecraft: Java Edition", "OptiFine", "Templates"],
-		"version": "8.2.0",
+		"version": "8.2.1",
 		"min_version": "4.10.0",
 		"variant": "both",
 		"creation_date": "2020-02-02",
@@ -365,7 +365,7 @@
 		"author": "Ewan Howell",
 		"description": "A collection of utilities to assist with resource pack creation.",
 		"tags": ["Minecraft: Java Edition", "Resource Packs", "Utilities"],
-		"version": "1.4.0",
+		"version": "1.5.0",
 		"min_version": "4.10.0",
 		"variant": "desktop",
 		"website": "https://ewanhowell.com/plugins/resource-pack-utilities/",
@@ -630,10 +630,10 @@
 	"wasd_controls": {
 		"title": "WASD Controls",
 		"icon": "sports_esports",
-		"author": "JannisX11",
+		"author": "JannisX11, caioraphael1",
 		"description": "Adds a WASD controlled viewport navigation mode",
 		"about": "The WASD mode can be enabled from the View menu.\nThe keys can be remapped in the keybindings menu.\nThe sensitivity can be changed in the settings under Preview, along with the movement plane.\nHold Control to move faster.",
-		"version": "1.1.0",
+		"version": "1.2.0",
 		"min_version": "4.3.0",
 		"variant": "both"
 	},
@@ -961,5 +961,23 @@
 		"dependencies": ["cem_template_loader"],
 		"creation_date": "2024-06-05",
 		"has_changelog": true
+	},
+	"pbr_preview": {
+		"title": "PBR Tools",
+		"author": "Jason J. Gardner",
+		"await_loading": true,
+		"creation_date": "2024-06-10",
+		"icon": "icon.png",
+		"description": "Create and view PBR materials in Blockbench. Export textures for Java and RenderDragon shaders.",
+		"has_changelog": true,
+		"website": "https://github.com/jasonjgardner/blockbench-plugins/",
+		"variant": "both",
+		"version": "1.1.0",
+		"tags": [
+			"Minecraft: Java Edition",
+			"Minecraft: Bedrock Edition",
+			"PBR"
+		],
+		"min_version": "4.10.4"
 	}
 }
diff --git a/plugins/animated_java/animated_java.js b/plugins/animated_java/animated_java.js
diff --git a/plugins/cem_template_loader/cem_template_loader.js b/plugins/cem_template_loader/cem_template_loader.js
@@ -41,7 +41,7 @@
       author: "Ewan Howell",
       description: description + " Also includes an animation editor, so that you can create custom entity animations.",
       tags: ["Minecraft: Java Edition", "OptiFine", "Templates"],
-      version: "8.2.0",
+      version: "8.2.1",
       min_version: "4.10.0",
       variant: "both",
       creation_date: "2020-02-02",
@@ -65,17 +65,26 @@
   async function fetchData(path, fallback) {
     try {
       const r = await fetch(`${root}/${path}`)
-      if (r.status !== 200 || r.headers.get("Content-Type")?.startsWith("text/html")) throw new Error
-      if (r.headers.get("Content-Type")?.startsWith("text/plain") || r.headers.get("Content-Type")?.startsWith("application/json")) return r.json()
+      if (!r.ok) throw new Error
+      if (r.headers.get("Content-Type")?.startsWith("text/html")) {
+        return
+      }
+      if (r.headers.get("Content-Type")?.startsWith("text/plain") || r.headers.get("Content-Type")?.startsWith("application/json")) {
+        return r.json()
+      }
       return r
     } catch {
       for (let x = connection.rootIndex + 1; x < connection.roots.length; x++) {
         connection.rootIndex = x
         try {
           const r = await fetch(`${connection.roots[x]}/${path}`)
-          if (r.status !== 200) throw new Error
+          if (r.status !== 200) {
+            throw new Error
+          }
           root = connection.roots[x]
-          if (r.headers.get("Content-Type")?.startsWith("text/plain") || r.headers.get("Content-Type")?.startsWith("application/json")) return r.json()
+          if (r.headers.get("Content-Type")?.startsWith("text/plain") || r.headers.get("Content-Type")?.startsWith("application/json")) {
+            return r.json()
+          }
           return r
         } catch {}
       }

diff --git a/plugins/cem_template_loader/changelog.json b/plugins/cem_template_loader/changelog.json
@@ -900,5 +900,18 @@
         ]
       }
     ]
+  },
+  "8.2.1": {
+    "title": "8.2.1",
+    "date": "2024-08-25",
+    "author": "Ewan Howell",
+    "categories": [
+      {
+        "title": "Bug Fixes",
+        "list": [
+          "Loading a template model that is missing its vanilla texture will no longer trigger the connction error state"
+        ]
+      }
+    ]
   }
 }