Merge pull request #5 from PillowMC/update/fml3.0.19-ql0.26.0-beta.1

Update to FML 3.0.19 and Quilt Loader 0.26.0-beta.1

HEADER

@@ -0,0 +1,2 @@
+Copyright (c) PillowMC and contributors
+SPDX-License-Identifier: LGPL-2.1-only

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 
-version = "0.3.0"
+version = "0.3.1"
 group = 'net.pillowmc' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'pillow'
 
@@ -16,9 +16,9 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 
 license {
-    rule project.rootProject.file("LICENSE")
+    rule project.rootProject.file("HEADER")
     include '**/*.java'
-    exclude '**/*/urlhandler/**/*.java'
+    exclude '**/copied/*.java'
 }
 
 java {
@@ -64,12 +64,12 @@ configurations {
 }
 
 dependencies {
-    implementation "net.neoforged.fancymodloader:loader:3.0.15"
-    implementation "cpw.mods:modlauncher:10.0.10"
-    implementation "cpw.mods:securejarhandler:2.1.31"
+    implementation "net.neoforged.fancymodloader:loader:3.0.19"
+    implementation "cpw.mods:modlauncher:11.0.2"
+    implementation "cpw.mods:securejarhandler:3.0.4"
     implementation "org.jetbrains:annotations:24.1.0"
-    api "net.fabricmc:sponge-mixin:0.12.5+mixin.0.8.5"
-    api ("org.quiltmc:quilt-loader:0.25.0") {
+    api "net.fabricmc:sponge-mixin:0.13.1+mixin.0.8.5"
+    api ("org.quiltmc:quilt-loader:0.26.0-beta.1") {
         exclude group: "org.ow2.asm"
     }
     api "net.fabricmc:tiny-mappings-parser:0.3.0+build.17"

genprismpatch.sh

@@ -1,12 +1,13 @@
 #!/bin/sh
-SJH_VERSION=2.1.31
-BSL_VERSION=1.1.2
+SJH_VERSION=3.0.4
+BSL_VERSION=2.0.0
 JJFS_VERSION=0.4.0
 ASM_VERSION=9.5
 MC_VERSION=1.20.6
 NEOFORM_VERSION=20240429.153634
-FML_VERSION=3.0.15
+FML_VERSION=3.0.19
 NEOFORGE_VERSION=20.6.1-beta
+QUILT_LOADER_VERSION=0.26.0-beta.1
 PILLOW_LOADER_VERSION=`sed -rn "s#version \= \"(.*)\"#\1#p" build.gradle`
 read -rp "Please input PrismLauncher path (default to ~/.local/share/PrismLauncher):" PRISM_PATH
 if [ -z $PRISM_PATH ]; then

src/main/java/net/pillowmc/pillow/PillowGameProvider.java

@@ -1,25 +1,6 @@
 /*
- * MIT License
- *
- * Copyright (c) 2024 PillowMC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) PillowMC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.pillowmc.pillow;

src/main/java/net/pillowmc/pillow/PillowLogCategory.java

@@ -1,25 +1,6 @@
 /*
- * MIT License
- *
- * Copyright (c) 2024 PillowMC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) PillowMC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.pillowmc.pillow;

src/main/java/net/pillowmc/pillow/Utils.java

@@ -1,25 +1,6 @@
 /*
- * MIT License
- *
- * Copyright (c) 2024 PillowMC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) PillowMC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.pillowmc.pillow;

src/main/java/net/pillowmc/pillow/asm/ClientEntryPointTransformer.java

@@ -1,25 +1,6 @@
 /*
- * MIT License
- *
- * Copyright (c) 2024 PillowMC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) PillowMC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
  */
 
 package net.pillowmc.pillow.asm;