Mod Menu crash fix + FLK 1.10.8 + update licenses (#77)

Co-authored-by: Potatoboy9999 <[email protected]>

Author: Treetrain1

build.gradle.kts

@@ -108,7 +108,7 @@ allprojects {
                 customAssets = file("$rootPath/assets").listFiles()!!.toList()
                 templatesDir = file("$rootPath/templates")
 
-                footerMessage = "© ${Year.now().value} QuiltMC"
+                footerMessage = "© ${Year.now().value} The Quilt Project"
             }
 
             doLast {

codeformat/HEADER

@@ -1,4 +1,4 @@
-Copyright ${YEAR} QuiltMC
+Copyright ${YEAR} The Quilt Project
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

core/src/main/kotlin/org/quiltmc/qkl/core/adapter/KotlinAdapter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/resources/assets/qkl_core/icon.png

@@ -16,7 +16,7 @@
         "sources": "https://github.com/quiltmc/quilt-kotlin-libraries"
       },
       "license": "Apache-2.0",
-      "icon": "assets/qkl/icon.png"
+      "icon": "assets/qkl_core/icon.png"
     },
     "intermediate_mappings": "net.fabricmc:intermediary",
     "depends": [

core/src/main/resources/quilt.mod.json

@@ -5,5 +5,5 @@ org.gradle.parallel=true
 kotlin.incremental=true
 kotlin.code.style=official
 
-version=2.1.0
-flkVersion=1.9.4
+version=2.1.1
+flkVersion=1.9.6

gradle.properties

@@ -1,15 +1,15 @@
 [versions]
-atomic = "0.20.1"
-coroutines = "1.7.1"
+atomic = "0.21.0"
+coroutines = "1.7.2"
 datetime = "0.4.0"
 dokka = "1.8.20"
-kotlin = "1.8.22"
-minecraft = "1.20"
-qsl = "6.0.1+1.20"
-quilt_loader = "0.19.0"
-quilt_mappings = "1.20+build.4"
+kotlin = "1.9.0"
+minecraft = "1.20.1"
+qsl = "6.0.4+1.20.1"
+quilt_loader = "0.19.2"
+quilt_mappings = "1.20.1+build.21"
 serialization = "1.5.1"
-serialization_plugin = "1.8.21" # usually same as kotlin but can lag behind
+serialization_plugin = "1.9.0" # usually same as kotlin but can lag behind
 binary_compat_plugin = "0.13.2"
 
 [libraries]

gradle/libs.versions.toml

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

gradle/wrapper/gradle-wrapper.properties

@@ -919,6 +919,7 @@ public final class org/quiltmc/qkl/library/serialization/ExtendedDynamicOps$Elem
 	public static final field ANY Lorg/quiltmc/qkl/library/serialization/ExtendedDynamicOps$ElementSupport;
 	public static final field PRIMITIVES Lorg/quiltmc/qkl/library/serialization/ExtendedDynamicOps$ElementSupport;
 	public static final field STRINGS Lorg/quiltmc/qkl/library/serialization/ExtendedDynamicOps$ElementSupport;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lorg/quiltmc/qkl/library/serialization/ExtendedDynamicOps$ElementSupport;
 	public static fun values ()[Lorg/quiltmc/qkl/library/serialization/ExtendedDynamicOps$ElementSupport;
 }

gradlew

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/api/library.api

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/EventRegistration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/MixinAccessors.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/blocks/BlockExtensions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/ArgumentConstructor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/ArgumentReader.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/BrigadierDsl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/CommandExecution.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/BlockArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/EntityArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/EnumArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/GameObjectArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/GeometricArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/IdentifierArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/ItemArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/MiscArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/NBTArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/PlayerArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/PrimitiveArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/RangeArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/RegistryEntryArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/ScoreboardArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/StringArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/TestingArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/argument/TextArguments.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/util/RequiredChain.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/brigadier/util/ServerCommandUtil.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/client/lifecycle/ClientEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/client/networking/ClientEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/client/resource/ResourceLoaderEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/client/screen/ScreenEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/client/tooltip/TooltipEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/commands/CommandRegistration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/crash/CrashEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 QuiltMC
+ * Copyright 2022 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/items/ItemSettings.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/lifecycle/ServerEvents.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector2dOps.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector2fOps.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector2iOps.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector3dOps.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector3fOps.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

library/src/main/kotlin/org/quiltmc/qkl/library/math/JomlVector3iOps.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 QuiltMC
+ * Copyright 2023 The Quilt Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.