From 3ea1a29af05d650e16710c6d5684346ee0542729 Mon Sep 17 00:00:00 2001 From: TexTrue <3140846162@qq.com> Date: Tue, 5 Sep 2023 19:50:28 +0800 Subject: [PATCH] don't display test button on title screen --- build.gradle | 3 +- gradle.properties | 4 +-- .../spruceui/test/SpruceUITest.java | 4 +++ .../spruceui/test/mixin/TitleScreenMixin.java | 35 ------------------- src/main/resources/META-INF/mods.toml | 2 ++ src/main/resources/spruceui.test.mixins.json | 11 ------ 6 files changed, 9 insertions(+), 50 deletions(-) delete mode 100644 src/main/java/dev/lambdaurora/spruceui/test/mixin/TitleScreenMixin.java delete mode 100644 src/main/resources/spruceui.test.mixins.json diff --git a/build.gradle b/build.gradle index 746bd61..31cc5c3 100644 --- a/build.gradle +++ b/build.gradle @@ -19,13 +19,12 @@ String getMCVersionString() { loom { forge { mixinConfigs = [ - "spruceui.mixins.json","spruceui.test.mixins.json" + "spruceui.mixins.json" ] } } repositories { - mavenLocal() maven { name = "QuiltMC" url = "https://maven.quiltmc.org/repository/release" diff --git a/gradle.properties b/gradle.properties index de69824..7669a54 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ quilt_mappings=1.18.2+build.26 forge_version=1.18.2-40.2.10 # Mod Properties -mod_version = 0.1.2 -maven_group = dev.lambdaurora +mod_version = 0.1.3 +maven_group = org.thinkingstudio archives_base_name = obsidianui # Dependencies diff --git a/src/main/java/dev/lambdaurora/spruceui/test/SpruceUITest.java b/src/main/java/dev/lambdaurora/spruceui/test/SpruceUITest.java index 82c2f98..f824846 100644 --- a/src/main/java/dev/lambdaurora/spruceui/test/SpruceUITest.java +++ b/src/main/java/dev/lambdaurora/spruceui/test/SpruceUITest.java @@ -9,8 +9,11 @@ package dev.lambdaurora.spruceui.test; +import dev.architectury.platform.Platform; import dev.architectury.utils.EnvExecutor; +import dev.lambdaurora.spruceui.SpruceUI; import dev.lambdaurora.spruceui.option.*; +import dev.lambdaurora.spruceui.test.gui.SpruceMainMenuScreen; import dev.lambdaurora.spruceui.widget.container.SpruceOptionListWidget; import dev.lambdaurora.spruceui.Position; import dev.lambdaurora.spruceui.SpruceTexts; @@ -134,6 +137,7 @@ public SpruceUITest() { } public void onInitializeClient() { + Platform.getMod(SpruceUI.MODID).registerConfigurationScreen(SpruceMainMenuScreen::new); INSTANCE = this; } diff --git a/src/main/java/dev/lambdaurora/spruceui/test/mixin/TitleScreenMixin.java b/src/main/java/dev/lambdaurora/spruceui/test/mixin/TitleScreenMixin.java deleted file mode 100644 index 7165c6a..0000000 --- a/src/main/java/dev/lambdaurora/spruceui/test/mixin/TitleScreenMixin.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright © 2020-2022 LambdAurora - * - * This file is part of SpruceUI. - * - * Licensed under the MIT license. For more information, - * see the LICENSE file. - */ - -package dev.lambdaurora.spruceui.test.mixin; - -import dev.lambdaurora.spruceui.Position; -import dev.lambdaurora.spruceui.test.gui.SpruceMainMenuScreen; -import dev.lambdaurora.spruceui.widget.SpruceButtonWidget; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.text.LiteralText; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TitleScreen.class) -public class TitleScreenMixin extends Screen { - protected TitleScreenMixin(Text title) { - super(title); - } - - @Inject(method = "init", at = @At("RETURN")) - private void onInit(CallbackInfo ci) { - this.addDrawableChild(new SpruceButtonWidget(Position.of(0, 0), 150, 20, new LiteralText("SpruceUI Test Menu"), - btn -> this.client.setScreen(new SpruceMainMenuScreen(this))).asVanilla()); - } -} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 74db615..6b731e2 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -11,6 +11,8 @@ logoFile= "icon.png" credits="LambdAurora" authors="TexTrue, TexTrueStudio" description=''' + + Just a GUI library. ''' diff --git a/src/main/resources/spruceui.test.mixins.json b/src/main/resources/spruceui.test.mixins.json deleted file mode 100644 index b5fb3e1..0000000 --- a/src/main/resources/spruceui.test.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "dev.lambdaurora.spruceui.test.mixin", - "compatibilityLevel": "JAVA_8", - "client": [ - "TitleScreenMixin" - ], - "injectors": { - "defaultRequire": 1 - } -}