Relocate shaded dependencies

Author: LexManos

build.gradle

@@ -1,5 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
     id 'java-library'
     id 'idea'
@@ -65,7 +63,7 @@ tasks.named('jar', Jar) {
     from configurations.named('include').map { it.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } }
 }
 
-tasks.named('shadowJar', ShadowJar) {
+tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
     manifest {
         attributes([
             'Main-Class'   : 'net.minecraftforge.accesstransformer.TransformerProcessor',
@@ -75,6 +73,16 @@ tasks.named('shadowJar', ShadowJar) {
 
     archiveClassifier = 'fatjar'
     exclude '**/Log4j2Plugins.dat'
+
+    enableAutoRelocation = true
+    relocationPrefix = 'net.minecraftforge.accesstransformer.shadow'
+    // Rewrite JOpt's message files, so that help text is displayed nicely.
+    transform(com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer) {
+        paths = [ 'Messages.properties$' ]
+        keyTransformer = { key -> 'net.minecraftforge.accesstransformer.shadow.' + key }
+    }
+    transform(com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer)
+    transform(com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer)
 }
 
 changelog {

src/main/java/net/minecraftforge/accesstransformer/TransformerProcessor.java

@@ -34,13 +34,19 @@ public static void main(String... args) {
         final ArgumentAcceptingOptionSpec<Path> atFiles = optionParser.acceptsAll(list("atfile", "atFile"), "Access Transformer File").withRequiredArg().withValuesConvertedBy(new PathConverter(PathProperties.FILE_EXISTING)).required();
         final ArgumentAcceptingOptionSpec<Path> outputJar = optionParser.accepts("outJar", "Output JAR file").withRequiredArg().withValuesConvertedBy(new PathConverter());
         final ArgumentAcceptingOptionSpec<String> logFilePath = optionParser.accepts("logFile", "Log file for logging").withRequiredArg();
+        final OptionSpec<Void> help = optionParser.accepts("help").forHelp();
 
         final OptionSet optionSet;
         Path inputJarPath;
         Path outputJarPath;
         List<Path> atFilePaths;
         try {
             optionSet = optionParser.parse(args);
+            if (optionSet.has(help)) {
+                optionParser.printHelpOn(System.out);
+                return;
+            }
+
             final String logFile = logFilePath.value(optionSet);
             if (logFile != null) {
                 // configure a custom logfile with debug level logging
@@ -69,6 +75,10 @@ public static void main(String... args) {
             atFilePaths = atFiles.values(optionSet).stream().map(Path::toAbsolutePath).collect(Collectors.toList());
         } catch (Exception e) {
             LOGGER.error(AXFORM_MARKER,"Option Parsing Error", e);
+            try {
+                optionParser.printHelpOn(System.out);
+            } catch (IOException e1) {
+            }
             return;
         }
         LOGGER.info(AXFORM_MARKER, "Access Transformer processor running version {}", TransformerProcessor.class.getPackage().getImplementationVersion());