From cf0bc190800e48571946c39e37fab3730c2586a2 Mon Sep 17 00:00:00 2001 From: kikugie Date: Fri, 27 Dec 2024 21:40:39 +0100 Subject: [PATCH] Add better version restriction --- .../audio/registry/ResourceAudioHolder.kt | 1 - .../gui/component/DurationCutterComponent.kt | 1 - .../kikugie/soundboard/gui/screen/ConfigScreen.kt | 9 +++++---- .../soundboard/gui/screen/DownloadScreen.kt | 14 ++++++-------- .../dev/kikugie/soundboard/gui/screen/ModScreen.kt | 1 - .../kotlin/dev/kikugie/soundboard/util/KOwoUi.kt | 5 +---- vc-plasmo/src/main/resources/fabric.mod.json | 6 ++++-- vc-simple/src/main/resources/fabric.mod.json | 6 ++++-- 8 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/kotlin/dev/kikugie/soundboard/audio/registry/ResourceAudioHolder.kt b/src/main/kotlin/dev/kikugie/soundboard/audio/registry/ResourceAudioHolder.kt index 1f4e1bf..5de6a4a 100644 --- a/src/main/kotlin/dev/kikugie/soundboard/audio/registry/ResourceAudioHolder.kt +++ b/src/main/kotlin/dev/kikugie/soundboard/audio/registry/ResourceAudioHolder.kt @@ -11,7 +11,6 @@ import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener import net.minecraft.resource.Resource import net.minecraft.resource.ResourceManager import net.minecraft.util.Identifier -import net.minecraft.util.profiler.Profiler import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture.allOf import java.util.concurrent.Executor diff --git a/src/main/kotlin/dev/kikugie/soundboard/gui/component/DurationCutterComponent.kt b/src/main/kotlin/dev/kikugie/soundboard/gui/component/DurationCutterComponent.kt index 729282f..f3583d3 100644 --- a/src/main/kotlin/dev/kikugie/soundboard/gui/component/DurationCutterComponent.kt +++ b/src/main/kotlin/dev/kikugie/soundboard/gui/component/DurationCutterComponent.kt @@ -7,7 +7,6 @@ import io.wispforest.owo.ui.base.BaseComponent import io.wispforest.owo.ui.base.BaseParentComponent import io.wispforest.owo.ui.core.* import net.minecraft.client.render.RenderLayer -import net.minecraft.client.render.RenderLayers import kotlin.time.Duration // 0..1 diff --git a/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ConfigScreen.kt b/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ConfigScreen.kt index 4d384b6..b3f4fb8 100644 --- a/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ConfigScreen.kt +++ b/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ConfigScreen.kt @@ -1,11 +1,12 @@ package dev.kikugie.soundboard.gui.screen -import dev.kikugie.kowoui.access.* -import dev.kikugie.kowoui.collapsible +import dev.kikugie.kowoui.access.alignment +import dev.kikugie.kowoui.access.gap +import dev.kikugie.kowoui.access.horizontalSizing +import dev.kikugie.kowoui.access.verticalSizing +import dev.kikugie.kowoui.experimental.plus import dev.kikugie.kowoui.horizontalFlow import dev.kikugie.kowoui.label -import dev.kikugie.kowoui.translation -import dev.kikugie.kowoui.experimental.plus import dev.kikugie.kowoui.util.CombinedAlignment import io.wispforest.owo.ui.container.FlowLayout import io.wispforest.owo.ui.core.Component diff --git a/src/main/kotlin/dev/kikugie/soundboard/gui/screen/DownloadScreen.kt b/src/main/kotlin/dev/kikugie/soundboard/gui/screen/DownloadScreen.kt index 3be2c66..80bf8de 100644 --- a/src/main/kotlin/dev/kikugie/soundboard/gui/screen/DownloadScreen.kt +++ b/src/main/kotlin/dev/kikugie/soundboard/gui/screen/DownloadScreen.kt @@ -2,27 +2,25 @@ package dev.kikugie.soundboard.gui.screen import dev.kikugie.kowoui.* import dev.kikugie.kowoui.access.* +import dev.kikugie.kowoui.dynamic.coloredTextBox import dev.kikugie.kowoui.dynamic.fixedSpacer import dev.kikugie.kowoui.dynamic.wrap -import dev.kikugie.kowoui.experimental.plus import dev.kikugie.kowoui.experimental.plusAssign -import dev.kikugie.kowoui.util.CombinedAlignment -import dev.kikugie.kowoui.dynamic.coloredTextBox import dev.kikugie.soundboard.audio.BASE_DIR import dev.kikugie.soundboard.audio.FORMAT import dev.kikugie.soundboard.audio.download.Downloader -import dev.kikugie.soundboard.gui.CONFIG_PANEL -import dev.kikugie.soundboard.gui.widget.SidebarWidget import dev.kikugie.soundboard.util.resolveOrNull import dev.kikugie.soundboard.util.then -import io.wispforest.owo.ui.base.BaseOwoScreen import io.wispforest.owo.ui.component.ButtonComponent import io.wispforest.owo.ui.component.TextBoxComponent import io.wispforest.owo.ui.container.FlowLayout import io.wispforest.owo.ui.container.StackLayout -import io.wispforest.owo.ui.core.* -import io.wispforest.owo.ui.core.Insets.* +import io.wispforest.owo.ui.core.Color +import io.wispforest.owo.ui.core.CursorStyle +import io.wispforest.owo.ui.core.Insets.of import io.wispforest.owo.ui.core.Sizing.* +import io.wispforest.owo.ui.core.Surface +import io.wispforest.owo.ui.core.VerticalAlignment import net.minecraft.client.gui.screen.ConfirmLinkScreen import net.minecraft.util.DyeColor import org.lwjgl.glfw.GLFW diff --git a/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ModScreen.kt b/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ModScreen.kt index c0dc9fd..6e02f5d 100644 --- a/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ModScreen.kt +++ b/src/main/kotlin/dev/kikugie/soundboard/gui/screen/ModScreen.kt @@ -8,7 +8,6 @@ import dev.kikugie.kowoui.util.CombinedAlignment import dev.kikugie.kowoui.verticalFlow import dev.kikugie.soundboard.gui.CONFIG_PANEL import dev.kikugie.soundboard.gui.widget.SidebarWidget -import dev.kikugie.soundboard.util.currentScreen import io.wispforest.owo.ui.base.BaseOwoScreen import io.wispforest.owo.ui.container.FlowLayout import io.wispforest.owo.ui.container.StackLayout diff --git a/src/main/kotlin/dev/kikugie/soundboard/util/KOwoUi.kt b/src/main/kotlin/dev/kikugie/soundboard/util/KOwoUi.kt index 8dc9fdf..a4b7085 100644 --- a/src/main/kotlin/dev/kikugie/soundboard/util/KOwoUi.kt +++ b/src/main/kotlin/dev/kikugie/soundboard/util/KOwoUi.kt @@ -1,15 +1,12 @@ package dev.kikugie.soundboard.util -import com.mojang.blaze3d.systems.RenderSystem import io.wispforest.owo.ui.core.Color import io.wispforest.owo.ui.core.Component import io.wispforest.owo.ui.core.OwoUIDrawContext import io.wispforest.owo.ui.core.ParentComponent import io.wispforest.owo.ui.inject.GreedyInputComponent -import io.wispforest.owo.ui.parsing.UIModel import net.minecraft.client.font.TextRenderer -import net.minecraft.client.gui.DrawContext -import net.minecraft.client.render.* +import net.minecraft.client.render.RenderLayer import net.minecraft.text.Text import net.minecraft.util.Util import net.minecraft.util.math.MathHelper diff --git a/vc-plasmo/src/main/resources/fabric.mod.json b/vc-plasmo/src/main/resources/fabric.mod.json index b196631..1a64a8c 100644 --- a/vc-plasmo/src/main/resources/fabric.mod.json +++ b/vc-plasmo/src/main/resources/fabric.mod.json @@ -23,7 +23,9 @@ ] }, "depends": { - "plasmovoice": "~2.1.0", - "soundboard-core": "${version}" + "plasmovoice": "~2.1.0" + }, + "breaks": { + "soundboard-svc": "<${version} >${version}" } } \ No newline at end of file diff --git a/vc-simple/src/main/resources/fabric.mod.json b/vc-simple/src/main/resources/fabric.mod.json index eb5f9c1..1dea546 100644 --- a/vc-simple/src/main/resources/fabric.mod.json +++ b/vc-simple/src/main/resources/fabric.mod.json @@ -35,7 +35,9 @@ ] }, "depends": { - "voicechat": "*", - "soundboard-core": "${version}" + "voicechat": "*" + }, + "breaks": { + "soundboard-plasmo": "<${version} >${version}" } } \ No newline at end of file