From bf25e4e2f58f227737dcff397c34b120993f32fd Mon Sep 17 00:00:00 2001 From: Ampflower Date: Mon, 25 Sep 2023 20:22:24 -0500 Subject: [PATCH] Update to 1.20.2 --- build.gradle.kts | 5 +++-- gradle.properties | 4 ++-- gradle/libs.versions.toml | 16 +++++++++------- .../gay/ampflower/musicmoods/ClientMain.java | 5 ++--- .../gay/ampflower/musicmoods/Constants.java | 14 +++++++++++--- .../musicmoods/client/WidgetAttachment.java | 3 +-- .../textures/gui/sprites/widget/music.png | Bin 0 -> 270 bytes .../textures/gui/sprites/widget/music_hover.png | Bin 0 -> 273 bytes .../assets/music-moods/textures/gui/widgets.png | Bin 1222 -> 0 bytes src/main/resources/quilt.mod.json | 2 +- 10 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/assets/music-moods/textures/gui/sprites/widget/music.png create mode 100644 src/main/resources/assets/music-moods/textures/gui/sprites/widget/music_hover.png delete mode 100644 src/main/resources/assets/music-moods/textures/gui/widgets.png diff --git a/build.gradle.kts b/build.gradle.kts index 5abec3a..e06d356 100644 --- a/build.gradle.kts +++ b/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(",")) diff --git a/gradle.properties b/gradle.properties index 9428e60..2f84f94 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 461095e..d867a8c 100644 --- a/gradle/libs.versions.toml +++ b/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"] diff --git a/src/main/java/gay/ampflower/musicmoods/ClientMain.java b/src/main/java/gay/ampflower/musicmoods/ClientMain.java index 66a9e90..d132fec 100644 --- a/src/main/java/gay/ampflower/musicmoods/ClientMain.java +++ b/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) { diff --git a/src/main/java/gay/ampflower/musicmoods/Constants.java b/src/main/java/gay/ampflower/musicmoods/Constants.java index 5809ed3..90b45fa 100644 --- a/src/main/java/gay/ampflower/musicmoods/Constants.java +++ b/src/main/java/gay/ampflower/musicmoods/Constants.java @@ -7,6 +7,7 @@ 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; /** @@ -14,10 +15,9 @@ * @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); + } } diff --git a/src/main/java/gay/ampflower/musicmoods/client/WidgetAttachment.java b/src/main/java/gay/ampflower/musicmoods/client/WidgetAttachment.java index 1168071..e9f590a 100644 --- a/src/main/java/gay/ampflower/musicmoods/client/WidgetAttachment.java +++ b/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))); }); } diff --git a/src/main/resources/assets/music-moods/textures/gui/sprites/widget/music.png b/src/main/resources/assets/music-moods/textures/gui/sprites/widget/music.png new file mode 100644 index 0000000000000000000000000000000000000000..9b65c20a41b8301d5242cb18f987a457d9127f62 GIT binary patch literal 270 zcmV+p0rCEcP)%AY$n00xI%UGAYIC6lak&Nn~Lv0UxXCA%5NF-h-oD{!hwIdKzv5^R=>Nsycn zl7xReBokYp$|C?#4@(7H{@lfKUD?bfFe{Q`IUMyMoSii9sx+6(6a{cBH^dBpLrN^4 zEh2z%og51ZoTV-o2I#zv-Z^Fv3c9e;=B#O+@0;f7xoavexoL*au6cd(*p>UyfsD=YK&_b)FmFDWUBh=@o{O$`hT3=agwv~=;*q-y7>6`HEY(y#KcrqR&Lm^p{Ay$wzjsa zswy@%HX$J)B_(C?6TNPriuMdXLKFnWSP~cKrQ&Un>WWwuV zrpIt4kT>Ik)a?0wuF}E|TNx5`7%uReq)+PQEMVFdxMgpkeR*v8u84i+*%wb3eiOK` zjg@=Znty-(+*x^5x;d;dt5+tO>Cd7CXZBQGx4iuRtW)+Gr^djd9$R*kgj)C2QS1qKCAPux<1(k)Frwk*pStQIVN z{A8C@fO+FFTkaXVo=Y#dm=S)JXT`Iid4`NN_x1CC{VUt~?)k(VABM}{%fG+=_hws8 z+~w~pGk!}v_&qh^U(#pG18vV9CT_00h^pnR}Jj4WRU0i-0 ze5lE7rglKNP4VJ4#lL>ZT@v1FC>#JcL+ zO)`&}-fSy<_+sNe$*yFz#c`L*Eqk6w)N}YS9*V#1as1@|nLI0J+a%9tt-1S|`BF=6 z&AAl0%NI@=s~yOb2~U5#Bkpeh=ahrTSUx=dasU7K$Cr2I>|6f+wa!gDwjXt>Wj~HS zcegH40Od%96Zfkoa4Rx0J!9dRA*_(#*U(@&TsaO64O