From 0f47403d0220757fed189b76e2071e25b1025cb8 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 3 Jun 2020 13:39:42 -0400 Subject: Split GUI code to separate module (#242) * Split into modules * Post merge compile fixes Co-authored-by: modmuss50 --- enigma/src/test/resources/comments/test.mapping | 18 ++++++++++ enigma/src/test/resources/proguard-build.conf | 6 ++++ enigma/src/test/resources/proguard-test.conf | 8 +++++ .../test/resources/tinyV2InnerClasses/c.mapping | 2 ++ .../tinyV2InnerClasses/cuchaz/enigma/Dad.mapping | 5 +++ enigma/src/test/resources/translation.mappings | 41 ++++++++++++++++++++++ 6 files changed, 80 insertions(+) create mode 100644 enigma/src/test/resources/comments/test.mapping create mode 100644 enigma/src/test/resources/proguard-build.conf create mode 100644 enigma/src/test/resources/proguard-test.conf create mode 100644 enigma/src/test/resources/tinyV2InnerClasses/c.mapping create mode 100644 enigma/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping create mode 100644 enigma/src/test/resources/translation.mappings (limited to 'enigma/src/test/resources') diff --git a/enigma/src/test/resources/comments/test.mapping b/enigma/src/test/resources/comments/test.mapping new file mode 100644 index 0000000..d134558 --- /dev/null +++ b/enigma/src/test/resources/comments/test.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion + COMMENT it circel + COMMENT next line + FIELD field_21493 IDENTITY Lnet/minecraft/class_1158; + COMMENT moar comment thing + COMMENT near field + METHOD foo bar (FFFF)V + COMMENT method comment + COMMENT second line + COMMENT third line + ARG 1 b + COMMENT arg comment + CLASS old new + COMMENT inner comment + FIELD field_19263 iterator Lnet/minecraft/class_3980; + METHOD tryAdvance (Ljava/util/function/Consumer;)Z + ARG 1 consumer + COMMENT very inner comment \ No newline at end of file diff --git a/enigma/src/test/resources/proguard-build.conf b/enigma/src/test/resources/proguard-build.conf new file mode 100644 index 0000000..691d8a2 --- /dev/null +++ b/enigma/src/test/resources/proguard-build.conf @@ -0,0 +1,6 @@ +-dontoptimize +-dontobfuscate +-dontwarn +-keep class cuchaz.enigma.Main { static void main(java.lang.String[]); } +-keep class cuchaz.enigma.command.Main { static void main(java.lang.String[]); } +-keep class de.sciss.syntaxpane.** { *; } diff --git a/enigma/src/test/resources/proguard-test.conf b/enigma/src/test/resources/proguard-test.conf new file mode 100644 index 0000000..9411d26 --- /dev/null +++ b/enigma/src/test/resources/proguard-test.conf @@ -0,0 +1,8 @@ +-overloadaggressively +-repackageclasses +-allowaccessmodification +-dontoptimize +-dontshrink +-keepparameternames +-keepattributes +-keep class cuchaz.enigma.inputs.Keep diff --git a/enigma/src/test/resources/tinyV2InnerClasses/c.mapping b/enigma/src/test/resources/tinyV2InnerClasses/c.mapping new file mode 100644 index 0000000..f9b0442 --- /dev/null +++ b/enigma/src/test/resources/tinyV2InnerClasses/c.mapping @@ -0,0 +1,2 @@ +CLASS c + CLASS a Kid diff --git a/enigma/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping b/enigma/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping new file mode 100644 index 0000000..8d43ba9 --- /dev/null +++ b/enigma/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping @@ -0,0 +1,5 @@ +CLASS f cuchaz/enigma/Dad + CLASS a One + CLASS a Two + CLASS a + FIELD a value I diff --git a/enigma/src/test/resources/translation.mappings b/enigma/src/test/resources/translation.mappings new file mode 100644 index 0000000..c08765c --- /dev/null +++ b/enigma/src/test/resources/translation.mappings @@ -0,0 +1,41 @@ +CLASS a deobf/A_Basic + FIELD a f1 I + FIELD a f2 F + FIELD a f3 Ljava/lang/String; + METHOD a m1 ()V + METHOD a m2 ()I + METHOD a m3 (I)V + METHOD a m4 (I)I +CLASS b deobf/B_BaseClass + FIELD a f1 I + FIELD a f2 C + METHOD a m1 ()I + METHOD b m2 ()I +CLASS c deobf/C_SubClass + FIELD b f2 C + FIELD b f3 I + FIELD c f4 I + METHOD a m1 ()I + METHOD c m3 ()I +CLASS g deobf/G_OuterClass + CLASS g$a A_InnerClass + CLASS g$a$a A_InnerInnerClass + FIELD a f3 I + METHOD a m2 ()V + FIELD a f1 I + FIELD a f2 Ljava/lang/String; + METHOD a m1 ()V + CLASS g$b + CLASS g$b$a A_NamedInnerClass + FIELD a f4 I +CLASS h +CLASS i deobf/I_Generics + CLASS i$a A_Type + CLASS i$b B_Generic + FIELD a f4 Ljava/lang/Object; + METHOD a m1 ()Ljava/lang/Object; + FIELD a f1 Ljava/util/List; + FIELD b f2 Ljava/util/List; + FIELD a f3 Ljava/util/Map; + FIELD a f5 Li$b; + FIELD b f6 Li$b; -- cgit v1.2.3