Fix license copy

.gitattributes

@@ -1,6 +1,9 @@
 #
 # https://help.github.com/articles/dealing-with-line-endings/
 #
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
 # Linux start script should use lf
 /gradlew        text eol=lf
 

.gitignore

@@ -27,4 +27,4 @@ gale-server/src/minecraft
 paper-api
 paper-api-generator
 paper-server
-paper-api-generator.settings.gradle
+paper-api-generator.settings.gradle.kts

build.gradle.kts

@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.11"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.12"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -91,42 +91,3 @@ tasks.register("printGaleVersion") { // Gale - branding changes
         println(project.version)
     }
 }
-
-// Gale start - branding changes - package license into jar
-// Based on io.papermc.paperweight.taskcontainers.PaperclipTasks
-/*
-tasks.named("createMojmapBundlerJar") {
-    doLast {
-
-        // Based on io.papermc.paperweight.taskcontainers.PaperclipTasks
-        val jarName = listOfNotNull(
-            project.name,
-            "paperclip",
-            project.version,
-            "mojmap"
-        ).joinToString("-") + ".jar"
-
-        // Based on io.papermc.paperweight.taskcontainers.PaperclipTasks
-        val zipFile = layout.buildDirectory.file("libs/$jarName").path
-
-        val rootDir = io.papermc.paperweight.util.findOutputDir(zipFile)
-
-        try {
-            io.papermc.paperweight.util.unzip(zipFile, rootDir)
-
-            val licenseFileName = "LICENSE.txt"
-            project(":gale-server").projectDir.resolve(licenseFileName)
-                .copyTo(rootDir.resolve(licenseFileName).toFile())
-
-            io.papermc.paperweight.util.ensureDeleted(zipFile)
-
-            io.papermc.paperweight.util.zip(rootDir, zipFile)
-        } finally {
-            @OptIn(kotlin.io.path.ExperimentalPathApi::class)
-            rootDir.deleteRecursively()
-        }
-
-    }
-}
- */
-// Gale end - branding changes - package license into jar

gale-server/build.gradle.kts.patch

@@ -102,7 +102,7 @@
  
      doFirst {
          workingDir.mkdirs()
-@@ -330,3 +_,22 @@
+@@ -330,3 +_,62 @@
      classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
      mainClass.set(null as String?)
  }
@@ -125,3 +125,43 @@
 +    }
 +}
 +// Gale end - package license into jar
++
++// Gale start - branding changes - package license into jar
++// Based on io.papermc.paperweight.core.taskcontainers.PaperclipTasks
++tasks.named("createMojmapPaperclipJar") {
++    val name = rootProject.name
++    val version = project.version
++    val licenseFileName = "LICENSE.txt"
++    val licenseFilePath = layout.projectDirectory.dir("../paper-server/src/main/resources/$licenseFileName").asFile
++
++    // Based on io.papermc.paperweight.core.taskcontainers.PaperclipTasks
++    val jarName = listOfNotNull(
++        name,
++        "paperclip",
++        version,
++        "mojmap"
++    ).joinToString("-") + ".jar"
++
++    // Based on io.papermc.paperweight.core.taskcontainers.PaperclipTasks
++    val zipFile = layout.buildDirectory.file("libs/$jarName").get().path
++
++    val rootDir = findOutputDir(zipFile)
++
++    doLast {
++
++        try {
++            unzip(zipFile, rootDir)
++
++            licenseFilePath.copyTo(rootDir.resolve(licenseFileName).toFile())
++
++            ensureDeleted(zipFile)
++
++            zip(rootDir, zipFile)
++        } finally {
++            @OptIn(kotlin.io.path.ExperimentalPathApi::class)
++            rootDir.toFile().deleteRecursively()
++        }
++
++    }
++}
++// Gale end - branding changes - package license into jar

gale-server/paper-patches/features/0001-Gale-branding-changes.patch

@@ -181,45 +181,6 @@ index 65c5ca88a67c30becee01c5a8816d964b03862f9..00000000000000000000000000000000
 -apply, that proxy's public statement of acceptance of any version is
 -permanent authorization for you to choose that version for the
 -Library.
-diff --git a/LICENCE.txt b/LICENSE.txt
-similarity index 99%
-rename from LICENCE.txt
-rename to LICENSE.txt
-index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898e26fcf2a 100644
---- a/LICENCE.txt
-+++ b/LICENSE.txt
-@@ -1,7 +1,7 @@
-                     GNU GENERAL PUBLIC LICENSE
-                        Version 3, 29 June 2007
- 
-- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
-@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
-     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 <http://www.gnu.org/licenses/>.
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- 
- Also add information on how to contact you by electronic and paper mail.
- 
-@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
-   You should also get your employer (if you work as a programmer) or school,
- if any, to sign a "copyright disclaimer" for the program, if necessary.
- For more information on this, and how to apply and follow the GNU GPL, see
--<http://www.gnu.org/licenses/>.
-+<https://www.gnu.org/licenses/>.
- 
-   The GNU General Public License does not permit incorporating your program
- into proprietary programs.  If your program is a subroutine library, you
- may consider it more useful to permit linking proprietary applications with
- the library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.  But first, please read
--<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..2beea17d87464683faaefa835206f2654df9bde0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -496,6 +457,45 @@ index a9339f59f81dff307317ae4afdff0dc296febcc9..64e3c7bd0a1ff93dd87e688f9e49e213
                  }
  
                  logger.log(Level.SEVERE, "------------------------------");
+diff --git a/LICENCE.txt b/src/main/resources/LICENSE.txt
+similarity index 99%
+rename from LICENCE.txt
+rename to src/main/resources/LICENSE.txt
+index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898e26fcf2a 100644
+--- a/LICENCE.txt
++++ b/src/main/resources/LICENSE.txt
+@@ -1,7 +1,7 @@
+                     GNU GENERAL PUBLIC LICENSE
+                        Version 3, 29 June 2007
+ 
+- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
++ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
+     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 <http://www.gnu.org/licenses/>.
++    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
+ Also add information on how to contact you by electronic and paper mail.
+ 
+@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
+   You should also get your employer (if you work as a programmer) or school,
+ if any, to sign a "copyright disclaimer" for the program, if necessary.
+ For more information on this, and how to apply and follow the GNU GPL, see
+-<http://www.gnu.org/licenses/>.
++<https://www.gnu.org/licenses/>.
+ 
+   The GNU General Public License does not permit incorporating your program
+ into proprietary programs.  If your program is a subroutine library, you
+ may consider it more useful to permit linking proprietary applications with
+ the library.  If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.  But first, please read
+-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
++<https://www.gnu.org/philosophy/why-not-lgpl.html>.
 diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png
 index 8b924977b7886df9ab8790b1e4ff9b1c04a2af45..e7e9fd9a6077535b89c6c9d7b0164e8b87c54bed 100644
 GIT binary patch