From 994cd0d1554c1ffe97bef2eb81d14fd5b8594ffb Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 21 Jun 2025 09:30:11 +0200 Subject: [PATCH] build: use ObsidianUI from MidnightDust maven --- build.gradle | 4 ++++ common/build.gradle | 2 +- .../client/gui/MidnightControlsSettingsScreen.java | 10 ---------- fabric/build.gradle | 2 +- gradle.properties | 6 +++--- neoforge/build.gradle | 2 +- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 8990bed..dddc4f4 100644 --- a/build.gradle +++ b/build.gradle @@ -54,6 +54,10 @@ allprojects { repositories { maven { url 'https://aperlambda.github.io/maven' } + maven { + name "MidnightDust Snapshots" + url "https://maven.midnightdust.eu/snapshots" + } } dependencies { implementation('org.aperlambda:lambdajcommon:1.8.1') { diff --git a/common/build.gradle b/common/build.gradle index b8b160e..3bcecad 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -29,7 +29,7 @@ dependencies { // Using the Fabric version of midnightlib here to create a common config and get useful utilities // Just make sure NOT to use classes from the .fabric classpath modCompileOnlyApi "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric" - modCompileOnlyApi "maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric" + modCompileOnlyApi "org.thinkingstudio.obsidianui:ObsidianUI-fabric:${rootProject.obsidianui_version}" modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") { exclude(group: "net.fabricmc.fabric-api") } diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java index 884095d..8d2001c 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java @@ -9,18 +9,13 @@ package eu.midnightdust.midnightcontrols.client.gui; -import com.mojang.blaze3d.opengl.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; import eu.midnightdust.midnightcontrols.MidnightControlsConstants; import eu.midnightdust.midnightcontrols.client.MidnightControlsClient; import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil; import eu.midnightdust.midnightcontrols.client.virtualkeyboard.KeyboardLayoutManager; -import net.minecraft.client.gl.RenderPipelines; import net.minecraft.util.math.ColorHelper; import org.thinkingstudio.obsidianui.background.Background; -import org.thinkingstudio.obsidianui.mixin.DrawContextAccessor; import org.thinkingstudio.obsidianui.widget.SpruceWidget; -import eu.midnightdust.lib.util.MidnightColorUtil; import eu.midnightdust.midnightcontrols.MidnightControls; import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig; import eu.midnightdust.midnightcontrols.client.controller.Controller; @@ -39,18 +34,13 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.render.*; import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Util; -import org.joml.Matrix4f; import org.lwjgl.glfw.GLFW; -import java.awt.*; - /** * Represents the midnightcontrols settings screen. */ diff --git a/fabric/build.gradle b/fabric/build.gradle index 4a1e8d1..e53f1bc 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -24,7 +24,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric") - modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric") {} + modImplementation include ("org.thinkingstudio.obsidianui:ObsidianUI-fabric:${rootProject.obsidianui_version}") include 'org.aperlambda:lambdajcommon:1.8.1' modCompileOnly "maven.modrinth:emi:${project.emi_version}" diff --git a/gradle.properties b/gradle.properties index b97953a..e330e58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,14 +8,14 @@ yarn_mappings=1.21.6+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightcontrols -mod_version=1.11.0 +mod_version=1.11.1 maven_group=eu.midnightdust release_type=release modrinth_id = bXX9h73M curseforge_id = 621768 # Configure the IDs here after creating the projects on the websites -midnightlib_version=1.7.4+1.21.6 +midnightlib_version=1.7.5+1.21.6 fabric_loader_version=0.16.14 fabric_api_version=0.127.0+1.21.6 @@ -27,7 +27,7 @@ quilt_loader_version=0.19.0-beta.18 quilt_fabric_api_version=7.0.1+0.83.0-1.20 sodium_version=mc1.21-0.6.0-beta.1 -obsidianui_version=0.2.11+mc1.21.5 +obsidianui_version=0.2.13+mc1.21.6 modmenu_version=10.0.0-beta.1 emotecraft_version=2.5.5+1.21.4-fabric bendylib_version=2.0.+ diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 0375b58..1d30a2b 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -41,7 +41,7 @@ configurations { dependencies { neoForge "net.neoforged:neoforge:$rootProject.neoforge_version" modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge") - modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-neoforge") {} + modImplementation include ("org.thinkingstudio.obsidianui:ObsidianUI-neoforge:${rootProject.obsidianui_version}") shadowBundle('org.aperlambda:lambdajcommon:1.8.1') { exclude group: 'com.google.code.gson' exclude group: 'com.google.guava'