Fix v3 InputEventKey (#86)

* Fix v3 InputKey writing * remove bytecode hack * fix clang
bruvzg · Oct 19, 2022 · 254fed2 · 254fed2
1 parent 229c558
commit 254fed2
Show file tree

Hide file tree

Showing 57 changed files with 339 additions and 20 deletions.
diff --git a/bytecode/bytecode_015d36d.h b/bytecode/bytecode_015d36d.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_015d36d : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_015d36d() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_054a2ac.h b/bytecode/bytecode_054a2ac.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_054a2ac : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_054a2ac() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_0b806ee.h b/bytecode/bytecode_0b806ee.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_0b806ee : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_0b806ee() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_1a36141.h b/bytecode/bytecode_1a36141.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_1a36141 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_1a36141() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_1add52b.h b/bytecode/bytecode_1add52b.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_1add52b : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_1add52b() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_1ca61a3.h b/bytecode/bytecode_1ca61a3.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_1ca61a3 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_1ca61a3() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_216a8aa.h b/bytecode/bytecode_216a8aa.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_216a8aa : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_216a8aa() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_2185c01.h b/bytecode/bytecode_2185c01.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_2185c01 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_2185c01() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_23381a5.h b/bytecode/bytecode_23381a5.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_23381a5 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_23381a5() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_23441ec.h b/bytecode/bytecode_23441ec.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_23441ec : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_23441ec() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_30c1229.h b/bytecode/bytecode_30c1229.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_30c1229 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_30c1229() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_31ce3c5.h b/bytecode/bytecode_31ce3c5.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_31ce3c5 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_31ce3c5() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_3ea6d9f.h b/bytecode/bytecode_3ea6d9f.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_3ea6d9f : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_3ea6d9f() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_48f1d02.h b/bytecode/bytecode_48f1d02.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_48f1d02 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_48f1d02() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_4ee82a2.h b/bytecode/bytecode_4ee82a2.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_4ee82a2 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_4ee82a2() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_506df14.h b/bytecode/bytecode_506df14.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_506df14 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_506df14() { engine_ver_major = 4; }
 };
 
 #endif
diff --git a/bytecode/bytecode_513c026.h b/bytecode/bytecode_513c026.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_513c026 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_513c026() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_514a3fb.h b/bytecode/bytecode_514a3fb.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_514a3fb : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_514a3fb() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_5565f55.h b/bytecode/bytecode_5565f55.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_5565f55 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_5565f55() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_5e938f0.h b/bytecode/bytecode_5e938f0.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_5e938f0 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_5e938f0() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_6174585.h b/bytecode/bytecode_6174585.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_6174585 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_6174585() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_620ec47.h b/bytecode/bytecode_620ec47.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_620ec47 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_620ec47() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_62273e5.h b/bytecode/bytecode_62273e5.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_62273e5 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_62273e5() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_64872ca.h b/bytecode/bytecode_64872ca.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_64872ca : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_64872ca() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_65d48d6.h b/bytecode/bytecode_65d48d6.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_65d48d6 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_65d48d6() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_6694c11.h b/bytecode/bytecode_6694c11.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_6694c11 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_6694c11() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_703004f.h b/bytecode/bytecode_703004f.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_703004f : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_703004f() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_7124599.h b/bytecode/bytecode_7124599.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_7124599 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_7124599() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_7d2d144.h b/bytecode/bytecode_7d2d144.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_7d2d144 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_7d2d144() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_7f7d97f.h b/bytecode/bytecode_7f7d97f.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_7f7d97f : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_7f7d97f() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_85585c7.h b/bytecode/bytecode_85585c7.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_85585c7 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_85585c7() { engine_ver_major = 2; }
 };
 
 #endif
diff --git a/bytecode/bytecode_8aab9a0.h b/bytecode/bytecode_8aab9a0.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_8aab9a0 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_8aab9a0() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_8b912d1.h b/bytecode/bytecode_8b912d1.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_8b912d1 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_8b912d1() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_8c1731b.h b/bytecode/bytecode_8c1731b.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_8c1731b : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_8c1731b() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_8cab401.h b/bytecode/bytecode_8cab401.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_8cab401 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_8cab401() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_8e35d93.h b/bytecode/bytecode_8e35d93.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_8e35d93 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_8e35d93() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_91ca725.h b/bytecode/bytecode_91ca725.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_91ca725 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_91ca725() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_97f34a1.h b/bytecode/bytecode_97f34a1.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_97f34a1 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_97f34a1() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_a3f1ee5.h b/bytecode/bytecode_a3f1ee5.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_a3f1ee5 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_a3f1ee5() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_a56d6ff.h b/bytecode/bytecode_a56d6ff.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_a56d6ff : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_a56d6ff() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_a60f242.h b/bytecode/bytecode_a60f242.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_a60f242 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_a60f242() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_base.cpp b/bytecode/bytecode_base.cpp
@@ -4,6 +4,7 @@
 
 #include "bytecode_base.h"
 #include "compat/file_access_encrypted_v3.h"
+#include "compat/variant_writer_compat.h"
 
 #include "core/config/engine.h"
 #include "core/io/file_access.h"
@@ -86,7 +87,8 @@ String GDScriptDecomp::get_error_message() {
 }
 
 String GDScriptDecomp::get_constant_string(Vector<Variant> &constants, uint32_t constId) {
-	String constString = constants[constId].get_construct_string();
+	String constString;
+	Error err = VariantWriterCompat::write_to_string(constants[constId], constString, engine_ver_major);
 	if (constants[constId].get_type() == Variant::Type::STRING) {
 		constString = constString.replace("\n", "\\n");
 	}

diff --git a/bytecode/bytecode_base.h b/bytecode/bytecode_base.h
@@ -20,6 +20,7 @@ class GDScriptDecomp : public Object {
 
 	String script_text;
 	String error_message;
+	int engine_ver_major;
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) = 0;

diff --git a/bytecode/bytecode_be46be7.h b/bytecode/bytecode_be46be7.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_be46be7 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_be46be7() { engine_ver_major = 1; }
 };
 
 #endif
diff --git a/bytecode/bytecode_c00427a.h b/bytecode/bytecode_c00427a.h
@@ -25,6 +25,7 @@ class GDScriptDecomp_c00427a : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_c00427a() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_c24c739.h b/bytecode/bytecode_c24c739.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_c24c739 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_c24c739() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_c6120e7.h b/bytecode/bytecode_c6120e7.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_c6120e7 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_c6120e7() { engine_ver_major = 3; }
 };
 
 #endif
diff --git a/bytecode/bytecode_d28da86.h b/bytecode/bytecode_d28da86.h
@@ -26,6 +26,7 @@ class GDScriptDecomp_d28da86 : public GDScriptDecomp {
 
 public:
 	virtual Error decompile_buffer(Vector<uint8_t> p_buffer) override;
+	GDScriptDecomp_d28da86() { engine_ver_major = 3; }
 };
 
 #endif