Merge branch 'master' into gh-pages

Author: JannisX11

.github/ISSUE_TEMPLATE/issue.yaml

@@ -58,4 +58,9 @@ body:
 - type: input
   id: plugins
   attributes:
-    label: Installed Blockbench plugins
+    label: Installed Blockbench plugins
+- type: textarea
+  id: log
+  attributes:
+    label: Are there any console errors?
+    description: This is particularly relevant if you expect something to happen and it does not happen, or if the UI becomes unresponsive. Click Help > Developer > Open Dev Tools and switch to the Console tab to see the log. Anything red is an error message.

.github/workflows/stale.yml

@@ -22,7 +22,6 @@ jobs:
             This issue has been automatically marked as stale because it has not had
             recent activity. It will be closed if no further activity occurs. Thank you
             for your contributions.
-          close-issue-message: false
           days-before-stale: 360
           days-before-close: 28
           # Issues with these labels will never be considered stale

.gitignore

@@ -1,5 +1,6 @@
 /dist/
-index.php
+.env
+.DS_store
 electron-builder.env
 node_modules/
 bundle.js

js/animations/animation_mode.js

@@ -491,7 +491,7 @@ const Animator = {
 					function processPlaceholderVariables(text) {
 						if (typeof text !== 'string') return;
 						text = text.replace(/v\./, 'variable.').replace(/q\./, 'query.').replace(/t\./, 'temp.').replace(/c\./, 'context.').toLowerCase();
-						let matches = text.match(/(query|variable|context|temp)\.\w+/gi);
+						let matches = text.match(/(query|variable|context|temp)\.\w+(\([^)]*\))?/gi);
 						if (!matches) return;
 						matches.forEach(match => {
 							let panel_vue = Interface.Panels.variable_placeholders.inside_vue;
@@ -500,6 +500,7 @@ const Animator = {
 
 							let [space, name] = match.split(/\./);
 							if (panel_vue.text != '' && panel_vue.text.substr(-1) !== '\n') panel_vue.text += '\n';
+							name = name.replace(/[')]/g, '').replace('(', ':');
 
 							if (name == 'modified_distance_moved') {
 								panel_vue.text += `${match} = time * 8`;
@@ -1499,21 +1500,18 @@ Interface.definePanels(function() {
 })
 
 function processVariablePlaceholderText(text) {
-	const res = text
-			.replaceAll(/(\s*)(v\.)/g, '$1variable.')
-			.replaceAll(/(\s*)(q\.)/g, '$1query.')
-			.replaceAll(/(\s*)(t\.)/g, '$1temp.')
-			.replaceAll(/(\s*)(c\.)/g, '$1context.')
-
 	Animator.global_variable_lines = {}
-	for (const line of res.split('\n')) {
+	for (const line of text.split('\n')) {
 		let [key, val] = line.split(/=\s*(.+)/)
 		if(val === undefined) {
 			continue
 		}
 		key = key.replace(/[\s;]/g, '')
+		key = key
+			.replace(/^v\./, 'variable.')
+			.replace(/^q\./, 'query.')
+			.replace(/^t\./, 'temp.')
+			.replace(/^c\./, 'context.');
 		Animator.global_variable_lines[key] = val.trim()
 	}
-
-	return res
 }

js/animations/molang.js

@@ -89,8 +89,10 @@ Animator.MolangParser.global_variables = {
 		return Timeline.time
 	},
 }
-Animator.MolangParser.variableHandler = function (variable, variables) {
-	const val = Animator.global_variable_lines[variable]
+Animator.MolangParser.variableHandler = function (variable, variables, args) {
+	let variable_with_args = args?.length && `${variable}(${args.map(arg => "'"+arg+"'").join(',')})`;
+
+	const val = Animator.global_variable_lines[variable] ?? Animator.global_variable_lines[variable_with_args];
 	if (val === undefined) {
 		return
 	}
@@ -237,10 +239,10 @@ new ValidatorCheck('molang_syntax', {
 							.replace(/[^a-z0-9._]/g, '')
 				)
 			}
-			if (clear_string.match(/[^\w\s+\-*/().,;:[\]!?=<>&|]/)) {
+			if (clear_string.match(/[^\w\s+\-*/(){}.,;:[\]!?=<>&|]/)) {
 				issues.push(
 					'Invalid character: ' +
-						clear_string.match(/[^\s\w+\-*/().,;:[\]!?=<>&|]+/g).join(', ')
+						clear_string.match(/[^\s\w+\-*/(){}.,;:[\]!?=<>&|]+/g).join(', ')
 				)
 			}
 			let left = string.match(/\(/g) || 0

js/io/formats/bedrock_old.js

@@ -418,6 +418,7 @@ var format = new ModelFormat({
 	animation_controllers: true,
 	animation_mode: true,
 	locators: true,
+	pbr: true,
 	codec,
 	onSetup(project) {
 		if (isApp) {

js/io/formats/java_block.js

@@ -546,6 +546,7 @@ var format = new ModelFormat({
 	texture_mcmeta: true,
 	display_mode: true,
 	texture_folder: true,
+	pbr: true,
 	cube_size_limiter: {
 		coordinate_limits: [-16, 32],
 		test(cube, values = 0) {

js/io/formats/modded_entity.js

@@ -1080,6 +1080,7 @@ var format = new ModelFormat({
 	rotate_cubes: true,
 	integer_size: true,
 	animation_mode: true,
+	pbr: true,
 })
 Object.defineProperty(format, 'integer_size', {get: _ => Templates.get('integer_size') || settings.modded_entity_integer_size.value});
 codec.format = format;

js/io/formats/optifine_jem.js

@@ -406,6 +406,7 @@ var format = new ModelFormat({
 	bone_rig: true,
 	centered_grid: true,
 	texture_folder: true,
+	pbr: true,
 	codec
 })
 Object.defineProperty(format, 'integer_size', {get: _ => Project.box_uv})

js/io/formats/optifine_jpm.js

@@ -66,6 +66,7 @@ var part_format = new ModelFormat({
 		bone_rig: true,
 		centered_grid: true,
 		texture_folder: true,
+		pbr: true,
 		codec: part_codec
 })
 Object.defineProperty(part_format, 'integer_size', {get: _ => Project.box_uv})