From 7d6314051de2b2b9f0b39d72c3124921ae367ebb Mon Sep 17 00:00:00 2001
From: Ozzy <Mohamed.Osman@derivco.co.za>
Date: Tue, 25 Mar 2025 17:04:02 +0200
Subject: [PATCH 01/12] fix(jumpgate load): allows jumpgate to load the main
 parts of the script

---
 js/5etools-main.js     | 10 ++++---
 js/5etools-template.js | 40 ++++++++++++++------------
 js/base-chat.js        |  5 ++--
 js/base-engine.js      | 65 +++++++++++++++++++++++-------------------
 js/base-menu.js        | 26 +++++++++--------
 js/base-weather.js     |  4 +--
 6 files changed, 81 insertions(+), 69 deletions(-)

diff --git a/js/5etools-main.js b/js/5etools-main.js
index 28cb9f0f..86a88d92 100644
--- a/js/5etools-main.js
+++ b/js/5etools-main.js
@@ -313,7 +313,7 @@ const betteR205etoolsMain = function () {
 		{name: "bestiary index", url: `${MONSTER_DATA_DIR}index.json`},
 		{name: "bestiary fluff index", url: `${MONSTER_DATA_DIR}fluff-index.json`},
 		{name: "bestiary metadata", url: `${MONSTER_DATA_DIR}legendarygroups.json`},
-		{name: "adventures index", url: `${DATA_URL}adventures.json`},
+		// {name: "adventures index", url: `${DATA_URL}adventures.json`},  // error retrieving from 5e.tools
 		{name: "base items", url: `${DATA_URL}items-base.json`},
 		{name: "item modifiers", url: `${DATA_URL}roll20-items.json`},
 	];
@@ -906,7 +906,8 @@ const betteR205etoolsMain = function () {
 	d20plus.setSheet = function () {
 		d20plus.ut.log("Switched Character Sheet Template");
 		d20plus.sheet = "ogl";
-		if (window.is_gm && (!d20.journal.customSheets || !d20.journal.customSheets)) {
+		const sheets = d20.journal.characterSheetsManager.getAllSheets();
+		if (window.is_gm && (!sheets.length > 0)) {
 			const $body = $(`body`);
 			$body.addClass("ve-nosheet__body");
 			const $btnClose = $(`<button class="btn btn-danger ve-nosheet__btn-close">X</button>`)
@@ -929,8 +930,9 @@ const betteR205etoolsMain = function () {
 			}));
 			throw new Error("No character sheet selected!");
 		}
-		if (d20.journal.customSheets.layouthtml.indexOf("shaped_d20") > 0) d20plus.sheet = "shaped";
-		if (d20.journal.customSheets.layouthtml.indexOf("DnD5e_Character_Sheet") > 0) d20plus.sheet = "community";
+		const firstSheet = sheets.first();
+		if (firstSheet.layouthtml.indexOf("shaped_d20") > 0) d20plus.sheet = "shaped";
+		if (firstSheet.layouthtml.indexOf("DnD5e_Character_Sheet") > 0) d20plus.sheet = "community";
 		d20plus.ut.log(`Switched Character Sheet Template to ${d20plus.sheet}`);
 	};
 
