Sync with Framework

NOTICE

@@ -0,0 +1,16 @@
+${project_name}
+Copyright (C) 2023 Bstn1802
+Copyright (C) 2024 ${owner_name}
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.

README.md

@@ -2,7 +2,7 @@
 
 <img alt="Icon" width=100 src="https://raw.githubusercontent.com/TerminalMC/AutoReconnect/HEAD/common/src/main/resources/assets/autoreconnectrf/icon.png">
 
-## AutoReconnect-Reforged
+## AutoReconnect (Reforged)
 
 A multi-loader update of Bstn1802's [AutoReconnect](https://github.com/Bstn1802/AutoReconnect).
 
@@ -32,7 +32,7 @@ NeoForge: [YACL](https://modrinth.com/mod/1eAoo2KR)
 
 ### Credits
 
-AutoReconnect-Reforged is based on AutoReconnect by Bstn1802, and includes code reused under license.
+AutoReconnect (Reforged) is based on AutoReconnect by Bstn1802, and includes code reused under license.
 
 Bstn1802's AutoReconnect is available on [Modrinth](https://modrinth.com/mod/A9rziLV4) and [GitHub](https://github.com/Bstn1802/AutoReconnect).
 

build.gradle

@@ -5,12 +5,28 @@ plugins {
     id("net.darkhax.curseforgegradle") version("${curseforgegradle_version}")
     id("com.github.breadmoirai.github-release") version("${githubrelease_version}")
     id("org.ajoberstar.grgit.service") version("${grgitservice_version}")
+    id("org.cadixdev.licenser") version("${licenser_version}")
 }
 
 subprojects {
     version = mod_version
     group = mod_group
 
+    // License headers
+    apply(plugin: "org.cadixdev.licenser")
+    license {
+        // This can be done in multiloader-common.gradle but only if the
+        // "matching" method is not used (throws a pile of weird errors).
+        // Also, NeoForge's update of the plugin can't handle matching at all.
+        include("**/*.java") // Java files only
+        header = rootProject.file("NOTICE")
+        properties {
+            project_name = mod_name
+            owner_name = mod_owner
+            year = java.time.LocalDate.now().getYear().toString()
+        }
+    }
+
     // Publishing
     if (name != "common") {
         apply(plugin: "com.modrinth.minotaur")
@@ -63,7 +79,7 @@ subprojects {
                 file.displayName = "v${mod_version}-${capsLoader(module)}-${minecraft_version}"
                 file.releaseType = release_type
                 file.changelog = rootProject.file("changelog.md").text
-                file.changelogType = 'markdown'
+                file.changelogType = "markdown"
                 project.property("release_mod_loaders_${module}").split(",").each { String id ->
                     file.addModLoader(id)
                 }

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 base {
-    archivesName = "${mod_id}-${project.name}-${minecraft_version}"
+    archivesName = "${mod_id}-${project.name}"
 }
 
 java {
@@ -19,24 +19,24 @@ repositories {
     exclusiveContent {
         forRepository {
             maven {
-                name = 'Sponge'
-                url = 'https://repo.spongepowered.org/repository/maven-public'
+                name = "Sponge"
+                url = "https://repo.spongepowered.org/repository/maven-public"
             }
         }
-        filter { includeGroupAndSubgroups('org.spongepowered') }
+        filter { includeGroupAndSubgroups("org.spongepowered") }
     }
     exclusiveContent {
         forRepositories(
-                maven {
-                    name = 'ParchmentMC'
-                    url = 'https://maven.parchmentmc.org/'
-                },
-                maven {
-                    name = "NeoForge"
-                    url = 'https://maven.neoforged.net/releases'
-                }
+            maven {
+                name = "ParchmentMC"
+                url = "https://maven.parchmentmc.org"
+            },
+            maven {
+                name = "NeoForge"
+                url = "https://maven.neoforged.net/releases"
+            }
         )
-        filter { includeGroup('org.parchmentmc.data') }
+        filter { includeGroup("org.parchmentmc.data") }
     }
     maven {
         name = "Modrinth"
@@ -99,7 +99,6 @@ processResources {
             "mod_authors_string": mod_authors.replace(",", ", "),
             "mod_contributors_string": mod_contributors.replace(",", ", "),
             "mod_license": mod_license,
-            "mod_environment": mod_environment,
             // Links
             "homepage_url": homepage_url,
             "sources_url": sources_url,

changelog.md

@@ -1 +1 @@
-- Fix config on recent NeoForge versions
+- Initial full release

common/src/main/java/dev/terminalmc/autoreconnectrf/AutoReconnect.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf;
@@ -39,7 +45,7 @@
 
 public class AutoReconnect {
     public static final String MOD_ID = "autoreconnectrf";
-    public static final String MOD_NAME = "AutoReconnect-Reforged";
+    public static final String MOD_NAME = "AutoReconnect";
     public static final ModLogger LOG = new ModLogger(MOD_NAME);
 
     // Condition vars

common/src/main/java/dev/terminalmc/autoreconnectrf/config/Config.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.config;

common/src/main/java/dev/terminalmc/autoreconnectrf/gui/screen/ConfigScreenProvider.java

@@ -1,6 +1,20 @@
 /*
- * Copyright 2024 NotRyken
- * SPDX-License-Identifier: LGPL-3.0-only
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.gui.screen;

common/src/main/java/dev/terminalmc/autoreconnectrf/gui/screen/YaclScreenProvider.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.gui.screen;

common/src/main/java/dev/terminalmc/autoreconnectrf/mixin/MixinClientPacketListener.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.mixin;

common/src/main/java/dev/terminalmc/autoreconnectrf/mixin/MixinConnectScreen.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.mixin;

common/src/main/java/dev/terminalmc/autoreconnectrf/mixin/MixinDisconnectedRealmsScreen.java

@@ -1,3 +1,22 @@
+/*
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package dev.terminalmc.autoreconnectrf.mixin;
 
 import dev.terminalmc.autoreconnectrf.AutoReconnect;

common/src/main/java/dev/terminalmc/autoreconnectrf/mixin/MixinDisconnectedScreen.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.mixin;

common/src/main/java/dev/terminalmc/autoreconnectrf/mixin/MixinMinecraft.java

@@ -1,14 +1,20 @@
 /*
- * AutoReconnect-Reforged
+ * AutoReconnect
+ * Copyright (C) 2023 Bstn1802
+ * Copyright (C) 2024 TerminalMC
  *
- * Copyright 2020-2023 Bstn1802
- * Copyright 2024 NotRyken
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * The following code is a derivative work of the code from the AutoReconnect
- * project, which is licensed LGPLv3. This code therefore is also licensed under
- * the terms of the GNU Lesser Public License, version 3.
+ * This program 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 General Public License for more details.
  *
- * SPDX-License-Identifier: LGPL-3.0-only
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package dev.terminalmc.autoreconnectrf.mixin;