Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21-lts

rubensworks · rubensworks · commit 6268c612f54d · 2024-12-23T13:59:59.000+01:00
diff --git a/resources/changelog/1.19.2-1.0.8.txt b/resources/changelog/1.19.2-1.0.8.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix display panel crash when translation undefined values, Closes #27
diff --git a/resources/changelog/1.20.1-1.0.8.txt b/resources/changelog/1.20.1-1.0.8.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix display panel crash when translation undefined values, Closes #27
diff --git a/src/main/java/org/cyclops/integratedscripting/evaluate/translation/ValueTranslatorRegistry.java b/src/main/java/org/cyclops/integratedscripting/evaluate/translation/ValueTranslatorRegistry.java
@@ -71,7 +71,7 @@ public IValueTranslator getScriptValueTranslator(Value scriptValue) {
     public <V extends IValue> V translateFromGraal(Context context, Value value, IEvaluationExceptionFactory exceptionFactory, ValueDeseralizationContext valueDeseralizationContext) throws EvaluationException {
         IValueTranslator translator = getScriptValueTranslator(value);
         if (translator == null) {
-            throw exceptionFactory.createError(Component.translatable("valuetype.integratedscripting.error.translation.unknown_from_graal", value));
+            throw exceptionFactory.createError(Component.translatable("valuetype.integratedscripting.error.translation.unknown_from_graal", value.toString()));
         }
         return (V) translator.translateFromGraal(context, value, exceptionFactory, valueDeseralizationContext);
     }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public IValueTranslator getScriptValueTranslator(Value scriptValue) {`
`71`	`71`	`public <V extends IValue> V translateFromGraal(Context context, Value value, IEvaluationExceptionFactory exceptionFactory, ValueDeseralizationContext valueDeseralizationContext) throws EvaluationException {`
`72`	`72`	`IValueTranslator translator = getScriptValueTranslator(value);`
`73`	`73`	`if (translator == null) {`
`74`		`- throw exceptionFactory.createError(Component.translatable("valuetype.integratedscripting.error.translation.unknown_from_graal", value));`
	`74`	`+ throw exceptionFactory.createError(Component.translatable("valuetype.integratedscripting.error.translation.unknown_from_graal", value.toString()));`
`75`	`75`	`}`
`76`	`76`	`return (V) translator.translateFromGraal(context, value, exceptionFactory, valueDeseralizationContext);`
`77`	`77`	`}`