From 5e680a522f11142fe7d73035895624a1d0c99928 Mon Sep 17 00:00:00 2001 From: nobaboy <84668101+nobaboy@users.noreply.github.com> Date: Mon, 19 May 2025 01:02:10 +0300 Subject: [PATCH 1/3] fix read me and notices, and update deps --- LICENSE | 6 ++++++ NOTICE.md | 2 +- README.md | 19 ++++++++++++++++++- build.gradle.kts | 6 +++--- buildSrc/build.gradle.kts | 2 -- versions/1.21.3/gradle.properties | 4 ++-- versions/1.21.4/gradle.properties | 8 ++++---- versions/1.21.5/gradle.properties | 4 ++-- 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index d068c382..5622835a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,9 @@ +This project is primarily licensed under the Zlib license, a copy of which is included below. + +Certain portions of this project may be licensed differently; see also the included NOTICE.md for details. + +---------------- + This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. diff --git a/NOTICE.md b/NOTICE.md index 59b5e195..8f20c6ce 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -23,7 +23,7 @@ The listed files under each project retain the original license of the source pr - **Source**: [GitHub Repository](https://github.com/hannibal002/SkyHanni) - **License**: [GNU Lesser General Public License v2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt) - **Files**: - - `src/main/java/me/nobaboy/nobaaddons/utils/AutoDiscoveryMixinPlugin.java` + - `src/main/java/me/nobaboy/nobaaddons/init/AutoDiscoveryMixinPlugin.java` - `src/main/kotlin/me/nobaboy/nobaaddons/utils/SkyBlockTime.kt` - `src/main/kotlin/me/nobaboy/nobaaddons/utils/Timestamp.kt` - `src/main/kotlin/me/nobaboy/nobaaddons/utils/math/BezierCurve.kt` diff --git a/README.md b/README.md index 3e6e7bea..3833f2b2 100644 --- a/README.md +++ b/README.md @@ -1 +1,18 @@ -fix this \ No newline at end of file +
+ +# NobaAddons + +[![Fabric](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/fabric_vector.svg)](https://fabricmc.net) +[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg)](https://modrinth.com/mod/nobaaddons) +[![Discord](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/discord-plural_vector.svg)](https://discord.com/invite/N9Db3NeWfU) + +A Fabric mod for Hypixel SkyBlock on modern version of Minecraft. + +
+ +## License + +This project is primarily licensed under the [Zlib license](./LICENSE). + +Certain portions of this project incorporates code from other projects, which may be licensed differently; +see [NOTICE.md](./NOTICE.md) for a full list of affected files and symbols. \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 2c0db6cc..3ffe0178 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,9 +66,6 @@ dependencies { include(dependencyNotation, configuration) } - compileOnly("me.owdding.ktmodules:KtModules:${deps["kt_modules"]}") - ksp("me.owdding.ktmodules:KtModules:${deps["kt_modules"]}") - minecraft("com.mojang:minecraft:${mcVersion}") mappings("net.fabricmc:yarn:${mcVersion}+build.${deps["yarn_build"]}:v2") modImplementation("net.fabricmc:fabric-loader:${deps["fabric_loader"]}") @@ -79,6 +76,9 @@ dependencies { modImplementation("dev.isxander:yet-another-config-lib:${deps["yacl"]}-fabric") // YACL modImplementation("com.terraformersmc:modmenu:${deps["modmenu"]}") // ModMenu + compileOnly("me.owdding.ktmodules:KtModules:${deps["kt_modules"]}") + ksp("me.owdding.ktmodules:KtModules:${deps["kt_modules"]}") + includeImplementation("dev.celestialfault:commander:${deps["commander"]}", mod = true) { isTransitive = false } includeImplementation("dev.celestialfault:histoire:${deps["histoire"]}") { isTransitive = false } includeImplementation("com.moulberry:mixinconstraints:${deps["mixinconstraints"]}") { isTransitive = false } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 57acdf60..ef7a3e36 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,6 +8,4 @@ repositories { dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib") - // currently unused, might be used in the future -// implementation("io.github.classgraph:classgraph:4.8.179") } diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties index 6bda1701..51cc447d 100644 --- a/versions/1.21.3/gradle.properties +++ b/versions/1.21.3/gradle.properties @@ -4,6 +4,6 @@ mod.mc_targets=1.21.2 1.21.3 deps.yarn_build=2 deps.fabric_api=0.114.0 -deps.yacl=3.6.2+1.21.2 +deps.yacl=3.6.6+1.21.3 deps.modmenu=12.0.0 -deps.sodium=mc1.21.3-0.6.5 +deps.sodium=mc1.21.3-0.6.13 diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties index 521bcfd7..78201cff 100644 --- a/versions/1.21.4/gradle.properties +++ b/versions/1.21.4/gradle.properties @@ -3,7 +3,7 @@ mod.mc_title=1.21.4 mod.mc_targets=1.21.4 deps.yarn_build=8 -deps.fabric_api=0.115.0 -deps.yacl=3.6.2+1.21.4 -deps.modmenu=13.0.0 -deps.sodium=mc1.21.4-0.6.6 +deps.fabric_api=0.119.2 +deps.yacl=3.6.6+1.21.4 +deps.modmenu=13.0.3 +deps.sodium=mc1.21.4-0.6.13 diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties index 42a2c248..559a2bdd 100644 --- a/versions/1.21.5/gradle.properties +++ b/versions/1.21.5/gradle.properties @@ -3,7 +3,7 @@ mod.mc_title=1.21.5 mod.mc_targets=1.21.5 deps.yarn_build=1 -deps.fabric_api=0.119.5 +deps.fabric_api=0.124.0 deps.yacl=3.6.6+1.21.5 deps.modmenu=14.0.0-rc.2 -deps.sodium=mc1.21.5-0.6.11 +deps.sodium=mc1.21.5-0.6.13 From 4417dcd233938cf0e9bd4775f6f0a6265f9e4df9 Mon Sep 17 00:00:00 2001 From: nobaboy <84668101+nobaboy@users.noreply.github.com> Date: Mon, 19 May 2025 01:50:15 +0300 Subject: [PATCH 2/3] add features line --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3833f2b2..eec49861 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ A Fabric mod for Hypixel SkyBlock on modern version of Minecraft. +See [FEATURES.md](./FEATURES.md) for a full list of the mod's features. + ## License This project is primarily licensed under the [Zlib license](./LICENSE). From 69df48b2d98dec776817840acecbc694484d43a7 Mon Sep 17 00:00:00 2001 From: nobaboy <84668101+nobaboy@users.noreply.github.com> Date: Mon, 19 May 2025 02:36:33 +0300 Subject: [PATCH 3/3] add the tps function to the list --- FEATURES.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/FEATURES.md b/FEATURES.md index 5eecdcfa..f57caf14 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -34,6 +34,7 @@ Info Boxes display any provided text on-screen, and also replace the following p - Client information: - `{fps}` - `{ping}` + - `{tps}` - Server information: - `{day}` - Player position: @@ -78,8 +79,8 @@ Info Boxes display any provided text on-screen, and also replace the following p
Slayers -- Boss and MiniBoss alerts -- Highlight MiniBosses +- Boss and Miniboss alerts +- Highlight Minibosses - Announce slayer boss kill time - Compact slayer quest completion messages - Wolf slayer: @@ -146,7 +147,7 @@ Info Boxes display any provided text on-screen, and also replace the following p - Various sound filters - Garden: - - Mouse lock (`/noba lockmouse`) + - Mouse lock (`/noba lockmouse` or `/noba mouselock`) - Reduce mouse sensitivity while holding a farming tool