Update to 1.20.2

build.gradle.kts

@@ -42,6 +42,7 @@ java {
 }
 
 repositories {
+	mavenLocal()
 	mavenCentral()
 	maven("https://oss.sonatype.org/content/repositories/snapshots") {
 		name = "Nexus Repository OSS"
@@ -124,8 +125,8 @@ modrinth {
 	)
 	val ref = System.getenv("GITHUB_REF")
 	changelog.set(
-		System.getenv("CHANGELOG") ?: if (ref != null && ref.startsWith("refs/tags/")) "You may view the changelog at https://github.com/the-glitch-network/music-moods/releases/tag/${URLEncoder.encode(ref.substring(10), StandardCharsets.UTF_8)}"
-		else "No changelog is available. Perhaps poke at https://github.com/the-glitch-network/music-moods for a changelog?"
+		System.getenv("CHANGELOG") ?: if (ref != null && ref.startsWith("refs/tags/")) "You may view the changelog at https://github.com/Modflower/music-moods/releases/tag/${URLEncoder.encode(ref.substring(10), StandardCharsets.UTF_8)}"
+		else "No changelog is available. Perhaps poke at https://github.com/Modflower/music-moods for a changelog?"
 	)
 	uploadFile.set(tasks.remapJar.get())
 	gameVersions.set(minecraftCompatible.split(","))

gradle.properties

@@ -3,6 +3,6 @@ org.gradle.jvmargs=-Xmx1G
 
 # Your project's version
 group=gay.ampflower
-projectVersion=0.3.2
+projectVersion=0.3.3
 modrinthId=z23qey0b
-minecraftCompatible=1.20,1.20.1
+minecraftCompatible=1.20.2

gradle/libs.versions.toml

@@ -2,14 +2,15 @@
 annotations = "23.0.0"
 
 # https://github.com/LambdAurora/SpruceUI
-spruceui = "5.0.0+1.20"
-modmenu = "7.0.1"
+spruceui = "5.0.3+1.20.2"
+modmenu = "8.0.+"
 
 # Minecraft
-minecraft_version = "1.20"
-minecraft_required = '>=1.20", "<=1.20.1'
-quilt_loader = "0.18.+"
-quilted_fabric_api = "7.2.1+0.88.0-1.20.1"
+minecraft_version = "1.20.2"
+minecraft_required = '>=1.20.2'
+quilt_loader = "0.20.+"
+# quilted_fabric_api = "7.2.1+0.88.0-1.20.1"
+fabric_api = "0.89.1+1.20.2"
 
 # Plugins
 loom = "1.+"
@@ -28,7 +29,8 @@ annotations = { module = "org.jetbrains:annotations", version.ref = "annotations
 # Mods
 spruceui = { module = "dev.lambdaurora:spruceui", version.ref = "spruceui" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" }
+# quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" }
+quilted_fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 
 [bundles]
 compileOnly = ["annotations"]

src/main/java/gay/ampflower/musicmoods/ClientMain.java

@@ -6,9 +6,8 @@
 
 package gay.ampflower.musicmoods;// Created 2023-12-01T02:08:34
 
-import org.quiltmc.loader.api.ModContainer;
+import net.fabricmc.api.ClientModInitializer;
 import org.quiltmc.loader.api.QuiltLoader;
-import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
 
 import java.io.IOException;
 
@@ -20,7 +19,7 @@ public class ClientMain implements ClientModInitializer {
 	public static boolean isModMenuPresent = QuiltLoader.isModLoaded("modmenu");
 
 	@Override
-	public void onInitializeClient(final ModContainer mod) {
+	public void onInitializeClient() {
 		try {
 			Config.read();
 		} catch (IOException ioe) {

src/main/java/gay/ampflower/musicmoods/Constants.java

@@ -7,17 +7,17 @@
 package gay.ampflower.musicmoods;// Created 2023-16-01T21:35:22
 
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.WidgetSprites;
 import net.minecraft.resources.ResourceLocation;
 
 /**
  * @author Ampflower
  * @since 0.0.0
  **/
 public final class Constants {
-	public static final ResourceLocation moodsResource = new ResourceLocation("music-moods",
-			"textures/gui/widgets.png");
+	public static final String modId = "music-moods";
 
-	public static final int atlasSize = 256;
+	public static final WidgetSprites musicSprites = widgetHoverable("music");
 
 	public static final int buttonHeight = Button.DEFAULT_HEIGHT;
 	public static final int buttonWidth = Button.DEFAULT_WIDTH;
@@ -29,4 +29,12 @@ public final class Constants {
 
 	public static final int primaryButtonLeftOffset = buttonWidth + twoColumnButtonOffset;
 	public static final int primaryButtonRightOffset = primaryButtonLeftOffset + twoColumnButtonOffset;
+
+	public static WidgetSprites widgetHoverable(String widget) {
+		return new WidgetSprites(widget(widget), widget(widget + "_hover"));
+	}
+
+	public static ResourceLocation widget(String widget) {
+		return new ResourceLocation(modId, "widget/" + widget);
+	}
 }

src/main/java/gay/ampflower/musicmoods/client/WidgetAttachment.java

@@ -32,8 +32,7 @@ public static void init(final Minecraft minecraft) {
 			final int x = deriveX(widget, first, Constants.smallButtonWidth, Constants.smallButtonPlacementOffset);
 			final int y = widget.getY();
 
-			return new ImageButton(x, y, Constants.smallButtonWidth, Constants.smallButtonWidth, 0, 0,
-					Constants.smallButtonWidth, Constants.moodsResource, Constants.atlasSize, Constants.atlasSize,
+			return new ImageButton(x, y, Constants.smallButtonWidth, Constants.smallButtonWidth, Constants.musicSprites,
 					button -> minecraft.setScreen(new ConfigurationScreen(minecraft.screen)));
 		});
 	}

src/main/resources/quilt.mod.json

@@ -19,7 +19,7 @@
 			"icon": "assets/music-moods/pack.png"
 		},
 		"entrypoints": {
-			"client_init": [
+			"client": [
 				"gay.ampflower.musicmoods.ClientMain"
 			],
 			"modmenu": [