Merge upstream.

library/core/crash-info/build.gradle → library/core/crash_info/build.gradle

@@ -3,10 +3,10 @@ plugins {
 }
 
 qslModule {
-	moduleName = "crash-info"
+	moduleName = "crash_info"
 	version = "1.0.0"
 	library = "core"
 	coreDependencies([
-		"qsl-base"
+		"qsl_base"
 	])
 }

library/core/lifecycle-events/build.gradle → library/core/lifecycle_events/build.gradle

@@ -3,10 +3,10 @@ plugins {
 }
 
 qslModule {
-	moduleName = "lifecycle-events"
+	moduleName = "lifecycle_events"
 	version = "1.0.0"
 	library = "core"
 	coreApiDependencies([
-			"qsl-base"
+			"qsl_base"
 	])
 }

library/core/qsl-base/build.gradle → library/core/qsl_base/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 qslModule {
-	moduleName = "qsl-base"
+	moduleName = "qsl_base"
 	version = "1.0.0"
 	library = "core"
 }

library/core/resource-loader/build.gradle → library/core/resource_loader/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 qslModule {
-	moduleName = "resource-loader"
+	moduleName = "resource_loader"
 	version = "1.0.0"
 	library = "core"
 }

library/core/resource-loader/src/main/java/org/quiltmc/qsl/resource/loader/api/GroupResourcePack.java → library/core/resource_loader/src/main/java/org/quiltmc/qsl/resource/loader/api/GroupResourcePack.java