diff --git a/js/5etools-template.js b/js/5etools-template.js
index f24146dd..e07a3903 100644
--- a/js/5etools-template.js
+++ b/js/5etools-template.js
@@ -93,27 +93,29 @@ const d20plusTemplate = function () {
 	}
 
 	d20plus.template5e._populateAdventuresDropdown = function () {
-		const defaultAdvUrl = d20plus.formSrcUrl(ADVENTURE_DATA_DIR, "adventure-lmop.json");
-		const $iptUrl = $("#import-adventures-url");
-		$iptUrl.val(defaultAdvUrl);
-		$iptUrl.data("id", "lmop");
-		const $sel = $("#button-adventures-select");
-		adventureMetadata.adventure.forEach(a => {
+		if (adventureMetadata.adventure){
+			const defaultAdvUrl = d20plus.formSrcUrl(ADVENTURE_DATA_DIR, "adventure-lmop.json");
+			const $iptUrl = $("#import-adventures-url");
+			$iptUrl.val(defaultAdvUrl);
+			$iptUrl.data("id", "lmop");
+			const $sel = $("#button-adventures-select");
+			adventureMetadata.adventure.forEach(a => {
+				$sel.append($("<option>", {
+					value: d20plus.formSrcUrl(ADVENTURE_DATA_DIR, `adventure-${a.id.toLowerCase()}.json|${a.id}`),
+					text: a.name,
+				}));
+			});
 			$sel.append($("<option>", {
-				value: d20plus.formSrcUrl(ADVENTURE_DATA_DIR, `adventure-${a.id.toLowerCase()}.json|${a.id}`),
-				text: a.name,
+				value: "",
+				text: "Custom",
 			}));
-		});
-		$sel.append($("<option>", {
-			value: "",
-			text: "Custom",
-		}));
-		$sel.val(defaultAdvUrl);
-		$sel.change(() => {
-			const [url, id] = $sel.val().split("|");
-			$($iptUrl).val(url);
-			$iptUrl.data("id", id);
-		});
+			$sel.val(defaultAdvUrl);
+			$sel.change(() => {
+				const [url, id] = $sel.val().split("|");
+				$($iptUrl).val(url);
+				$iptUrl.data("id", id);
+			});
+		}
 	}
 
 	d20plus.template5e.addCustomHTML = function () {
diff --git a/js/base-chat.js b/js/base-chat.js
index 0cc582a1..5c28dbf1 100644
--- a/js/base-chat.js
+++ b/js/base-chat.js
@@ -72,14 +72,15 @@ function baseChat () {
 
 	function availableLanguages (charId) {
 		const char = d20.Campaign.characters.get(charId);
-		const langId = d20.journal.customSheets.availableAttributes.repeating_proficiencies_prof_type;
+		const firstCharSheet = d20.journal.characterSheetsManager.getAllSheets().first();
+		const langId = firstCharSheet.availableAttributes.repeating_proficiencies_prof_type;
 		if (!char) return [];
 		if (!char.attribs.length) {
 			const fetched = d20plus.ut.fetchCharAttribs(char);
 			fetched.then(d20plus.chat.refreshLanguages);
 		}
 		// roll20 OGL sheet stores languages differently compared to other traits
-		// by default, they don't have corresponging "proficiency type" attribute
+		// by default, they don't have corresponding "proficiency type" attribute
 		// however, if you create a trait and THEN change it to be language, it will have LOCALIZED "language" proficiency type
 		// so to find all languages, we must filter out other named traits, except for the traits named "language" or "(localized word for LANGUAGE)"
 		const traits = char.attribs.models
diff --git a/js/base-engine.js b/js/base-engine.js
index d9dc4bdc..29735ebf 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -65,8 +65,10 @@ function d20plusEngine () {
 
 		d20plus.mod.overwriteStatusEffects();
 
-		d20.engine.canvas.off("object:added");
-		d20.engine.canvas.on("object:added", d20plus.mod.overwriteStatusEffects);
+		if (d20.engine.canvas){
+            d20.engine.canvas.off("object:added");
+            d20.engine.canvas.on("object:added", d20plus.mod.overwriteStatusEffects);
+        }
 
 		// the holy trinity
 		// d20.engine.canvas.on("object:removed", () => console.log("added"));
@@ -528,33 +530,35 @@ function d20plusEngine () {
 
 	// needs to be called after `enhanceMeasureTool()`
 	d20plus.engine.enhanceMouseMove = () => {
-		// add missing vars
-		var i = d20.engine.canvas;
-
-		// Roll20 bug (present as of 2019-5-25) workaround
-		//   when box-selecting + moving tokens, the "object:moving" event throws an exception
-		//   try-catch-ignore this, because it's extremely annoying
-		const cachedFire = i.fire.bind(i);
-		i.fire = function (namespace, opts) {
-			if (namespace === "object:moving") {
-				try {
+		if (d20.engine.canvas){
+			// add missing vars
+			var i = d20.engine.canvas;
+
+			// Roll20 bug (present as of 2019-5-25) workaround
+			//   when box-selecting + moving tokens, the "object:moving" event throws an exception
+			//   try-catch-ignore this, because it's extremely annoying
+			const cachedFire = i.fire.bind(i);
+			i.fire = function (namespace, opts) {
+				if (namespace === "object:moving") {
+					try {
+						cachedFire(namespace, opts);
+					} catch (e) {}
+				} else {
 					cachedFire(namespace, opts);
-				} catch (e) {}
-			} else {
-				cachedFire(namespace, opts);
-			}
-		};
+				}
+			};
 
-		const I = d20plus.overwrites.canvasHandlerMove
+			const I = d20plus.overwrites.canvasHandlerMove
 
-		if (FINAL_CANVAS_MOUSEMOVE_LIST.length) {
-			FINAL_CANVAS_MOUSEMOVE = (FINAL_CANVAS_MOUSEMOVE_LIST.find(it => it.on === d20.engine.final_canvas) || {}).listener;
-		}
+			if (FINAL_CANVAS_MOUSEMOVE_LIST.length) {
+				FINAL_CANVAS_MOUSEMOVE = (FINAL_CANVAS_MOUSEMOVE_LIST.find(it => it.on === d20.engine.final_canvas) || {}).listener;
+			}
 
-		if (FINAL_CANVAS_MOUSEMOVE) {
-			d20plus.ut.log("Enhancing mouse move");
-			d20.engine.final_canvas.removeEventListener("mousemove", FINAL_CANVAS_MOUSEMOVE);
-			d20.engine.final_canvas.addEventListener("mousemove", I);
+			if (FINAL_CANVAS_MOUSEMOVE) {
+				d20plus.ut.log("Enhancing mouse move");
+				d20.engine.final_canvas.removeEventListener("mousemove", FINAL_CANVAS_MOUSEMOVE);
+				d20.engine.final_canvas.addEventListener("mousemove", I);
+			}
 		}
 	};
 
@@ -748,11 +752,12 @@ function d20plusEngine () {
 				`);
 			}
 		}
-
-		d20.engine.canvas._renderAll = _.bind(d20plus.mod.renderAll, d20.engine.canvas);
-		d20.engine.canvas.sortTokens = _.bind(d20plus.mod.sortTokens, d20.engine.canvas);
-		d20.engine.canvas.drawAnyLayer = _.bind(d20plus.mod.drawAnyLayer, d20.engine.canvas);
-		d20.engine.canvas.drawTokensWithoutAuras = _.bind(d20plus.mod.drawTokensWithoutAuras, d20.engine.canvas);
+		if (d20.engine.canvas){}
+			d20.engine.canvas._renderAll = _.bind(d20plus.mod.renderAll, d20.engine.canvas);
+			d20.engine.canvas.sortTokens = _.bind(d20plus.mod.sortTokens, d20.engine.canvas);
+			d20.engine.canvas.drawAnyLayer = _.bind(d20plus.mod.drawAnyLayer, d20.engine.canvas);
+			d20.engine.canvas.drawTokensWithoutAuras = _.bind(d20plus.mod.drawTokensWithoutAuras, d20.engine.canvas);
+		}
 	};
 
 	d20plus.engine.removeLinkConfirmation = function () {
diff --git a/js/base-menu.js b/js/base-menu.js
index 1873ff8d..a7b1161f 100644
--- a/js/base-menu.js
+++ b/js/base-menu.js
@@ -7,17 +7,19 @@ function baseMenu () {
 
 		const getTokenWhisperPart = () => d20plus.cfg.getOrDefault("token", "massRollWhisperName") ? "/w gm Rolling for @{selected|token_name}...\n" : "";
 
-		Mousetrap.bind("b b", function () { // back on layer
-			const n = d20plus.engine.getSelectedToMove();
-			d20plus.engine.backwardOneLayer(n);
-			return false;
-		});
-
-		Mousetrap.bind("b f", function () { // forward one layer
-			const n = d20plus.engine.getSelectedToMove();
-			d20plus.engine.forwardOneLayer(n);
-			return false;
-		});
+		if (typeof(Mousetrap) !== "undefined"){
+			Mousetrap.bind("b b", function () { // back on layer
+				const n = d20plus.engine.getSelectedToMove();
+				d20plus.engine.backwardOneLayer(n);
+				return false;
+			});
+
+			Mousetrap.bind("b f", function () { // forward one layer
+				const n = d20plus.engine.getSelectedToMove();
+				d20plus.engine.forwardOneLayer(n);
+				return false;
+			});
+		}
 
 		/**
 		 * @param token A token.
@@ -82,7 +84,7 @@ function baseMenu () {
 			var d = t.height()
 				, h = t.width()
 				, p = {};
-			
+
 			// BEGIN MOD
 			// This block is pasted from newer version of roll20 Menu code, with appropriate changes to vars etc
 			const r20ping = (u,i)=>{
diff --git a/js/base-weather.js b/js/base-weather.js
index fd420888..67d8f58b 100644
--- a/js/base-weather.js
+++ b/js/base-weather.js
@@ -77,8 +77,8 @@ function baseWeather () {
 			cachedSetCanvasSize(e, n);
 		};
 
-		cv.width = cvBuf.width = d20.engine.canvas.width;
-		cv.height = cvBuf.height = d20.engine.canvas.height;
+		cv.width = cvBuf.width = d20.engine.canvasWidth;
+		cv.height = cvBuf.height = d20.engine.canvasHeight;
 
 		const ctx = cv.getContext("2d");
 

From 32ca74632965ac5a0550434a2ee7b5ddf60f893b Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Tue, 1 Apr 2025 19:47:27 +0200
Subject: [PATCH 02/12] fix: syntax error

---
 js/base-engine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/base-engine.js b/js/base-engine.js
index 29735ebf..a73652c3 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -752,7 +752,7 @@ function d20plusEngine () {
 				`);
 			}
 		}
-		if (d20.engine.canvas){}
+		if (d20.engine.canvas){
 			d20.engine.canvas._renderAll = _.bind(d20plus.mod.renderAll, d20.engine.canvas);
 			d20.engine.canvas.sortTokens = _.bind(d20plus.mod.sortTokens, d20.engine.canvas);
 			d20.engine.canvas.drawAnyLayer = _.bind(d20plus.mod.drawAnyLayer, d20.engine.canvas);

From c4b2558173d0ca9a4c4bc0dc1aaab95ccbd925bb Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Tue, 1 Apr 2025 22:12:57 +0200
Subject: [PATCH 03/12] fix: keep compatible with legacy games

---
 dist/betteR20-5etools.user.js | 182 +++++++++++++++++-----------------
 dist/betteR20-core.user.js    | 178 ++++++++++++++++-----------------
 js/5etools-main.js            |   6 +-
 js/base-chat.js               |   2 +-
 js/base-engine.js             |  15 ++-
 js/base-remote-libre.js       |   3 +
 js/base.js                    |  13 ++-
 7 files changed, 204 insertions(+), 195 deletions(-)

diff --git a/dist/betteR20-5etools.user.js b/dist/betteR20-5etools.user.js
index 9634c7d2..abcdf14c 100644
--- a/dist/betteR20-5etools.user.js
+++ b/dist/betteR20-5etools.user.js
@@ -1300,7 +1300,7 @@ function baseUtil () {
 			<div class="${classname}">
 				<img src="" class="userscript-b20img" style="content: unset; width:30px;position: relative;top: 10px;float: right;">
 				<h1 style="display: inline-block;line-height: 25px;margin-top: 5px; font-size: 22px;">
-					betteR20 
+					betteR20
 					<span style=" font-size: 13px ; font-weight: normal">by 5etools</span>
 					<p style="font-size: 11px;line-height: 15px;font-family: monospace;color: rgb(32, 194, 14);">VTTES ${vttv} detected<br>${b20v} loaded</p>
 				</h1>
@@ -5183,7 +5183,7 @@ function baseToolUnlock () {
 					<button class="btn" name="btn-refresh">Refresh</button>
 				</p>
 				<p class="split">
-					<label><input type="checkbox" title="Select all" name="cb-all"> Select All</label> 
+					<label><input type="checkbox" title="Select all" name="cb-all"> Select All</label>
 					<button class="btn" name="btn-unlock">Unlock Selected</button>
 				</p>
 				<div id="token-unlocker-list-container">
@@ -8797,7 +8797,7 @@ function baseToolTable () {
 		<br>
 		<button class="btn start-import">Import</button>
 		</div>
-		
+
 		<div id="d20plus-tables-clipboard" title="Paste from Clipboard"></div>
 		<div id="d20plus-tables-create" title="Create Your Own Table"></div>
 		`,
@@ -8845,7 +8845,7 @@ function baseToolTable () {
 "!import-table --Table-Name --show
 !import-table-item --Table-Name --Item One --1 --
 !import-table-item --Table-Name --Item Two --1 --
-!import-table-item --Table-Name --Item Three (weighted more heavily) --5 --" 
+!import-table-item --Table-Name --Item Three (weighted more heavily) --5 --"
 					class="table-import-textarea">`).appendTo($wrpClip);
 					const $btnCheck = $(`<button class="btn" style="margin-right: 5px;">Check if Valid</button>`).on("click", () => {
 						const error = validatePaste($iptClip.val());
@@ -14179,7 +14179,7 @@ function baseMenu () {
 			var d = t.height()
 				, h = t.width()
 				, p = {};
-			
+
 			// BEGIN MOD
 			// This block is pasted from newer version of roll20 Menu code, with appropriate changes to vars etc
 			const r20ping = (u,i)=>{
@@ -18031,7 +18031,7 @@ function d20plusMod () {
 	d20plus.mod.setAlpha = function (layer) {
 		const l = ["map", "walls", "weather", "background", "objects", "foreground", "gmlayer"];
 		const o = ["background", "objects", "foreground"];
-		return !window.is_gm 
+		return !window.is_gm
 			|| (o.includes(layer) && o.includes(window.currentEditingLayer))
 			|| (l.indexOf(window.currentEditingLayer) >= l.indexOf(layer)
 				&& !(o.includes(layer) && window.currentEditingLayer === "gmlayer"))
@@ -77919,11 +77919,11 @@ EXT_LIB_API_SCRIPTS.push((function lib_script_23 () {
 /**
  * This is a small library for (mostly 2D) vector mathematics.
  * Internally, the vectors used by this library are simple arrays of numbers.
- * The functions provided by this library do not alter the input vectors, 
+ * The functions provided by this library do not alter the input vectors,
  * treating each vector as an immutable object.
  */
 var VecMath = (function() {
-    
+
     /**
      * Adds two vectors.
      * @param {vec} a
@@ -77937,8 +77937,8 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
+
+
     /**
      * Creates a cloned copy of a vector.
      * @param {vec} v
@@ -77951,10 +77951,10 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
-    /** 
-     * Returns an array representing the cross product of two 3D vectors. 
+
+
+    /**
+     * Returns an array representing the cross product of two 3D vectors.
      * @param {vec3} a
      * @param {vec3} b
      * @return {vec3}
@@ -77965,9 +77965,9 @@ var VecMath = (function() {
         var z = a[0]*b[1] - a[1]*b[0];
         return [x, y, z];
     };
-    
-    
-    /** 
+
+
+    /**
      * Returns the degree of a vector - the number of dimensions it has.
      * @param {vec} vector
      * @return {int}
@@ -77975,8 +77975,8 @@ var VecMath = (function() {
     var degree = function(vector) {
         return vector.length;
     };
-    
-    
+
+
     /**
      * Computes the distance between two points.
      * @param {vec} pt1
@@ -77987,10 +77987,10 @@ var VecMath = (function() {
         var v = vec(pt1, pt2);
         return length(v);
     };
-    
-    
-    /** 
-     * Returns the dot product of two vectors. 
+
+
+    /**
+     * Returns the dot product of two vectors.
      * @param {vec} a
      * @param {vec} b
      * @return {number}
@@ -78002,21 +78002,21 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
+
+
     /**
      * Tests if two vectors are equal.
      * @param {vec} a
      * @param {vec} b
-     * @param {float} [tolerance] A tolerance threshold for comparing vector 
-     *                            components.  
-     * @return {boolean} true iff the each of the vectors' corresponding 
+     * @param {float} [tolerance] A tolerance threshold for comparing vector
+     *                            components.
+     * @return {boolean} true iff the each of the vectors' corresponding
      *                  components are equal.
      */
     var equal = function(a, b, tolerance) {
         if(a.length != b.length)
             return false;
-        
+
         for(var i=0; i<a.length; i++) {
             if(tolerance !== undefined) {
                 if(Math.abs(a[i] - b[i]) > tolerance) {
@@ -78028,11 +78028,11 @@ var VecMath = (function() {
         }
         return true;
     };
-    
-    
-    
-    /** 
-     * Returns the length of a vector. 
+
+
+
+    /**
+     * Returns the length of a vector.
      * @param {vec} vector
      * @return {number}
      */
@@ -78043,9 +78043,9 @@ var VecMath = (function() {
         }
         return Math.sqrt(length);
     };
-    
-    
-    
+
+
+
     /**
      * Computes the normalization of a vector - its unit vector.
      * @param {vec} v
@@ -78053,16 +78053,16 @@ var VecMath = (function() {
      */
     var normalize = function(v) {
         var vHat = [];
-        
+
         var vLength = length(v);
         for(var i=0; i < v.length; i++) {
             vHat[i] = v[i]/vLength;
         }
-        
+
         return vHat;
     };
-    
-    
+
+
     /**
      * Computes the projection of vector b onto vector a.
      * @param {vec} a
@@ -78072,13 +78072,13 @@ var VecMath = (function() {
     var projection = function(a, b) {
         var scalar = scalarProjection(a, b);
         var aHat = normalize(a);
-        
+
         return scale(aHat, scalar);
     };
-    
-    
-    /** 
-     * Computes the distance from a point to an infinitely stretching line. 
+
+
+    /**
+     * Computes the distance from a point to an infinitely stretching line.
      * Works for either 2D or 3D points.
      * @param {vec2 || vec3} pt
      * @param {vec2 || vec3} linePt1   A point on the line.
@@ -78088,21 +78088,21 @@ var VecMath = (function() {
     var ptLineDist = function(pt, linePt1, linePt2) {
         var a = vec(linePt1, linePt2);
         var b = vec(linePt1, pt);
-        
+
         // Make 2D vectors 3D to compute the cross product.
         if(!a[2])
             a[2] = 0;
         if(!b[2])
             b[2] = 0;
-        
+
         var aHat = normalize(a);
         var aHatCrossB = cross(aHat, b);
         return length(aHatCrossB);
     };
-    
-    
-    /** 
-     * Computes the distance from a point to a line segment. 
+
+
+    /**
+     * Computes the distance from a point to a line segment.
      * Works for either 2D or 3D points.
      * @param {vec2 || vec3} pt
      * @param {vec2 || vec3} linePt1   The start point of the segment.
@@ -78113,24 +78113,24 @@ var VecMath = (function() {
         var a = vec(linePt1, linePt2);
         var b = vec(linePt1, pt);
         var aDotb = dot(a,b);
-        
+
         // Is pt behind linePt1?
         if(aDotb < 0) {
             return length(vec(pt, linePt1));
         }
-        
+
         // Is pt after linePt2?
         else if(aDotb > dot(a,a)) {
             return length(vec(pt, linePt2));
         }
-        
+
         // Pt must be between linePt1 and linePt2.
         else {
             return ptLineDist(pt, linePt1, linePt2);
         }
     };
-    
-    
+
+
     /**
      * Computes the scalar projection of b onto a.
      * @param {vec2} a
@@ -78140,12 +78140,12 @@ var VecMath = (function() {
     var scalarProjection = function(a, b) {
         var aDotB = dot(a, b);
         var aLength = length(a);
-        
+
         return aDotB/aLength;
     };
-    
-    
-    
+
+
+
     /**
      * Computes a scaled vector.
      * @param {vec2} v
@@ -78154,15 +78154,15 @@ var VecMath = (function() {
      */
     var scale = function(v, scalar) {
         var result = [];
-        
+
         for(var i=0; i<v.length; i++) {
             result[i] = v[i]*scalar;
         }
         return result;
     };
-    
-    
-    /** 
+
+
+    /**
      * Computes the difference of two vectors.
      * @param {vec} a
      * @param {vec} b
@@ -78175,10 +78175,10 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
-    /** 
-     * Returns the vector from pt1 to pt2. 
+
+
+    /**
+     * Returns the vector from pt1 to pt2.
      * @param {vec} pt1
      * @param {vec} pt2
      * @return {vec}
@@ -78188,11 +78188,11 @@ var VecMath = (function() {
         for(var i=0; i<pt1.length; i++) {
             result.push( pt2[i] - pt1[i] );
         }
-        
+
         return result;
     };
-    
-    
+
+
     // The exposed API.
     return {
         add: add,
@@ -78229,12 +78229,12 @@ var VecMath = (function() {
             log("UNIT TEST FAILED: " + failMsg);
         }
     };
-    
-    
+
+
     var a = [1, 5];
     var b = [17, -8];
-    
-    
+
+
     // VecMath.equal
     assert(
         VecMath.equal([2, -3, 4, 8], [2, -3, 4, 8]),
@@ -78256,7 +78256,7 @@ var VecMath = (function() {
         !VecMath.equal([1,2], [1,2,3]),
         "!VecMath.equal([1,2], [1,2,3])"
     );
-    
+
     // VecMath.add
     assert(
         VecMath.equal(
@@ -78272,7 +78272,7 @@ var VecMath = (function() {
         ),
         "VecMath.add([0, 0, 0], [1, 2, 3]) equals [1, 2, 3]"
     );
-    
+
     // VecMath.clone
     assert(
         VecMath.equal( VecMath.clone(a), a),
@@ -78282,7 +78282,7 @@ var VecMath = (function() {
         VecMath.clone(a) != a,
         "VecMath.clone(a) != a"
     );
-    
+
     // VecMath.cross
     assert(
         VecMath.equal(
@@ -78298,7 +78298,7 @@ var VecMath = (function() {
         ),
         "VecMath.cross([1,2,3], [-10, 3, 5]) equals [1, -35, 23]"
     );
-    
+
     // VecMath.degree
     assert(
         VecMath.degree([1,2,3]) == 3,
@@ -78312,7 +78312,7 @@ var VecMath = (function() {
         VecMath.degree([1,1,1,1,1]) == 5,
         "VecMath.degree([1,1,1,1,1]) == 5"
     );
-    
+
     // VecMath.dist
     assert(
         VecMath.dist([1,2], [4,6]) == 5,
@@ -78322,7 +78322,7 @@ var VecMath = (function() {
         VecMath.dist([3,4], [-3, -4]) == 10,
         "VecMath.dist([3,4], [-3, -4]) == 10"
     );
-    
+
     // VecMath.dot
     assert(
         VecMath.dot([1, 2, 3], [-1, -2, -3]) == -14,
@@ -78344,7 +78344,7 @@ var VecMath = (function() {
         VecMath.dot([1,0], [1, 0]) == 1,
         "VecMath.dot([1,0], [1, 0]) == 1"
     );
-    
+
     // VecMath.length
     assert(
         VecMath.length([1,0,0]) == 1,
@@ -78358,7 +78358,7 @@ var VecMath = (function() {
         VecMath.length([-3, 0, 4, 0]) == 5,
         "VecMath.length([-3, 0, 4, 0]) == 5"
     );
-    
+
     // VecMath.normalize
     assert(
         VecMath.equal(
@@ -78374,7 +78374,7 @@ var VecMath = (function() {
         ),
         "VecMath.normalize([0,-3]) equals [0,-1]"
     );
-    
+
     // VecMath.projection
     assert(
         VecMath.equal(
@@ -78391,7 +78391,7 @@ var VecMath = (function() {
         ),
         "VecMath.projection([5,5], [0, 6]) equals [3, 3]"
     );
-    
+
     // VecMath.ptLineDist
     assert(
         VecMath.ptLineDist([0,3], [-100,5], [100,5]) == 2,
@@ -78401,7 +78401,7 @@ var VecMath = (function() {
         VecMath.ptLineDist([3,0], [5,5], [5,10]) == 2,
         "VecMath.ptLineDist([3,0], [5,5], [5,10]) == 2"
     );
-    
+
     // VecMath.ptSegDist
     assert(
         VecMath.ptSegDist([0,3], [-5,5], [5,5]) == 2,
@@ -78419,13 +78419,13 @@ var VecMath = (function() {
         VecMath.ptSegDist([-2,-4], [1,0], [5,0]) == 5,
         "VecMath.ptSegDist([-2,-4], [1,0], [5,0]) == 5"
     );
-    
+
     // VecMath.scalarProjection
     assert(
         VecMath.scalarProjection([5,0], [3, 4]) == 3,
         "VecMath.scalarProjection([5,0], [3, 4]) == 3"
     );
-    
+
     // VecMath.scale
     assert(
         VecMath.equal(
@@ -78434,7 +78434,7 @@ var VecMath = (function() {
         ),
         "VecMath.scale([1,-2,3], 6) equals [6, -12, 18]"
     );
-    
+
     // VecMath.sub
     assert(
         VecMath.equal(
@@ -78443,7 +78443,7 @@ var VecMath = (function() {
         ),
         "VecMath.sub([10, 8, 6], [-4, 6, 1]) equals [14, 2, 5]"
     );
-    
+
     // VecMath.vec
     assert(
         VecMath.equal(
diff --git a/dist/betteR20-core.user.js b/dist/betteR20-core.user.js
index d2ea461c..fce6e28e 100644
--- a/dist/betteR20-core.user.js
+++ b/dist/betteR20-core.user.js
@@ -204,7 +204,7 @@ function baseUtil () {
 			<div class="${classname}">
 				<img src="" class="userscript-b20img" style="content: unset; width:30px;position: relative;top: 10px;float: right;">
 				<h1 style="display: inline-block;line-height: 25px;margin-top: 5px; font-size: 22px;">
-					betteR20 
+					betteR20
 					<span style=" font-size: 13px ; font-weight: normal">by 5etools</span>
 					<p style="font-size: 11px;line-height: 15px;font-family: monospace;color: rgb(32, 194, 14);">VTTES ${vttv} detected<br>${b20v} loaded</p>
 				</h1>
@@ -4087,7 +4087,7 @@ function baseToolUnlock () {
 					<button class="btn" name="btn-refresh">Refresh</button>
 				</p>
 				<p class="split">
-					<label><input type="checkbox" title="Select all" name="cb-all"> Select All</label> 
+					<label><input type="checkbox" title="Select all" name="cb-all"> Select All</label>
 					<button class="btn" name="btn-unlock">Unlock Selected</button>
 				</p>
 				<div id="token-unlocker-list-container">
@@ -12696,7 +12696,7 @@ function baseMenu () {
 			var d = t.height()
 				, h = t.width()
 				, p = {};
-			
+
 			// BEGIN MOD
 			// This block is pasted from newer version of roll20 Menu code, with appropriate changes to vars etc
 			const r20ping = (u,i)=>{
@@ -16548,7 +16548,7 @@ function d20plusMod () {
 	d20plus.mod.setAlpha = function (layer) {
 		const l = ["map", "walls", "weather", "background", "objects", "foreground", "gmlayer"];
 		const o = ["background", "objects", "foreground"];
-		return !window.is_gm 
+		return !window.is_gm
 			|| (o.includes(layer) && o.includes(window.currentEditingLayer))
 			|| (l.indexOf(window.currentEditingLayer) >= l.indexOf(layer)
 				&& !(o.includes(layer) && window.currentEditingLayer === "gmlayer"))
@@ -40384,11 +40384,11 @@ EXT_LIB_API_SCRIPTS.push((function lib_script_7 () {
 /**
  * This is a small library for (mostly 2D) vector mathematics.
  * Internally, the vectors used by this library are simple arrays of numbers.
- * The functions provided by this library do not alter the input vectors, 
+ * The functions provided by this library do not alter the input vectors,
  * treating each vector as an immutable object.
  */
 var VecMath = (function() {
-    
+
     /**
      * Adds two vectors.
      * @param {vec} a
@@ -40402,8 +40402,8 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
+
+
     /**
      * Creates a cloned copy of a vector.
      * @param {vec} v
@@ -40416,10 +40416,10 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
-    /** 
-     * Returns an array representing the cross product of two 3D vectors. 
+
+
+    /**
+     * Returns an array representing the cross product of two 3D vectors.
      * @param {vec3} a
      * @param {vec3} b
      * @return {vec3}
@@ -40430,9 +40430,9 @@ var VecMath = (function() {
         var z = a[0]*b[1] - a[1]*b[0];
         return [x, y, z];
     };
-    
-    
-    /** 
+
+
+    /**
      * Returns the degree of a vector - the number of dimensions it has.
      * @param {vec} vector
      * @return {int}
@@ -40440,8 +40440,8 @@ var VecMath = (function() {
     var degree = function(vector) {
         return vector.length;
     };
-    
-    
+
+
     /**
      * Computes the distance between two points.
      * @param {vec} pt1
@@ -40452,10 +40452,10 @@ var VecMath = (function() {
         var v = vec(pt1, pt2);
         return length(v);
     };
-    
-    
-    /** 
-     * Returns the dot product of two vectors. 
+
+
+    /**
+     * Returns the dot product of two vectors.
      * @param {vec} a
      * @param {vec} b
      * @return {number}
@@ -40467,21 +40467,21 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
+
+
     /**
      * Tests if two vectors are equal.
      * @param {vec} a
      * @param {vec} b
-     * @param {float} [tolerance] A tolerance threshold for comparing vector 
-     *                            components.  
-     * @return {boolean} true iff the each of the vectors' corresponding 
+     * @param {float} [tolerance] A tolerance threshold for comparing vector
+     *                            components.
+     * @return {boolean} true iff the each of the vectors' corresponding
      *                  components are equal.
      */
     var equal = function(a, b, tolerance) {
         if(a.length != b.length)
             return false;
-        
+
         for(var i=0; i<a.length; i++) {
             if(tolerance !== undefined) {
                 if(Math.abs(a[i] - b[i]) > tolerance) {
@@ -40493,11 +40493,11 @@ var VecMath = (function() {
         }
         return true;
     };
-    
-    
-    
-    /** 
-     * Returns the length of a vector. 
+
+
+
+    /**
+     * Returns the length of a vector.
      * @param {vec} vector
      * @return {number}
      */
@@ -40508,9 +40508,9 @@ var VecMath = (function() {
         }
         return Math.sqrt(length);
     };
-    
-    
-    
+
+
+
     /**
      * Computes the normalization of a vector - its unit vector.
      * @param {vec} v
@@ -40518,16 +40518,16 @@ var VecMath = (function() {
      */
     var normalize = function(v) {
         var vHat = [];
-        
+
         var vLength = length(v);
         for(var i=0; i < v.length; i++) {
             vHat[i] = v[i]/vLength;
         }
-        
+
         return vHat;
     };
-    
-    
+
+
     /**
      * Computes the projection of vector b onto vector a.
      * @param {vec} a
@@ -40537,13 +40537,13 @@ var VecMath = (function() {
     var projection = function(a, b) {
         var scalar = scalarProjection(a, b);
         var aHat = normalize(a);
-        
+
         return scale(aHat, scalar);
     };
-    
-    
-    /** 
-     * Computes the distance from a point to an infinitely stretching line. 
+
+
+    /**
+     * Computes the distance from a point to an infinitely stretching line.
      * Works for either 2D or 3D points.
      * @param {vec2 || vec3} pt
      * @param {vec2 || vec3} linePt1   A point on the line.
@@ -40553,21 +40553,21 @@ var VecMath = (function() {
     var ptLineDist = function(pt, linePt1, linePt2) {
         var a = vec(linePt1, linePt2);
         var b = vec(linePt1, pt);
-        
+
         // Make 2D vectors 3D to compute the cross product.
         if(!a[2])
             a[2] = 0;
         if(!b[2])
             b[2] = 0;
-        
+
         var aHat = normalize(a);
         var aHatCrossB = cross(aHat, b);
         return length(aHatCrossB);
     };
-    
-    
-    /** 
-     * Computes the distance from a point to a line segment. 
+
+
+    /**
+     * Computes the distance from a point to a line segment.
      * Works for either 2D or 3D points.
      * @param {vec2 || vec3} pt
      * @param {vec2 || vec3} linePt1   The start point of the segment.
@@ -40578,24 +40578,24 @@ var VecMath = (function() {
         var a = vec(linePt1, linePt2);
         var b = vec(linePt1, pt);
         var aDotb = dot(a,b);
-        
+
         // Is pt behind linePt1?
         if(aDotb < 0) {
             return length(vec(pt, linePt1));
         }
-        
+
         // Is pt after linePt2?
         else if(aDotb > dot(a,a)) {
             return length(vec(pt, linePt2));
         }
-        
+
         // Pt must be between linePt1 and linePt2.
         else {
             return ptLineDist(pt, linePt1, linePt2);
         }
     };
-    
-    
+
+
     /**
      * Computes the scalar projection of b onto a.
      * @param {vec2} a
@@ -40605,12 +40605,12 @@ var VecMath = (function() {
     var scalarProjection = function(a, b) {
         var aDotB = dot(a, b);
         var aLength = length(a);
-        
+
         return aDotB/aLength;
     };
-    
-    
-    
+
+
+
     /**
      * Computes a scaled vector.
      * @param {vec2} v
@@ -40619,15 +40619,15 @@ var VecMath = (function() {
      */
     var scale = function(v, scalar) {
         var result = [];
-        
+
         for(var i=0; i<v.length; i++) {
             result[i] = v[i]*scalar;
         }
         return result;
     };
-    
-    
-    /** 
+
+
+    /**
      * Computes the difference of two vectors.
      * @param {vec} a
      * @param {vec} b
@@ -40640,10 +40640,10 @@ var VecMath = (function() {
         }
         return result;
     };
-    
-    
-    /** 
-     * Returns the vector from pt1 to pt2. 
+
+
+    /**
+     * Returns the vector from pt1 to pt2.
      * @param {vec} pt1
      * @param {vec} pt2
      * @return {vec}
@@ -40653,11 +40653,11 @@ var VecMath = (function() {
         for(var i=0; i<pt1.length; i++) {
             result.push( pt2[i] - pt1[i] );
         }
-        
+
         return result;
     };
-    
-    
+
+
     // The exposed API.
     return {
         add: add,
@@ -40694,12 +40694,12 @@ var VecMath = (function() {
             log("UNIT TEST FAILED: " + failMsg);
         }
     };
-    
-    
+
+
     var a = [1, 5];
     var b = [17, -8];
-    
-    
+
+
     // VecMath.equal
     assert(
         VecMath.equal([2, -3, 4, 8], [2, -3, 4, 8]),
@@ -40721,7 +40721,7 @@ var VecMath = (function() {
         !VecMath.equal([1,2], [1,2,3]),
         "!VecMath.equal([1,2], [1,2,3])"
     );
-    
+
     // VecMath.add
     assert(
         VecMath.equal(
@@ -40737,7 +40737,7 @@ var VecMath = (function() {
         ),
         "VecMath.add([0, 0, 0], [1, 2, 3]) equals [1, 2, 3]"
     );
-    
+
     // VecMath.clone
     assert(
         VecMath.equal( VecMath.clone(a), a),
@@ -40747,7 +40747,7 @@ var VecMath = (function() {
         VecMath.clone(a) != a,
         "VecMath.clone(a) != a"
     );
-    
+
     // VecMath.cross
     assert(
         VecMath.equal(
@@ -40763,7 +40763,7 @@ var VecMath = (function() {
         ),
         "VecMath.cross([1,2,3], [-10, 3, 5]) equals [1, -35, 23]"
     );
-    
+
     // VecMath.degree
     assert(
         VecMath.degree([1,2,3]) == 3,
@@ -40777,7 +40777,7 @@ var VecMath = (function() {
         VecMath.degree([1,1,1,1,1]) == 5,
         "VecMath.degree([1,1,1,1,1]) == 5"
     );
-    
+
     // VecMath.dist
     assert(
         VecMath.dist([1,2], [4,6]) == 5,
@@ -40787,7 +40787,7 @@ var VecMath = (function() {
         VecMath.dist([3,4], [-3, -4]) == 10,
         "VecMath.dist([3,4], [-3, -4]) == 10"
     );
-    
+
     // VecMath.dot
     assert(
         VecMath.dot([1, 2, 3], [-1, -2, -3]) == -14,
@@ -40809,7 +40809,7 @@ var VecMath = (function() {
         VecMath.dot([1,0], [1, 0]) == 1,
         "VecMath.dot([1,0], [1, 0]) == 1"
     );
-    
+
     // VecMath.length
     assert(
         VecMath.length([1,0,0]) == 1,
@@ -40823,7 +40823,7 @@ var VecMath = (function() {
         VecMath.length([-3, 0, 4, 0]) == 5,
         "VecMath.length([-3, 0, 4, 0]) == 5"
     );
-    
+
     // VecMath.normalize
     assert(
         VecMath.equal(
@@ -40839,7 +40839,7 @@ var VecMath = (function() {
         ),
         "VecMath.normalize([0,-3]) equals [0,-1]"
     );
-    
+
     // VecMath.projection
     assert(
         VecMath.equal(
@@ -40856,7 +40856,7 @@ var VecMath = (function() {
         ),
         "VecMath.projection([5,5], [0, 6]) equals [3, 3]"
     );
-    
+
     // VecMath.ptLineDist
     assert(
         VecMath.ptLineDist([0,3], [-100,5], [100,5]) == 2,
@@ -40866,7 +40866,7 @@ var VecMath = (function() {
         VecMath.ptLineDist([3,0], [5,5], [5,10]) == 2,
         "VecMath.ptLineDist([3,0], [5,5], [5,10]) == 2"
     );
-    
+
     // VecMath.ptSegDist
     assert(
         VecMath.ptSegDist([0,3], [-5,5], [5,5]) == 2,
@@ -40884,13 +40884,13 @@ var VecMath = (function() {
         VecMath.ptSegDist([-2,-4], [1,0], [5,0]) == 5,
         "VecMath.ptSegDist([-2,-4], [1,0], [5,0]) == 5"
     );
-    
+
     // VecMath.scalarProjection
     assert(
         VecMath.scalarProjection([5,0], [3, 4]) == 3,
         "VecMath.scalarProjection([5,0], [3, 4]) == 3"
     );
-    
+
     // VecMath.scale
     assert(
         VecMath.equal(
@@ -40899,7 +40899,7 @@ var VecMath = (function() {
         ),
         "VecMath.scale([1,-2,3], 6) equals [6, -12, 18]"
     );
-    
+
     // VecMath.sub
     assert(
         VecMath.equal(
@@ -40908,7 +40908,7 @@ var VecMath = (function() {
         ),
         "VecMath.sub([10, 8, 6], [-4, 6, 1]) equals [14, 2, 5]"
     );
-    
+
     // VecMath.vec
     assert(
         VecMath.equal(
diff --git a/js/5etools-main.js b/js/5etools-main.js
index 86a88d92..a8a57225 100644
--- a/js/5etools-main.js
+++ b/js/5etools-main.js
@@ -906,8 +906,8 @@ const betteR205etoolsMain = function () {
 	d20plus.setSheet = function () {
 		d20plus.ut.log("Switched Character Sheet Template");
 		d20plus.sheet = "ogl";
-		const sheets = d20.journal.characterSheetsManager.getAllSheets();
-		if (window.is_gm && (!sheets.length > 0)) {
+		const sheets = d20.journal.customSheets ?? d20.journal.characterSheetsManager.getAllSheets();
+		if (window.is_gm && sheets.length < 1) {
 			const $body = $(`body`);
 			$body.addClass("ve-nosheet__body");
 			const $btnClose = $(`<button class="btn btn-danger ve-nosheet__btn-close">X</button>`)
@@ -930,7 +930,7 @@ const betteR205etoolsMain = function () {
 			}));
 			throw new Error("No character sheet selected!");
 		}
-		const firstSheet = sheets.first();
+		const firstSheet = d20.journal.customSheets ?? sheets.first();
 		if (firstSheet.layouthtml.indexOf("shaped_d20") > 0) d20plus.sheet = "shaped";
 		if (firstSheet.layouthtml.indexOf("DnD5e_Character_Sheet") > 0) d20plus.sheet = "community";
 		d20plus.ut.log(`Switched Character Sheet Template to ${d20plus.sheet}`);
diff --git a/js/base-chat.js b/js/base-chat.js
index 5c28dbf1..4c8015c9 100644
--- a/js/base-chat.js
+++ b/js/base-chat.js
@@ -72,7 +72,7 @@ function baseChat () {
 
 	function availableLanguages (charId) {
 		const char = d20.Campaign.characters.get(charId);
-		const firstCharSheet = d20.journal.characterSheetsManager.getAllSheets().first();
+		const firstCharSheet = d20.journal.customSheets ?? d20.journal.characterSheetsManager.getAllSheets().first();
 		const langId = firstCharSheet.availableAttributes.repeating_proficiencies_prof_type;
 		if (!char) return [];
 		if (!char.attribs.length) {
diff --git a/js/base-engine.js b/js/base-engine.js
index a73652c3..8cd3cc3f 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -64,11 +64,13 @@ function d20plusEngine () {
 		$(`head`).append(`<style id="5etools-status-css"/>`);
 
 		d20plus.mod.overwriteStatusEffects();
+		if (!d20.engine.canvas.on) {
+			d20.engine.canvas.prototype.on = $.on ?? $("babylonCanvas").on;
+			d20.engine.canvas.prototype.off = $.off ?? $("babylonCanvas").off;
+		}
 
-		if (d20.engine.canvas){
-            d20.engine.canvas.off("object:added");
-            d20.engine.canvas.on("object:added", d20plus.mod.overwriteStatusEffects);
-        }
+		d20.engine.canvas.off("object:added");
+		d20.engine.canvas.on("object:added", d20plus.mod.overwriteStatusEffects);
 
 		// the holy trinity
 		// d20.engine.canvas.on("object:removed", () => console.log("added"));
@@ -593,6 +595,11 @@ function d20plusEngine () {
 			cacheRenderLoop();
 		};
 
+		if (!d20.engine.canvas.on) {
+			d20.engine.canvas.prototype.on = $.on ?? $("babylonCanvas").on;
+			d20.engine.canvas.prototype.off = $.off ?? $("babylonCanvas").off;
+		}
+
 		// store data for the rendering function to access
 		d20.engine.canvas.on("mouse:move", (data, ...others) => {
 			// enable hover from GM layer -> token layer
diff --git a/js/base-remote-libre.js b/js/base-remote-libre.js
index 9e766f10..dfb035a5 100644
--- a/js/base-remote-libre.js
+++ b/js/base-remote-libre.js
@@ -4,6 +4,9 @@ function remoteLibre () {
 			return fetch("https://api.github.com/repos/DMsGuild201/Roll20_resources/contents/playlist")
 				.then(response => response.json())
 				.then(data => {
+					// check if blocked
+					if (data.block)
+						return Promise.reject(`Blocked: ${data.block.reason ?? "Unknown reason"}`);
 					const promises = data.filter(file => file.download_url.toLowerCase().endsWith(".json"))
 						.map(file => d20plus.remoteLibre.downloadPlaylist(file.download_url));
 					return Promise.all(promises).then(res => d20plus.remoteLibre.processRemotePlaylists(res));
diff --git a/js/base.js b/js/base.js
index 5fe8789e..51641301 100644
--- a/js/base.js
+++ b/js/base.js
@@ -40,6 +40,7 @@ const D20plus = function (version) {
 					if ((typeof window.d20 !== "undefined" || window.currentPlayer?.d20) && !$("#loading-overlay").is(":visible") && !hasRunInit) {
 						hasRunInit = true;
 						if (!window.d20) window.d20 = window.currentPlayer.d20;
+						d20.engine.canvas ??= $("#babylonCanvas").get(0);
 						d20plus.Init();
 					} else {
 						setTimeout(waitForD20, 50);
@@ -48,14 +49,12 @@ const D20plus = function (version) {
 
 				window.d20plus = d20plus;
 				d20plus.ut.log("Injection successful...");
+			} else if (timeWaitedForEnhancementSuiteMs > 4 * 5000) {
+				alert("betteR20 may require the VTTES (R20ES) extension to be installed!\nPlease install it from https://ssstormy.github.io/roll20-enhancement-suite/\nClicking ok will take you there.");
+				window.open("https://ssstormy.github.io/roll20-enhancement-suite/", "_blank");
 			} else {
-				if (timeWaitedForEnhancementSuiteMs > 4 * 5000) {
-					alert("betteR20 may require the VTTES (R20ES) extension to be installed!\nPlease install it from https://ssstormy.github.io/roll20-enhancement-suite/\nClicking ok will take you there.");
-					window.open("https://ssstormy.github.io/roll20-enhancement-suite/", "_blank");
-				} else {
-					timeWaitedForEnhancementSuiteMs += 100;
-					setTimeout(waitForEnhancementSuite, 100);
-				}
+				timeWaitedForEnhancementSuiteMs += 100;
+				setTimeout(waitForEnhancementSuite, 100);
 			}
 		})();
 	}

From 0e301be3cac8d2969a7752092aa8acd7a86a3d69 Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Tue, 1 Apr 2025 22:12:57 +0200
Subject: [PATCH 04/12] fix: keep compatible with legacy games

---
 js/5etools-main.js      |  6 +++---
 js/base-chat.js         |  2 +-
 js/base-engine.js       | 15 +++++++++++----
 js/base-remote-libre.js |  3 +++
 js/base.js              | 13 ++++++-------
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/js/5etools-main.js b/js/5etools-main.js
index 86a88d92..a8a57225 100644
--- a/js/5etools-main.js
+++ b/js/5etools-main.js
@@ -906,8 +906,8 @@ const betteR205etoolsMain = function () {
 	d20plus.setSheet = function () {
 		d20plus.ut.log("Switched Character Sheet Template");
 		d20plus.sheet = "ogl";
-		const sheets = d20.journal.characterSheetsManager.getAllSheets();
-		if (window.is_gm && (!sheets.length > 0)) {
+		const sheets = d20.journal.customSheets ?? d20.journal.characterSheetsManager.getAllSheets();
+		if (window.is_gm && sheets.length < 1) {
 			const $body = $(`body`);
 			$body.addClass("ve-nosheet__body");
 			const $btnClose = $(`<button class="btn btn-danger ve-nosheet__btn-close">X</button>`)
@@ -930,7 +930,7 @@ const betteR205etoolsMain = function () {
 			}));
 			throw new Error("No character sheet selected!");
 		}
-		const firstSheet = sheets.first();
+		const firstSheet = d20.journal.customSheets ?? sheets.first();
 		if (firstSheet.layouthtml.indexOf("shaped_d20") > 0) d20plus.sheet = "shaped";
 		if (firstSheet.layouthtml.indexOf("DnD5e_Character_Sheet") > 0) d20plus.sheet = "community";
 		d20plus.ut.log(`Switched Character Sheet Template to ${d20plus.sheet}`);
diff --git a/js/base-chat.js b/js/base-chat.js
index 5c28dbf1..4c8015c9 100644
--- a/js/base-chat.js
+++ b/js/base-chat.js
@@ -72,7 +72,7 @@ function baseChat () {
 
 	function availableLanguages (charId) {
 		const char = d20.Campaign.characters.get(charId);
-		const firstCharSheet = d20.journal.characterSheetsManager.getAllSheets().first();
+		const firstCharSheet = d20.journal.customSheets ?? d20.journal.characterSheetsManager.getAllSheets().first();
 		const langId = firstCharSheet.availableAttributes.repeating_proficiencies_prof_type;
 		if (!char) return [];
 		if (!char.attribs.length) {
diff --git a/js/base-engine.js b/js/base-engine.js
index a73652c3..8cd3cc3f 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -64,11 +64,13 @@ function d20plusEngine () {
 		$(`head`).append(`<style id="5etools-status-css"/>`);
 
 		d20plus.mod.overwriteStatusEffects();
+		if (!d20.engine.canvas.on) {
+			d20.engine.canvas.prototype.on = $.on ?? $("babylonCanvas").on;
+			d20.engine.canvas.prototype.off = $.off ?? $("babylonCanvas").off;
+		}
 
-		if (d20.engine.canvas){
-            d20.engine.canvas.off("object:added");
-            d20.engine.canvas.on("object:added", d20plus.mod.overwriteStatusEffects);
-        }
+		d20.engine.canvas.off("object:added");
+		d20.engine.canvas.on("object:added", d20plus.mod.overwriteStatusEffects);
 
 		// the holy trinity
 		// d20.engine.canvas.on("object:removed", () => console.log("added"));
@@ -593,6 +595,11 @@ function d20plusEngine () {
 			cacheRenderLoop();
 		};
 
+		if (!d20.engine.canvas.on) {
+			d20.engine.canvas.prototype.on = $.on ?? $("babylonCanvas").on;
+			d20.engine.canvas.prototype.off = $.off ?? $("babylonCanvas").off;
+		}
+
 		// store data for the rendering function to access
 		d20.engine.canvas.on("mouse:move", (data, ...others) => {
 			// enable hover from GM layer -> token layer
diff --git a/js/base-remote-libre.js b/js/base-remote-libre.js
index 9e766f10..dfb035a5 100644
--- a/js/base-remote-libre.js
+++ b/js/base-remote-libre.js
@@ -4,6 +4,9 @@ function remoteLibre () {
 			return fetch("https://api.github.com/repos/DMsGuild201/Roll20_resources/contents/playlist")
 				.then(response => response.json())
 				.then(data => {
+					// check if blocked
+					if (data.block)
+						return Promise.reject(`Blocked: ${data.block.reason ?? "Unknown reason"}`);
 					const promises = data.filter(file => file.download_url.toLowerCase().endsWith(".json"))
 						.map(file => d20plus.remoteLibre.downloadPlaylist(file.download_url));
 					return Promise.all(promises).then(res => d20plus.remoteLibre.processRemotePlaylists(res));
diff --git a/js/base.js b/js/base.js
index 5fe8789e..51641301 100644
--- a/js/base.js
+++ b/js/base.js
@@ -40,6 +40,7 @@ const D20plus = function (version) {
 					if ((typeof window.d20 !== "undefined" || window.currentPlayer?.d20) && !$("#loading-overlay").is(":visible") && !hasRunInit) {
 						hasRunInit = true;
 						if (!window.d20) window.d20 = window.currentPlayer.d20;
+						d20.engine.canvas ??= $("#babylonCanvas").get(0);
 						d20plus.Init();
 					} else {
 						setTimeout(waitForD20, 50);
@@ -48,14 +49,12 @@ const D20plus = function (version) {
 
 				window.d20plus = d20plus;
 				d20plus.ut.log("Injection successful...");
+			} else if (timeWaitedForEnhancementSuiteMs > 4 * 5000) {
+				alert("betteR20 may require the VTTES (R20ES) extension to be installed!\nPlease install it from https://ssstormy.github.io/roll20-enhancement-suite/\nClicking ok will take you there.");
+				window.open("https://ssstormy.github.io/roll20-enhancement-suite/", "_blank");
 			} else {
-				if (timeWaitedForEnhancementSuiteMs > 4 * 5000) {
-					alert("betteR20 may require the VTTES (R20ES) extension to be installed!\nPlease install it from https://ssstormy.github.io/roll20-enhancement-suite/\nClicking ok will take you there.");
-					window.open("https://ssstormy.github.io/roll20-enhancement-suite/", "_blank");
-				} else {
-					timeWaitedForEnhancementSuiteMs += 100;
-					setTimeout(waitForEnhancementSuite, 100);
-				}
+				timeWaitedForEnhancementSuiteMs += 100;
+				setTimeout(waitForEnhancementSuite, 100);
 			}
 		})();
 	}

From 9981b08be6a17a52b7f04bb17c1ef5f6f9eb0f8d Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Mon, 7 Apr 2025 19:36:26 +0200
Subject: [PATCH 05/12] refactor: changed some format styles based on feedback

---
 js/5etools-main.js      | 7 ++++---
 js/base-engine.js       | 4 ++--
 js/base-menu.js         | 2 +-
 js/base-remote-libre.js | 3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/5etools-main.js b/js/5etools-main.js
index a8a57225..81b70390 100644
--- a/js/5etools-main.js
+++ b/js/5etools-main.js
@@ -907,7 +907,8 @@ const betteR205etoolsMain = function () {
 		d20plus.ut.log("Switched Character Sheet Template");
 		d20plus.sheet = "ogl";
 		const sheets = d20.journal.customSheets ?? d20.journal.characterSheetsManager.getAllSheets();
-		if (window.is_gm && sheets.length < 1) {
+		const noSheetsFound = !d20.journal.customSheets && Array.isArray(sheets) && sheets.length < 1;
+		if (window.is_gm && noSheetsFound) {
 			const $body = $(`body`);
 			$body.addClass("ve-nosheet__body");
 			const $btnClose = $(`<button class="btn btn-danger ve-nosheet__btn-close">X</button>`)
@@ -931,8 +932,8 @@ const betteR205etoolsMain = function () {
 			throw new Error("No character sheet selected!");
 		}
 		const firstSheet = d20.journal.customSheets ?? sheets.first();
-		if (firstSheet.layouthtml.indexOf("shaped_d20") > 0) d20plus.sheet = "shaped";
-		if (firstSheet.layouthtml.indexOf("DnD5e_Character_Sheet") > 0) d20plus.sheet = "community";
+		if (firstSheet.layouthtml.includes("shaped_d20")) d20plus.sheet = "shaped";
+		if (firstSheet.layouthtml.includes("DnD5e_Character_Sheet")) d20plus.sheet = "community";
 		d20plus.ut.log(`Switched Character Sheet Template to ${d20plus.sheet}`);
 	};
 
diff --git a/js/base-engine.js b/js/base-engine.js
index 8cd3cc3f..afd1ed5d 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -532,7 +532,7 @@ function d20plusEngine () {
 
 	// needs to be called after `enhanceMeasureTool()`
 	d20plus.engine.enhanceMouseMove = () => {
-		if (d20.engine.canvas){
+		if (d20.engine.canvas) {
 			// add missing vars
 			var i = d20.engine.canvas;
 
@@ -759,7 +759,7 @@ function d20plusEngine () {
 				`);
 			}
 		}
-		if (d20.engine.canvas){
+		if (d20.engine.canvas) {
 			d20.engine.canvas._renderAll = _.bind(d20plus.mod.renderAll, d20.engine.canvas);
 			d20.engine.canvas.sortTokens = _.bind(d20plus.mod.sortTokens, d20.engine.canvas);
 			d20.engine.canvas.drawAnyLayer = _.bind(d20plus.mod.drawAnyLayer, d20.engine.canvas);
diff --git a/js/base-menu.js b/js/base-menu.js
index a7b1161f..d7b02cf1 100644
--- a/js/base-menu.js
+++ b/js/base-menu.js
@@ -7,7 +7,7 @@ function baseMenu () {
 
 		const getTokenWhisperPart = () => d20plus.cfg.getOrDefault("token", "massRollWhisperName") ? "/w gm Rolling for @{selected|token_name}...\n" : "";
 
-		if (typeof(Mousetrap) !== "undefined"){
+		if (typeof Mousetrap !== "undefined"){
 			Mousetrap.bind("b b", function () { // back on layer
 				const n = d20plus.engine.getSelectedToMove();
 				d20plus.engine.backwardOneLayer(n);
diff --git a/js/base-remote-libre.js b/js/base-remote-libre.js
index dfb035a5..2e438b47 100644
--- a/js/base-remote-libre.js
+++ b/js/base-remote-libre.js
@@ -5,8 +5,7 @@ function remoteLibre () {
 				.then(response => response.json())
 				.then(data => {
 					// check if blocked
-					if (data.block)
-						return Promise.reject(`Blocked: ${data.block.reason ?? "Unknown reason"}`);
+					if (data.block)	return Promise.reject(`Blocked: ${data.block.reason ?? "Unknown reason"}`);
 					const promises = data.filter(file => file.download_url.toLowerCase().endsWith(".json"))
 						.map(file => d20plus.remoteLibre.downloadPlaylist(file.download_url));
 					return Promise.all(promises).then(res => d20plus.remoteLibre.processRemotePlaylists(res));

From 56c95414d5faf267f025e39139a6f8521226ef79 Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Mon, 7 Apr 2025 19:36:50 +0200
Subject: [PATCH 06/12] docs: added some coding config based on feedback

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index c23795f7..ab02da65 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,7 @@ trim_trailing_whitespace=true
 insert_final_newline=true
 indent_style=tab
 indent_size=4
+# add space before curly brace in if statements
+space_before_open_brace=all
+# add space after if keyword
+space_after_if=all

From de4cf08bc28410b38904c1a20ff2bd4953ed287e Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Mon, 7 Apr 2025 22:08:57 +0200
Subject: [PATCH 07/12] refactor: change basic id calls to use getElementById

---
 js/base-chat.js | 4 ++--
 js/base.js      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/base-chat.js b/js/base-chat.js
index 4c8015c9..c8be9c3d 100644
--- a/js/base-chat.js
+++ b/js/base-chat.js
@@ -868,7 +868,7 @@ function baseChat () {
 		// $.trim() instead of .trim() cause it's used in roll20's doChatInput()
 		let toSend = $.trim(text);
 		if (text !== srcText && text) d20plus.chat.localHistory.push($.trim(srcText));
-		if ($("#soundslike").get(0)) toSend = "";
+		if (document.getElementById("soundslike")) toSend = "";
 
 		if (toSend.includes("|&inlang|")) {
 			toSend.split("\n").forEach((str, i) => {
@@ -914,7 +914,7 @@ function baseChat () {
 			d20plus.chat.processPlayersList();
 			const obsconfig = { childList: true, subtree: false };
 			d20plus.cfg.playerWatcher = new MutationObserver(d20plus.chat.processPlayersList);
-			d20plus.cfg.playerWatcher.observe($("#avatarContainer").get(0), obsconfig);
+			d20plus.cfg.playerWatcher.observe(document.getElementById("avatarContainer"), obsconfig);
 		}
 
 		if (d20plus.cfg.getOrDefault("chat", "social")) {
diff --git a/js/base.js b/js/base.js
index 51641301..e0a33424 100644
--- a/js/base.js
+++ b/js/base.js
@@ -36,11 +36,11 @@ const D20plus = function (version) {
 				// r20es will expose the d20 variable if we wait
 				// this should always trigger after window.onload has fired, but track init state just in case
 				(function waitForD20 () {
-					if ($("#textchat").get(0) && !$(".boring-chat").get(0)) d20plus.ut.showInitMessage();
+					if (document.getElementById("textchat") && !$(".boring-chat").get(0)) d20plus.ut.showInitMessage();
 					if ((typeof window.d20 !== "undefined" || window.currentPlayer?.d20) && !$("#loading-overlay").is(":visible") && !hasRunInit) {
 						hasRunInit = true;
 						if (!window.d20) window.d20 = window.currentPlayer.d20;
-						d20.engine.canvas ??= $("#babylonCanvas").get(0);
+						d20.engine.canvas ??= document.getElementById("babylonCanvas");
 						d20plus.Init();
 					} else {
 						setTimeout(waitForD20, 50);

From df2f5594b3d585a34daf8a5804a7bf5dedc586a2 Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Mon, 7 Apr 2025 22:21:56 +0200
Subject: [PATCH 08/12] fix: canvas .prototype is undefined error

---
 js/base-engine.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/base-engine.js b/js/base-engine.js
index afd1ed5d..90222003 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -65,8 +65,8 @@ function d20plusEngine () {
 
 		d20plus.mod.overwriteStatusEffects();
 		if (!d20.engine.canvas.on) {
-			d20.engine.canvas.prototype.on = $.on ?? $("babylonCanvas").on;
-			d20.engine.canvas.prototype.off = $.off ?? $("babylonCanvas").off;
+			d20.engine.canvas.on = $("babylonCanvas").on;
+			d20.engine.canvas.off = $("babylonCanvas").off;
 		}
 
 		d20.engine.canvas.off("object:added");
@@ -596,8 +596,8 @@ function d20plusEngine () {
 		};
 
 		if (!d20.engine.canvas.on) {
-			d20.engine.canvas.prototype.on = $.on ?? $("babylonCanvas").on;
-			d20.engine.canvas.prototype.off = $.off ?? $("babylonCanvas").off;
+			d20.engine.canvas.on = $("babylonCanvas").on;
+			d20.engine.canvas.off = $("babylonCanvas").off;
 		}
 
 		// store data for the rendering function to access

From 98b48d4b48bad56c94f71d949ccc00da5787b1f1 Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Tue, 8 Apr 2025 00:29:49 +0200
Subject: [PATCH 09/12] fix(JumpGate): Load errors but disable a few features
 that dont apply in jumpgate

---
 js/base-engine.js | 12 +++++++-----
 js/base-mod.js    |  4 ++--
 js/base.js        | 16 ++++++++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/js/base-engine.js b/js/base-engine.js
index 90222003..d4b38ced 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -65,8 +65,9 @@ function d20plusEngine () {
 
 		d20plus.mod.overwriteStatusEffects();
 		if (!d20.engine.canvas.on) {
-			d20.engine.canvas.on = $("babylonCanvas").on;
-			d20.engine.canvas.off = $("babylonCanvas").off;
+			d20.engine.canvas.on = $.fn.on;
+			d20.engine.canvas.off = $.fn.off;
+			d20.engine.canvas.each = $.fn.each;
 		}
 
 		d20.engine.canvas.off("object:added");
@@ -532,7 +533,7 @@ function d20plusEngine () {
 
 	// needs to be called after `enhanceMeasureTool()`
 	d20plus.engine.enhanceMouseMove = () => {
-		if (d20.engine.canvas) {
+		if (d20.engine.canvas.fire) {
 			// add missing vars
 			var i = d20.engine.canvas;
 
@@ -596,8 +597,9 @@ function d20plusEngine () {
 		};
 
 		if (!d20.engine.canvas.on) {
-			d20.engine.canvas.on = $("babylonCanvas").on;
-			d20.engine.canvas.off = $("babylonCanvas").off;
+			d20.engine.canvas.on = $.fn.on;
+			d20.engine.canvas.off = $.fn.off;
+			d20.engine.canvas.each = $.fn.each;
 		}
 
 		// store data for the rendering function to access
diff --git a/js/base-mod.js b/js/base-mod.js
index b638bc87..684b97e4 100644
--- a/js/base-mod.js
+++ b/js/base-mod.js
@@ -111,7 +111,7 @@ function d20plusMod () {
 	d20plus.mod.overwriteStatusEffects = function () {
 		d20.engine.canvasDirty = true;
 		d20.engine.canvasTopDirty = true;
-		d20.engine.canvas._objects.forEach(it => {
+		d20.engine.canvas?._objects?.forEach(it => {
 			// avoid adding it to any objects that wouldn't have it to begin with
 			if (!it.model || !it.model.view || !it.model.view.updateBackdrops) return;
 
@@ -429,7 +429,7 @@ function d20plusMod () {
 	d20plus.mod.setAlpha = function (layer) {
 		const l = ["map", "walls", "weather", "background", "objects", "foreground", "gmlayer"];
 		const o = ["background", "objects", "foreground"];
-		return !window.is_gm 
+		return !window.is_gm
 			|| (o.includes(layer) && o.includes(window.currentEditingLayer))
 			|| (l.indexOf(window.currentEditingLayer) >= l.indexOf(layer)
 				&& !(o.includes(layer) && window.currentEditingLayer === "gmlayer"))
diff --git a/js/base.js b/js/base.js
index e0a33424..35a973cb 100644
--- a/js/base.js
+++ b/js/base.js
@@ -40,9 +40,21 @@ const D20plus = function (version) {
 					if ((typeof window.d20 !== "undefined" || window.currentPlayer?.d20) && !$("#loading-overlay").is(":visible") && !hasRunInit) {
 						hasRunInit = true;
 						if (!window.d20) window.d20 = window.currentPlayer.d20;
+						const isJumpGate = !d20.engine.canvas;
 						d20.engine.canvas ??= document.getElementById("babylonCanvas");
-						d20plus.Init();
-					} else {
+						(function waitForSheet(){
+							let isMultiSheet = isJumpGate && !d20.journal.customSheets;
+							// when in jump gate with multiple sheets, waiting for layouthtml property to be present required
+							const sheets = d20.journal.characterSheetsManager.getAllSheets();
+							if (!isMultiSheet || (isMultiSheet && (sheets.length == 0 || sheets.first().layouthtml))) {
+								d20plus.Init();
+							}
+							else {
+								setTimeout(waitForSheet, 50);
+							}
+						})();
+					}
+					else {
 						setTimeout(waitForD20, 50);
 					}
 				})();

From 43d29b53b0e1de4ae391c5e52ab3913d42acfb02 Mon Sep 17 00:00:00 2001
From: Mohamed Osman <Mohamed.Osman@derivco.co.za>
Date: Tue, 8 Apr 2025 00:32:25 +0200
Subject: [PATCH 10/12] refactor: added missing feedback

---
 js/base-engine.js | 49 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/js/base-engine.js b/js/base-engine.js
index d4b38ced..5c83c776 100644
--- a/js/base-engine.js
+++ b/js/base-engine.js
@@ -533,35 +533,34 @@ function d20plusEngine () {
 
 	// needs to be called after `enhanceMeasureTool()`
 	d20plus.engine.enhanceMouseMove = () => {
-		if (d20.engine.canvas.fire) {
-			// add missing vars
-			var i = d20.engine.canvas;
-
-			// Roll20 bug (present as of 2019-5-25) workaround
-			//   when box-selecting + moving tokens, the "object:moving" event throws an exception
-			//   try-catch-ignore this, because it's extremely annoying
-			const cachedFire = i.fire.bind(i);
-			i.fire = function (namespace, opts) {
-				if (namespace === "object:moving") {
-					try {
-						cachedFire(namespace, opts);
-					} catch (e) {}
-				} else {
+		if (!d20.engine.canvas.fire) return;
+		// add missing vars
+		var i = d20.engine.canvas;
+
+		// Roll20 bug (present as of 2019-5-25) workaround
+		//   when box-selecting + moving tokens, the "object:moving" event throws an exception
+		//   try-catch-ignore this, because it's extremely annoying
+		const cachedFire = i.fire.bind(i);
+		i.fire = function (namespace, opts) {
+			if (namespace === "object:moving") {
+				try {
 					cachedFire(namespace, opts);
-				}
-			};
+				} catch (e) {}
+			} else {
+				cachedFire(namespace, opts);
+			}
+		};
 
-			const I = d20plus.overwrites.canvasHandlerMove
+		const I = d20plus.overwrites.canvasHandlerMove
 
-			if (FINAL_CANVAS_MOUSEMOVE_LIST.length) {
-				FINAL_CANVAS_MOUSEMOVE = (FINAL_CANVAS_MOUSEMOVE_LIST.find(it => it.on === d20.engine.final_canvas) || {}).listener;
-			}
+		if (FINAL_CANVAS_MOUSEMOVE_LIST.length) {
+			FINAL_CANVAS_MOUSEMOVE = (FINAL_CANVAS_MOUSEMOVE_LIST.find(it => it.on === d20.engine.final_canvas) || {}).listener;
+		}
 
-			if (FINAL_CANVAS_MOUSEMOVE) {
-				d20plus.ut.log("Enhancing mouse move");
-				d20.engine.final_canvas.removeEventListener("mousemove", FINAL_CANVAS_MOUSEMOVE);
-				d20.engine.final_canvas.addEventListener("mousemove", I);
-			}
+		if (FINAL_CANVAS_MOUSEMOVE) {
+			d20plus.ut.log("Enhancing mouse move");
+			d20.engine.final_canvas.removeEventListener("mousemove", FINAL_CANVAS_MOUSEMOVE);
+			d20.engine.final_canvas.addEventListener("mousemove", I);
 		}
 	};
 

From 0f6c2fc59602ded91015e77083624672d3dcb105 Mon Sep 17 00:00:00 2001
From: Ozzy <Mohamed.Osman@derivco.co.za>
Date: Wed, 16 Apr 2025 14:41:38 +0200
Subject: [PATCH 11/12] fix: stuck on load without error

---
 js/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/base.js b/js/base.js
index 35a973cb..9c24c555 100644
--- a/js/base.js
+++ b/js/base.js
@@ -46,7 +46,7 @@ const D20plus = function (version) {
 							let isMultiSheet = isJumpGate && !d20.journal.customSheets;
 							// when in jump gate with multiple sheets, waiting for layouthtml property to be present required
 							const sheets = d20.journal.characterSheetsManager.getAllSheets();
-							if (!isMultiSheet || (isMultiSheet && (sheets.length == 0 || sheets.first().layouthtml))) {
+							if (!isMultiSheet || (isMultiSheet && (sheets.length == 0 || sheets.any(x=>x.layouthtml)))) {
 								d20plus.Init();
 							}
 							else {

From 6f489cf3f81f7fde3dcd5c8091f7eef1f5f69302 Mon Sep 17 00:00:00 2001
From: Ozzy <Mohamed.Osman@derivco.co.za>
Date: Thu, 22 May 2025 15:54:35 +0200
Subject: [PATCH 12/12] fix: fix hang in non jumpgate games and add resilience
 to map importer

---
 js/base-tool-module.js | 10 +++++-----
 js/base.js             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/base-tool-module.js b/js/base-tool-module.js
index 633b07ff..86422776 100644
--- a/js/base-tool-module.js
+++ b/js/base-tool-module.js
@@ -369,11 +369,11 @@ function baseToolModule () {
 								switch (prop) {
 									case "maps": {
 										const map = d20.Campaign.pages.create(entry.attributes);
-										entry.graphics.forEach(it => map.thegraphics.create(it));
-										entry.paths.forEach(it => map.thepaths.create(it));
-										entry.text.forEach(it => map.thetexts.create(it));
-										entry.doors.forEach(it => map.doors.create(it));
-										entry.windows.forEach(it => map.windows.create(it));
+										entry.graphics?.forEach(it => map.thegraphics && map.thegraphics.create(it));
+										entry.paths?.forEach(it => map.thepaths.create(it));
+										entry.text?.forEach(it => map.thetexts.create(it));
+										entry.doors?.forEach(it => map.doors.create(it));
+										entry.windows?.forEach(it => map.windows.create(it));
 										map.save();
 										break;
 									}
diff --git a/js/base.js b/js/base.js
index 9c24c555..8e8849e7 100644
--- a/js/base.js
+++ b/js/base.js
@@ -45,7 +45,7 @@ const D20plus = function (version) {
 						(function waitForSheet(){
 							let isMultiSheet = isJumpGate && !d20.journal.customSheets;
 							// when in jump gate with multiple sheets, waiting for layouthtml property to be present required
-							const sheets = d20.journal.characterSheetsManager.getAllSheets();
+							const sheets = d20.journal.customSheets ?? d20.journal.characterSheetsManager.getAllSheets();
 							if (!isMultiSheet || (isMultiSheet && (sheets.length == 0 || sheets.any(x=>x.layouthtml)))) {
 								d20plus.Init();
 							}