Add support for white and blacklist via command line

Add support for bundled server jars

LICENSE-header.txt

@@ -1,16 +1,2 @@
-MergeTool
-Copyright (c) 2016-2018.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation version 2.1
-of the License.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Copyright (c) Forge Development LLC
+SPDX-License-Identifier: LGPL-2.1-only

build.gradle

@@ -5,10 +5,10 @@ plugins {
     id 'java'
     id 'eclipse'
     id 'maven-publish'
-    id 'org.cadixdev.licenser' version '0.6.1'
+    id 'net.minecraftforge.licenser' version '1.0.1'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id 'com.github.ben-manes.versions' version '0.47.0'
-    id 'net.minecraftforge.gradleutils' version '2.+'
+    id 'com.github.ben-manes.versions' version '0.51.0'
+    id 'net.minecraftforge.gradleutils' version '[2.3,2.4]'
 }
 
 group = 'net.minecraftforge'
@@ -32,12 +32,17 @@ java {
     withSourcesJar()
 }
 
-tasks.named('jar', Jar).configure {
+tasks.register('copyMarkers', Copy).configure  {
     from(configurations.markers.collect { zipTree(it) } ) {
         into 'markers'
         include '**/*.class'
         rename { it.replace('.class', '.marker') }
     }
+    includeEmptyDirs = false
+    into project.layout.buildDirectory.dir('copyMarkers')
+}
+
+tasks.named('jar', Jar).configure {
     manifest {
         attributes('Main-Class': 'net.minecraftforge.mergetool.ConsoleMerger')
         attributes('Implementation-Version': project.version)
@@ -48,27 +53,30 @@ tasks.named('shadowJar', ShadowJar).configure {
     archiveClassifier = 'fatjar'
 }
 
+sourceSets {
+    main {
+        resources {
+            srcDirs += [tasks.named('copyMarkers')]
+        }
+    }
+}
+
 configurations {
     markers
-    implementation.extendsFrom(markers)
 }
 
 dependencies {
     implementation 'org.ow2.asm:asm:9.5'
     implementation 'org.ow2.asm:asm-tree:9.5'
     implementation 'org.ow2.asm:asm-util:9.5'
     implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
-    implementation 'net.minecraftforge:srgutils:0.4.15'
-    
+    implementation 'net.minecraftforge:srgutils:0.5.7'
+
     markers 'net.minecraftforge:mergetool-cpw:1.0'
     markers 'net.minecraftforge:mergetool-fml:1.0'
     markers 'net.minecraftforge:mergetool-api:1.0'
 }
 
-artifacts {
-    archives shadowJar
-}
-
 publishing {
     publications.register('mavenJava', MavenPublication) {
         from components.java
@@ -79,7 +87,7 @@ publishing {
             name = 'MergeTool'
             description = 'Merges two jar files together, useful for rebuilding Retroguard stripped jars.'
             url = 'https://github.com/MinecraftForge/MergeTool'
-            
+
             PomUtils.setGitHubDetails(pom, 'MergeTool')
 
             license PomUtils.Licenses.LGPLv2_1
@@ -89,8 +97,8 @@ publishing {
             }
         }
     }
-    
+
     repositories {
-        maven gradleutils.getPublishingForgeMaven()
+        maven gradleutils.publishingForgeMaven
     }
 }

src/main/java/net/minecraftforge/mergetool/AnnotationVersion.java

@@ -1,20 +1,6 @@
 /*
- * MergeTool
- * Copyright (c) 2016-2018.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation version 2.1
- * of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (c) Forge Development LLC
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 package net.minecraftforge.mergetool;