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 --- src/test/resources/comments/test.mapping | 18 ------------------ .../packageAccess/correctMappings/base/Base.mapping | 1 - .../packageAccess/correctMappings/base/One.mapping | 1 - .../packageAccess/correctMappings/two/Two.mapping | 1 - .../packageAccess/wrongMappings/base/Base.mapping | 1 - .../packageAccess/wrongMappings/one/One.mapping | 1 - .../packageAccess/wrongMappings/two/Two.mapping | 1 - src/test/resources/proguard-build.conf | 6 ------ src/test/resources/proguard-test.conf | 8 -------- src/test/resources/tinyV2InnerClasses/c.mapping | 2 -- .../tinyV2InnerClasses/cuchaz/enigma/Dad.mapping | 5 ----- 11 files changed, 45 deletions(-) delete mode 100644 src/test/resources/comments/test.mapping delete mode 100644 src/test/resources/packageAccess/correctMappings/base/Base.mapping delete mode 100644 src/test/resources/packageAccess/correctMappings/base/One.mapping delete mode 100644 src/test/resources/packageAccess/correctMappings/two/Two.mapping delete mode 100644 src/test/resources/packageAccess/wrongMappings/base/Base.mapping delete mode 100644 src/test/resources/packageAccess/wrongMappings/one/One.mapping delete mode 100644 src/test/resources/packageAccess/wrongMappings/two/Two.mapping delete mode 100644 src/test/resources/proguard-build.conf delete mode 100644 src/test/resources/proguard-test.conf delete mode 100644 src/test/resources/tinyV2InnerClasses/c.mapping delete mode 100644 src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping (limited to 'src/test/resources') diff --git a/src/test/resources/comments/test.mapping b/src/test/resources/comments/test.mapping deleted file mode 100644 index d1345583..00000000 --- a/src/test/resources/comments/test.mapping +++ /dev/null @@ -1,18 +0,0 @@ -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/src/test/resources/packageAccess/correctMappings/base/Base.mapping b/src/test/resources/packageAccess/correctMappings/base/Base.mapping deleted file mode 100644 index 0a86def0..00000000 --- a/src/test/resources/packageAccess/correctMappings/base/Base.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS a base/Base diff --git a/src/test/resources/packageAccess/correctMappings/base/One.mapping b/src/test/resources/packageAccess/correctMappings/base/One.mapping deleted file mode 100644 index dd4c2083..00000000 --- a/src/test/resources/packageAccess/correctMappings/base/One.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS b base/One diff --git a/src/test/resources/packageAccess/correctMappings/two/Two.mapping b/src/test/resources/packageAccess/correctMappings/two/Two.mapping deleted file mode 100644 index a179349c..00000000 --- a/src/test/resources/packageAccess/correctMappings/two/Two.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS c two/Two diff --git a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping b/src/test/resources/packageAccess/wrongMappings/base/Base.mapping deleted file mode 100644 index 0a86def0..00000000 --- a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS a base/Base diff --git a/src/test/resources/packageAccess/wrongMappings/one/One.mapping b/src/test/resources/packageAccess/wrongMappings/one/One.mapping deleted file mode 100644 index 15b42cf5..00000000 --- a/src/test/resources/packageAccess/wrongMappings/one/One.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS b one/One diff --git a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping b/src/test/resources/packageAccess/wrongMappings/two/Two.mapping deleted file mode 100644 index a179349c..00000000 --- a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS c two/Two diff --git a/src/test/resources/proguard-build.conf b/src/test/resources/proguard-build.conf deleted file mode 100644 index ba3575ae..00000000 --- a/src/test/resources/proguard-build.conf +++ /dev/null @@ -1,6 +0,0 @@ --dontoptimize --dontobfuscate --dontwarn --keep class cuchaz.enigma.Main { static void main(java.lang.String[]); } --keep class cuchaz.enigma.CommandMain { static void main(java.lang.String[]); } --keep class de.sciss.syntaxpane.** { *; } diff --git a/src/test/resources/proguard-test.conf b/src/test/resources/proguard-test.conf deleted file mode 100644 index 9411d269..00000000 --- a/src/test/resources/proguard-test.conf +++ /dev/null @@ -1,8 +0,0 @@ --overloadaggressively --repackageclasses --allowaccessmodification --dontoptimize --dontshrink --keepparameternames --keepattributes --keep class cuchaz.enigma.inputs.Keep diff --git a/src/test/resources/tinyV2InnerClasses/c.mapping b/src/test/resources/tinyV2InnerClasses/c.mapping deleted file mode 100644 index f9b04428..00000000 --- a/src/test/resources/tinyV2InnerClasses/c.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS c - CLASS a Kid diff --git a/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping b/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping deleted file mode 100644 index 8d43ba90..00000000 --- a/src/test/resources/tinyV2InnerClasses/cuchaz/enigma/Dad.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS f cuchaz/enigma/Dad - CLASS a One - CLASS a Two - CLASS a - FIELD a value I -- cgit v1.2.3