Release version 1.1.1

Fix transfering nodes metadata

Author: theWituch

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.minecraftplus</groupId>
 	<artifactId>srgprocessor</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<name>SrgProcessor</name>
 
 	<distributionManagement>

src/main/java/org/minecraftplus/srgprocessor/tasks/Cleaner.java

@@ -47,12 +47,15 @@ public void run() throws IOException {
 
             this.outputSrg.getClasses().stream().forEach(cls -> {
                 IMappingBuilder.IClass builderCls = builder.addClass(cls.getOriginal(), cls.getMapped());
+                cls.getMetadata().entrySet().stream().forEach(m -> builderCls.meta(m.getKey(), m.getValue()));
                 cls.getFields().stream().forEach(fld -> {
                     IMappingBuilder.IField builderField = builderCls.field(fld.getOriginal(), fld.getMapped())
                             .descriptor(fld.getDescriptor()); // TODO Maybe can do add descriptor in .field(o, m) method?
+                    fld.getMetadata().entrySet().stream().forEach(m -> builderField.meta(m.getKey(), m.getValue()));
                 });
                 cls.getMethods().stream().forEach(mtd -> {
                     IMappingBuilder.IMethod builderMtd = builderCls.method(mtd.getDescriptor(), mtd.getOriginal(), mtd.getMapped());
+                    mtd.getMetadata().entrySet().stream().forEach(m -> builderMtd.meta(m.getKey(), m.getValue()));
 
                     // Get method parameter list from descriptor
                     ArrayList<Descriptor> parameters = Utils.splitMethodDesc(mtd.getDescriptor());

src/test/resources/operations/clean/filter/pattern.txt

@@ -14,6 +14,7 @@ abc some/package/Alphabet
 	a (Llf;Lln;)V constructor
 	a (Labc;)V do
 	b ()Labc; get
+		static
 	c ()Lad; get
 	d ()Lx; get
 	e (Llna;)Ljava/lang/Iterable; get
@@ -36,6 +37,7 @@ abc$a some/package/Alphabet$InnerClass
 	a ()Labc$a; get
 	a (Laf;)Labc$a; reqs
 	a (Ljava/lang/String;Lz;)Labc$a; add
+		static
 	a ([[Ljava/lang/String;Z)Labc$a; requirements
 	a (Labc;)Labc$a; parent
 	a (Lx;ZZ)Labc$a; rew

src/test/resources/operations/clean/infer/pattern.txt

@@ -24,6 +24,7 @@ abc some/package/Alphabet
 	a (Labc;)V do
 		0 inferred p_do_1
 	b ()Labc; get
+		static
 	c ()Lad; get
 	d ()Lx; get
 	e (Llna;)Ljava/lang/Iterable; get
@@ -62,6 +63,7 @@ abc$a some/package/Alphabet$InnerClass
 		5 inferred p_InnerClass_6
 	<init> ()V <init>
 	a (Ljava/lang/String;Lz;)Labc$a; add
+		static
 		0 inferred p_add_1
 		1 inferred p_add_2
 	a (Lx;ZZ)Labc$a; rew

src/test/resources/operations/clean/pattern.txt

@@ -24,6 +24,7 @@ abc some/package/Alphabet
 	a (Labc;)V do
 		0 inferred p_do_1
 	b ()Labc; get
+		static
 	c ()Lad; get
 	d ()Lx; get
 	e (Llna;)Ljava/lang/Iterable; get
@@ -63,6 +64,7 @@ abc$a some/package/Alphabet$InnerClass
 	a (Laf;)Labc$a; reqs
 		0 inferred p_reqs_1
 	a (Ljava/lang/String;Lz;)Labc$a; add
+		static
 		0 inferred p_add_1
 		1 inferred p_add_2
 	a ([[Ljava/lang/String;Z)Labc$a; requirements

src/test/resources/operations/deduce/pattern.txt

@@ -24,6 +24,7 @@ abc some/package/Alphabet
 	a (Labc;)V do
 		0 inferred alphabet
 	b ()Labc; get
+		static
 	c ()Lad; get
 	d ()Lx; get
 	e (Llna;)Ljava/lang/Iterable; get
@@ -62,6 +63,7 @@ abc$a some/package/Alphabet$InnerClass
 		5 inferred astring
 	<init> ()V <init>
 	a (Ljava/lang/String;Lz;)Labc$a; add
+		static
 		0 inferred s
 		1 inferred letterzulu
 	a (Lx;ZZ)Labc$a; rew

src/test/resources/operations/input.txt

@@ -28,6 +28,7 @@ abc some/package/Alphabet
 	a ()Labc$a; get
 	a (Labc;)V do
 	b ()Labc; get
+		static
 	c ()Lad; get
 	d ()Lx; get
 	e (Llna;)Ljava/lang/Iterable; get
@@ -57,6 +58,7 @@ abc$a some/package/Alphabet$InnerClass
 	a (Lkv;)V constructor
 	a ()Labc$a; get
 	a (Ljava/lang/String;Lz;)Labc$a; add
+		static
 	a ([[Ljava/lang/String;Z)Labc$a; requirements
 	a (Lx$a;)Labc$a; rewards
 	a (Lsm;)Labc$a; parent

src/test/resources/operations/input_inferred.txt

@@ -38,6 +38,7 @@ abc some/package/Alphabet
 	a (Labc;)V do
 		0 inferred p_do_1
 	b ()Labc; get
+		static
 	c ()Lad; get
 	d ()Lx; get
 	e (Llna;)Ljava/lang/Iterable; get
@@ -83,6 +84,7 @@ abc$a some/package/Alphabet$InnerClass
 		0 inferred p_constructor_1
 	a ()Labc$a; get
 	a (Ljava/lang/String;Lz;)Labc$a; add
+		static
 		0 inferred p_add_1
 		1 inferred p_add_2
 	a ([[Ljava/lang/String;Z)Labc$a; requirements