From d21556a4daf2e8a4722eda38b28042f4855f0e2b Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Mon, 29 Jan 2024 12:27:45 -0800
Subject: [PATCH] Update licenser plugin, and re-run it. Closes #9855

---
 build.gradle                                                 | 2 +-
 build_clean.gradle                                           | 1 -
 build_forge.gradle                                           | 2 +-
 fmlcore/build.gradle                                         | 2 +-
 fmlearlydisplay/build.gradle                                 | 2 +-
 fmlloader/build.gradle                                       | 2 +-
 .../minecraftforge/fml/loading/targets/ForgeDevLocator.java  | 5 +++++
 .../fml/loading/targets/ForgeUserdevLocator.java             | 5 +++++
 .../net/minecraftforge/fml/loading/targets/UnionHelper.java  | 5 +++++
 fmlloader/src/main/resources/log4j2.xml                      | 5 +++++
 javafmllanguage/build.gradle                                 | 2 +-
 lowcodelanguage/build.gradle                                 | 2 +-
 mclanguage/build.gradle                                      | 2 +-
 13 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 916f59cb54..9b42cfb165 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import net.minecraftforge.forge.tasks.*
 import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1'
+    id 'net.minecraftforge.licenser' version '1.0.1'
     id 'com.github.ben-manes.versions' version '0.46.0'
     id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)'
     id 'eclipse'
diff --git a/build_clean.gradle b/build_clean.gradle
index 29c4ab776c..5853765f72 100644
--- a/build_clean.gradle
+++ b/build_clean.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'java-library'
-    id 'org.cadixdev.licenser'
     id 'net.minecraftforge.gradle.patcher'
 }
 
diff --git a/build_forge.gradle b/build_forge.gradle
index e45077388a..0a8048f5ed 100644
--- a/build_forge.gradle
+++ b/build_forge.gradle
@@ -23,7 +23,7 @@ plugins {
     id 'eclipse'
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'de.undercouch.download'
     id 'net.minecraftforge.gradleutils'
     id 'net.minecraftforge.gradle.patcher'
diff --git a/fmlcore/build.gradle b/fmlcore/build.gradle
index b51c10c3b1..77dde4150c 100644
--- a/fmlcore/build.gradle
+++ b/fmlcore/build.gradle
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
diff --git a/fmlearlydisplay/build.gradle b/fmlearlydisplay/build.gradle
index 0363ab405f..7582e49aa7 100644
--- a/fmlearlydisplay/build.gradle
+++ b/fmlearlydisplay/build.gradle
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
diff --git a/fmlloader/build.gradle b/fmlloader/build.gradle
index 164d6fb7ab..e91b2be9ba 100644
--- a/fmlloader/build.gradle
+++ b/fmlloader/build.gradle
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java
index 2267a2f063..30e3653f0d 100644
--- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java
+++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;
 
 import java.io.IOException;
diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java
index c333a28b9c..6f86c6060b 100644
--- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java
+++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;
 
 import java.util.List;
diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java
index d4475212f3..220a8bea09 100644
--- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java
+++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+
 package net.minecraftforge.fml.loading.targets;
 
 import java.io.IOException;
diff --git a/fmlloader/src/main/resources/log4j2.xml b/fmlloader/src/main/resources/log4j2.xml
index d7ef415f85..fb838a071f 100644
--- a/fmlloader/src/main/resources/log4j2.xml
+++ b/fmlloader/src/main/resources/log4j2.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) Forge Development LLC and contributors
+    SPDX-License-Identifier: LGPL-2.1-only
+-->
+
 <Configuration status="warn" packages="net.minecrell.terminalconsole,net.minecrell.terminalconsole.util,com.mojang.util,cpw.mods.modlauncher.log,net.minecraftforge.fml.loading.log4j" shutdownHook="disable">
     <filters>
         <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="NEUTRAL"/>
diff --git a/javafmllanguage/build.gradle b/javafmllanguage/build.gradle
index 1f4167c596..eaa4f3e9b2 100644
--- a/javafmllanguage/build.gradle
+++ b/javafmllanguage/build.gradle
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
diff --git a/lowcodelanguage/build.gradle b/lowcodelanguage/build.gradle
index 0bbb914c0e..7ef9c41aac 100644
--- a/lowcodelanguage/build.gradle
+++ b/lowcodelanguage/build.gradle
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }
 
diff --git a/mclanguage/build.gradle b/mclanguage/build.gradle
index 47612b815c..293fda17f8 100644
--- a/mclanguage/build.gradle
+++ b/mclanguage/build.gradle
@@ -3,7 +3,7 @@ import net.minecraftforge.gradleutils.PomUtils
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser'
+    id 'net.minecraftforge.licenser'
     id 'net.minecraftforge.gradleutils'
 }