@@ -151,8 +151,8 @@ public static class Wrapped extends GroupResourcePack {
 		 * @param type         the resource type of this resource pack
 		 * @param basePack     the base resource pack
 		 * @param packs        the additional packs
-		 * @param basePriority {@code true} if the base resource pack has priority over the additional packs, else {@code false}.
-		 *                     Ignored if the base resource pack is already present in the list.
+		 * @param basePriority {@code true} if the base resource pack has priority over the additional packs, otherwise {@code false}.
+		 *                     Ignored if the base resource pack is already present in the list
 		 */
 		public Wrapped(ResourceType type, ResourcePack basePack, List<ResourcePack> packs, boolean basePriority) {
 			super(type, addToPacksIfNeeded(basePack, packs, basePriority));

library/core/resource-loader/src/main/java/org/quiltmc/qsl/resource/loader/api/ResourceLoader.java → library/core/resource_loader/src/main/java/org/quiltmc/qsl/resource/loader/api/ResourceLoader.java

@@ -58,7 +58,7 @@ static ResourceLoader get(ResourceType type) {
 	 * <p>
 	 * Why and when to use it?
 	 * A built-in resource pack should be used to provide extra assets/data that should be optional with your mod but still directly provided by it.
-	 * For example it could provide textures of your mod in another resolution, or could allow to provide different styles of your assets.
+	 * For example, it could provide textures of your mod in another resolution, or could allow providing different styles of your assets.
 	 *
 	 * <p>
 	 * The path in which the resource pack is located is in the mod JAR file under the {@code "resourcepacks/<id path>"} directory.
@@ -69,7 +69,7 @@ static ResourceLoader get(ResourceType type) {
 	 *
 	 * @param id             the identifier of the resource pack, its namespace must be the same as the mod id
 	 * @param activationType the activation type of the resource pack
-	 * @return {@code true} if successfully registered the resource pack, else {@code false}
+	 * @return {@code true} if successfully registered the resource pack, otherwise {@code false}
 	 * @throws IllegalArgumentException if a mod with the corresponding namespace given in id cannot be found
 	 * @see #registerBuiltinResourcePack(Identifier, ModContainer, ResourcePackActivationType)
 	 */
@@ -89,7 +89,7 @@ static boolean registerBuiltinResourcePack(Identifier id, ResourcePackActivation
 	 * <p>
 	 * Why and when to use it?
 	 * A built-in resource pack should be used to provide extra assets/data that should be optional with your mod but still directly provided by it.
-	 * For example it could provide textures of your mod in another resolution, or could allow to provide different styles of your assets.
+	 * For example, it could provide textures of your mod in another resolution, or could allow providing different styles of your assets.
 	 *
 	 * <p>
 	 * The path in which the resource pack is located is in the mod JAR file under the {@code "resourcepacks/<id path>"} directory.
@@ -98,7 +98,7 @@ static boolean registerBuiltinResourcePack(Identifier id, ResourcePackActivation
 	 * @param id             the identifier of the resource pack
 	 * @param container      the mod container
 	 * @param activationType the activation type of the resource pack
-	 * @return {@code true} if successfully registered the resource pack, else {@code false}
+	 * @return {@code true} if successfully registered the resource pack, otherwise {@code false}
 	 * @see #registerBuiltinResourcePack(Identifier, ResourcePackActivationType)
 	 */
 	static boolean registerBuiltinResourcePack(Identifier id, ModContainer container,

library/core/resource-loader/src/main/java/org/quiltmc/qsl/resource/loader/api/ResourcePackActivationType.java → library/core/resource_loader/src/main/java/org/quiltmc/qsl/resource/loader/api/ResourcePackActivationType.java

@@ -36,7 +36,7 @@ public enum ResourcePackActivationType {
 	/**
 	 * Returns whether this resource pack will be enabled by default or not.
 	 *
-	 * @return {@code true} if enabled by default, else {@code false}
+	 * @return {@code true} if enabled by default, otherwise {@code false}
 	 */
 	public boolean isEnabledByDefault() {
 		return this == DEFAULT_ENABLED || this == ALWAYS_ENABLED;

library/core/resource-loader/src/main/java/org/quiltmc/qsl/resource/loader/api/reloader/IdentifiableResourceReloader.java → library/core/resource_loader/src/main/java/org/quiltmc/qsl/resource/loader/api/reloader/IdentifiableResourceReloader.java

@@ -25,7 +25,7 @@
 /**
  * Interface for "identifiable" resource reloaders.
  *
- * <p>"Identifiable" resource reloaders have an unique identifier, which can be depended on,
+ * <p>"Identifiable" resource reloaders have a unique identifier, which can be depended on,
  * and can provide dependencies that they would like to see executed before themselves.
  *
  * @see ResourceReloaderKeys

library/core/resource-loader/src/main/java/org/quiltmc/qsl/resource/loader/impl/ModNioResourcePack.java → library/core/resource_loader/src/main/java/org/quiltmc/qsl/resource/loader/impl/ModNioResourcePack.java

@@ -99,7 +99,7 @@ protected InputStream openFile(String filename) throws IOException {
 		}
 
 		// FileNotFoundException is an IOException, which is properly handled by the Vanilla resource loader and
-		// prints to logs.
+		// prints to the logs.
 		throw new FileNotFoundException("\"" + filename + "\" in Quilt mod \"" + modInfo.getId() + "\"");
 	}
 

library/core/resource-loader/src/main/java/org/quiltmc/qsl/resource/loader/impl/ModResourcePackProvider.java → library/core/resource_loader/src/main/java/org/quiltmc/qsl/resource/loader/impl/ModResourcePackProvider.java

@@ -49,7 +49,7 @@ public ModResourcePackProvider(ResourceType type) {
 	/**
 	 * Registers the resource packs.
 	 *
-	 * @param consumer The resource pack profile consumer.
+	 * @param consumer the resource pack profile consumer
 	 */
 	public void register(Consumer<ResourcePackProfile> consumer) {
 		this.register(consumer, this.factory);

library/data/tags/build.gradle

@@ -7,11 +7,11 @@ qslModule {
 	version = "1.0.0"
 	library = "data"
 	coreDependencies([
-			"resource-loader"
+			"resource_loader"
 	])
 	coreTestmodDependencies([
-			"qsl-base",
-			"lifecycle-events"
+			"qsl_base",
+			"lifecycle_events"
 	])
 }