diff options
84 files changed, 1730 insertions, 408 deletions
diff --git a/.idea/copyright/NotEnoughUpdates.xml b/.idea/copyright/NotEnoughUpdates.xml index 8dd67ac4..c1c6368d 100644 --- a/.idea/copyright/NotEnoughUpdates.xml +++ b/.idea/copyright/NotEnoughUpdates.xml @@ -1,7 +1,7 @@ <component name="CopyrightManager"> <copyright> <option name="allowReplaceRegexp" value="Copyright" /> - <option name="notice" value="Copyright (C) 2022 NotEnoughUpdates contributors This file is part of NotEnoughUpdates. NotEnoughUpdates is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. NotEnoughUpdates is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>." /> + <option name="notice" value="Copyright (C) 2023 NotEnoughUpdates contributors This file is part of NotEnoughUpdates. NotEnoughUpdates is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. NotEnoughUpdates is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>." /> <option name="myName" value="NotEnoughUpdates" /> </copyright> -</component>
\ No newline at end of file +</component> diff --git a/Update Notes/2.1.1.md b/Update Notes/2.1.1.md index b5f660a4..7e41860a 100644 --- a/Update Notes/2.1.1.md +++ b/Update Notes/2.1.1.md @@ -8,6 +8,8 @@ - Added universal GUI editor - nopo - Added Essenceupgrades GUI - Lulonaut - Added Katsitting recipe upgrade - nea89 +- Added cheapest museum item overlay - Lulonaut +- Added Frozen Treasure Highlighter - heyngra ### **Minor Changes:** @@ -43,6 +45,12 @@ - Added Ender Node Highlighter, Endermite Nest Alert - GodOfPro - Added CTRL + F support to searchbar and config menu - Lulonaut - Added star cult timer to dwarven mines overlay - efefury + - Added support for OneConfig - nea89 + - Added Bonzo Mask Durability Cooldown - Vixid + - Added hotkeys for wardrobe slots - nopo + - Added click to open neu pv to dungeon party finder join messages - hannibal2 + - Added Commission task tips to mining overlay - hannibal2 + - Added museum hydrated items display - nea89 ### **Bug Fixes:** @@ -61,3 +69,12 @@ - Fixed Slayer Overlay to now take Aatrox's +25% Slayer XP buff into account - Taoshi - Fixed inventory backpack keybind not working without unrelated option - Lulonaut - Fixed wither cloak overlay staying on when picking up the item in the inventory - Lulonaut +- Fixed Bingo Pet not working correctly in the Pet Overlay - nopo/nea89 +- Fixed Auction Profit Overlay taking too much taxes - nopo +- Fixed SBMenus flashing white for a few ticks - nopo +- Fixed daily powder resetting at the wrong time - nopo +- Fixed total kills, deaths not being reset on profile switch - GodOfPro +- Fixed farming overlay showing the wrong skill - nopo +- Fixed mining overlay not updating while chat is opened - heyngra +- Fixed fairy souls not being detected on the first click - nea89 +- Fixed pv not showing all profiles - nea89 diff --git a/build.gradle.kts b/build.gradle.kts index 04207cf2..e9e769a8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,6 +75,7 @@ repositories { maven("https://repo.spongepowered.org/maven/") maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1") maven("https://jitpack.io") + maven("https://repo.polyfrost.cc/releases") } lombok { @@ -86,8 +87,12 @@ val shadowImplementation by configurations.creating { configurations.implementation.get().extendsFrom(this) } +val shadowOnly by configurations.creating { + +} + val shadowApi by configurations.creating { - configurations.implementation.get().extendsFrom(this) + configurations.api.get().extendsFrom(this) } val devEnv by configurations.creating { @@ -101,6 +106,14 @@ val kotlinDependencies by configurations.creating { configurations.implementation.get().extendsFrom(this) } +val oneconfigQuarantineSourceSet = sourceSets.create("oneconfig") { + java { + srcDir(layout.projectDirectory.dir("src/main/oneconfig")) + } + kotlin { + } +} + dependencies { implementation("org.projectlombok:lombok:1.18.22") minecraft("com.mojang:minecraft:1.8.9") @@ -108,6 +121,16 @@ dependencies { forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") + if (project.findProperty("neu.buildflags.oneconfig") == "true") { + shadowOnly("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-alpha+") // Should be included in jar + runtimeOnly("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-alpha+") // Should be included in jar + } + + "oneconfigImplementation"(sourceSets.main.get().output) + "oneconfigImplementation"(sourceSets.main.get().compileClasspath) + "oneconfigCompileOnly"(project(":oneconfigquarantine", configuration = "namedElements")) + "runtimeOnly"(oneconfigQuarantineSourceSet.output) + // Please keep this version in sync with KotlinLoadingTweaker implementation(enforcedPlatform("org.jetbrains.kotlin:kotlin-bom:1.7.21")) kotlinDependencies(kotlin("stdlib")) @@ -141,6 +164,10 @@ tasks.named<Test>("test") { useJUnitPlatform() } +tasks.named("jar", Jar::class) { + from(oneconfig |