From e3a5131515d8977a8687cf4445903f6597b1759e Mon Sep 17 00:00:00 2001
From: NichtStudioCode <51272202+NichtStudioCode@users.noreply.github.com>
Date: Sat, 23 Apr 2022 16:17:40 +0200
Subject: [PATCH] Updated string-remapper-maven-plugin

---
 InventoryAccess/IA-R6/pom.xml | 50 +++++++----------------------------
 InventoryAccess/IA-R7/pom.xml | 46 ++++++--------------------------
 InventoryAccess/IA-R8/pom.xml | 44 +++++-------------------------
 InventoryAccess/IA-R9/pom.xml | 46 ++++++--------------------------
 4 files changed, 33 insertions(+), 153 deletions(-)

diff --git a/InventoryAccess/IA-R6/pom.xml b/InventoryAccess/IA-R6/pom.xml
index 42697a8..ffdcd24 100644
--- a/InventoryAccess/IA-R6/pom.xml
+++ b/InventoryAccess/IA-R6/pom.xml
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>xyz.xenondevs</groupId>
                 <artifactId>string-remapper-maven-plugin</artifactId>
-                <version>0.1-SNAPSHOT</version>
+                <version>0.4</version>
 
                 <executions>
                     <execution>
@@ -47,12 +47,13 @@
                             <goal>remap</goal>
                         </goals>
                         <configuration>
-                            <remapGoal>spigot_members</remapGoal>
-                            <srcOut>string-remapper-sources/spigot</srcOut>
+                            <remapGoal>spigot</remapGoal>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-spigot</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
-                                <fields>org.spigotmc:minecraft-server:csrg:maps-spigot-fields:${spigot.version}</fields>
+                                <members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
                             </mapsSpigot>
                         </configuration>
                     </execution>
@@ -64,49 +65,18 @@
                         </goals>
                         <configuration>
                             <remapGoal>mojang</remapGoal>
-                            <srcOut>string-remapper-sources/mojang</srcOut>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-mojang</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
-                                <fields>org.spigotmc:minecraft-server:csrg:maps-spigot-fields:${spigot.version}</fields>
+                                <members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
                             </mapsSpigot>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>compile-spigot</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/spigot</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/spigot</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>compile-mojang</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/mojang</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/mojang</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -122,7 +92,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/spigot</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-spigot</classesDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,7 +101,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/mojang</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-mojang</classesDirectory>
                             <classifier>remapped-mojang</classifier>
                         </configuration>
                     </execution>
diff --git a/InventoryAccess/IA-R7/pom.xml b/InventoryAccess/IA-R7/pom.xml
index dd45ffb..c4706f3 100644
--- a/InventoryAccess/IA-R7/pom.xml
+++ b/InventoryAccess/IA-R7/pom.xml
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>xyz.xenondevs</groupId>
                 <artifactId>string-remapper-maven-plugin</artifactId>
-                <version>0.1-SNAPSHOT</version>
+                <version>0.4</version>
 
                 <executions>
                     <execution>
@@ -47,8 +47,9 @@
                             <goal>remap</goal>
                         </goals>
                         <configuration>
-                            <remapGoal>spigot_members</remapGoal>
-                            <srcOut>string-remapper-sources/spigot</srcOut>
+                            <remapGoal>spigot</remapGoal>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-spigot</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
@@ -64,7 +65,8 @@
                         </goals>
                         <configuration>
                             <remapGoal>mojang</remapGoal>
-                            <srcOut>string-remapper-sources/mojang</srcOut>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-mojang</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
@@ -75,38 +77,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>compile-spigot</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/spigot</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/spigot</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>compile-mojang</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/mojang</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/mojang</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -122,7 +92,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/spigot</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-spigot</classesDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,7 +101,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/mojang</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-mojang</classesDirectory>
                             <classifier>remapped-mojang</classifier>
                         </configuration>
                     </execution>
diff --git a/InventoryAccess/IA-R8/pom.xml b/InventoryAccess/IA-R8/pom.xml
index 27e02a8..1e9c768 100644
--- a/InventoryAccess/IA-R8/pom.xml
+++ b/InventoryAccess/IA-R8/pom.xml
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>xyz.xenondevs</groupId>
                 <artifactId>string-remapper-maven-plugin</artifactId>
-                <version>0.1-SNAPSHOT</version>
+                <version>0.4</version>
 
                 <executions>
                     <execution>
@@ -48,7 +48,8 @@
                         </goals>
                         <configuration>
                             <remapGoal>spigot</remapGoal>
-                            <srcOut>string-remapper-sources/spigot</srcOut>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-spigot</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
@@ -64,7 +65,8 @@
                         </goals>
                         <configuration>
                             <remapGoal>mojang</remapGoal>
-                            <srcOut>string-remapper-sources/mojang</srcOut>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-mojang</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
@@ -75,38 +77,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>compile-spigot</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/spigot</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/spigot</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>compile-mojang</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/mojang</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/mojang</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -122,7 +92,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/spigot</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-spigot</classesDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,7 +101,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/mojang</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-mojang</classesDirectory>
                             <classifier>remapped-mojang</classifier>
                         </configuration>
                     </execution>
diff --git a/InventoryAccess/IA-R9/pom.xml b/InventoryAccess/IA-R9/pom.xml
index 1c73897..a8933a4 100644
--- a/InventoryAccess/IA-R9/pom.xml
+++ b/InventoryAccess/IA-R9/pom.xml
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>xyz.xenondevs</groupId>
                 <artifactId>string-remapper-maven-plugin</artifactId>
-                <version>0.1-SNAPSHOT</version>
+                <version>0.4</version>
 
                 <executions>
                     <execution>
@@ -48,7 +48,8 @@
                         </goals>
                         <configuration>
                             <remapGoal>spigot</remapGoal>
-                            <srcOut>string-remapper-sources/spigot</srcOut>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-spigot</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
@@ -64,7 +65,8 @@
                         </goals>
                         <configuration>
                             <remapGoal>mojang</remapGoal>
-                            <srcOut>string-remapper-sources/mojang</srcOut>
+                            <classesIn>${project.build.directory}/classes</classesIn>
+                            <classesOut>${project.build.directory}/classes-mojang</classesOut>
                             <mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
                             <mapsSpigot>
                                 <classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
@@ -74,39 +76,7 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>compile-spigot</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/spigot</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/spigot</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>compile-mojang</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <compileSourceRoots>${project.build.directory}/string-remapper-sources/mojang</compileSourceRoots>
-                            <outputDirectory>${project.build.directory}/classes/mojang</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -122,7 +92,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/spigot</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-spigot</classesDirectory>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,7 +101,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <classesDirectory>${project.build.directory}/classes/mojang</classesDirectory>
+                            <classesDirectory>${project.build.directory}/classes-mojang</classesDirectory>
                             <classifier>remapped-mojang</classifier>
                         </configuration>
                     </execution>