icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

One-line fix for a minor bug about encoding (#1368)

Browse Source
This commit is contained in:
ch-yx authored and GitHub committed 2022-07-21 15:15:30 +02:00
1 parent 0f474f3d87
commit a38cd099f2
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/language/DataStructures.java
+2 -2
View File
@@ -329,10 +329,10 @@ public class DataStructures {
return (cc, tt) -> ret; return (cc, tt) -> ret;
}); });
expression.addUnaryFunction("encode_b64", v -> StringValue.of(Base64.getEncoder().encodeToString(v.getString().getBytes()))); expression.addUnaryFunction("encode_b64", v -> StringValue.of(Base64.getEncoder().encodeToString(v.getString().getBytes(StandardCharsets.UTF_8))));
expression.addUnaryFunction("decode_b64", v -> { expression.addUnaryFunction("decode_b64", v -> {
try { try {
return StringValue.of(new String(Base64.getDecoder().decode(v.getString()), StandardCharsets.ISO_8859_1));//using this charset cos it's the one used in decoding function return StringValue.of(new String(Base64.getDecoder().decode(v.getString()), StandardCharsets.UTF_8));
} catch (IllegalArgumentException iae){ } catch (IllegalArgumentException iae){
throw new ThrowStatement("Invalid b64 string: " + v.getString(), Throwables.B64_ERROR); throw new ThrowStatement("Invalid b64 string: " + v.getString(), Throwables.B64_ERROR);
} }