From a3b48cb3ccce501b506b6efc92bea22eacfad669 Mon Sep 17 00:00:00 2001 From: NotRyken <127091011+NotRyken@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:25:14 +0800 Subject: [PATCH] Sync with Framework --- .github/workflows/check-build.yml | 6 +- CHANGELOG.md | 5 + LICENSE => LICENSE.txt | 0 NOTICE_MouseWheelie | 13 -- build.gradle | 137 ++++++++---------- .../src/main/groovy/multiloader-common.gradle | 7 +- changelog.md | 0 common/build.gradle | 7 +- .../moremousetweaks/MoreMouseTweaks.java | 2 +- .../mixin/MixinClientPacketListener.java | 2 +- .../mixin/MixinLocalPlayer.java | 2 +- .../mixin/gui/other/MixinAbstractWidget.java | 2 +- .../gui/other/MixinRecipeBookComponent.java | 2 +- .../mixin/gui/other/MixinRecipeBookPage.java | 2 +- .../gui/other/MixinTradeOfferButton.java | 2 +- .../screen/MixinAbstractFurnaceScreen.java | 2 +- .../mixin/gui/screen/MixinCraftingScreen.java | 2 +- .../MixinCreativeModeInventoryScreen.java | 2 +- .../gui/screen/MixinInventoryScreen.java | 2 +- .../mixin/gui/screen/MixinMerchantScreen.java | 2 +- .../network/InteractionManager.java | 2 +- .../moremousetweaks/util/ScrollAction.java | 2 +- .../util/inject/IMerchantScreen.java | 2 +- .../util/inject/IRecipeBookResults.java | 2 +- .../util/inject/IRecipeBookWidget.java | 2 +- .../util/inject/IScrollableRecipeBook.java | 2 +- .../inject/ISpecialClickableButtonWidget.java | 2 +- .../util/inject/ISpecialScrollableScreen.java | 2 +- .../assets/moremousetweaks/license/HEADER.txt | 0 .../license/mouse-wheelie/HEADER.txt | 2 +- fabric/build.gradle | 11 +- fabric/src/main/resources/fabric.mod.json | 3 +- gradle.properties | 10 +- neoforge/build.gradle | 7 + .../resources/META-INF/neoforge.mods.toml | 2 - settings.gradle | 11 +- 36 files changed, 119 insertions(+), 142 deletions(-) create mode 100644 CHANGELOG.md rename LICENSE => LICENSE.txt (100%) delete mode 100644 NOTICE_MouseWheelie delete mode 100644 changelog.md rename NOTICE => common/src/main/resources/assets/moremousetweaks/license/HEADER.txt (100%) rename NOTICE_Combined => common/src/main/resources/assets/moremousetweaks/license/mouse-wheelie/HEADER.txt (95%) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 4a4f98d..f125f6a 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -5,14 +5,12 @@ on: push: paths: [ '**src/**', - '**/*gradle*', - LICENSE + '**/*gradle*' ] pull_request: paths: [ '**src/**', - '**/*gradle*', - LICENSE + '**/*gradle*' ] workflow_dispatch: diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..1021aca --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog + +## 1.0.0 + +- Initial full release diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/NOTICE_MouseWheelie b/NOTICE_MouseWheelie deleted file mode 100644 index 032d162..0000000 --- a/NOTICE_MouseWheelie +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2020-2022 Siphalor - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/build.gradle b/build.gradle index 81f9777..6dfed38 100644 --- a/build.gradle +++ b/build.gradle @@ -11,37 +11,38 @@ plugins { subprojects { version = mod_version group = mod_group - - // License headers - apply(plugin: "org.cadixdev.licenser") - license { - // This can be done in multiloader-common.gradle but only if the - // "matching" method is not used (throws a pile of weird errors). - // Also, NeoForge's update of the plugin can't handle matching at all. - include("**/*.java") // Java files only - header = rootProject.file("NOTICE_Combined") - properties { - project_name = mod_name - owner_name = mod_owner - year = java.time.LocalDate.now().getYear().toString() - } - // Dual-licensing - matching(includes: [ - "**/config/**", - "**/moremousetweaks/gui/**", - "**/mixin/mousetweaks/**", - "**/MixinOverlayRecipeComponent.java", - "**/Localization.java", - "**/ModLogger.java", - "**/MoreMouseTweaksFabric.java", - "**/MoreMouseTweaksNeoForge.java" - ]) { - header = rootProject.file("NOTICE") + + if (name == "common") { + // License headers + apply(plugin: "org.cadixdev.licenser") + String licenseDir = "src/main/resources/assets/${mod_id}/license/" + license { + // This can be done in multiloader-common.gradle but only if the + // "matching" method is not used (throws a pile of weird errors). + // Also, NeoForge's update of the plugin can't handle matching at all. + include("**/*.java") // Java files only + header = project.file(licenseDir + "mouse-wheelie/HEADER.txt") + properties { + project_name = mod_name + owner_name = mod_owner + year = java.time.LocalDate.now().getYear().toString() + } + // Alternate license + matching(includes: [ + "**/config/**", + "**/moremousetweaks/gui/**", + "**/mixin/mousetweaks/**", + "**/MixinOverlayRecipeComponent.java", + "**/Localization.java", + "**/ModLogger.java", + "**/MoreMouseTweaksFabric.java", + "**/MoreMouseTweaksNeoForge.java", + ]) { + header = project.file(licenseDir + "HEADER.txt") + } } - } - - // Publishing - if (name != "common") { + } else { + // Publishing apply(plugin: "com.modrinth.minotaur") apply(plugin: "net.darkhax.curseforgegradle") apply(plugin: "com.github.breadmoirai.github-release") @@ -54,7 +55,7 @@ subprojects { versionNumber = mod_version versionType = release_type versionName = "v${mod_version}-${capsLoader(name)}" - changelog = rootProject.file("changelog.md").text + changelog = versionChangelog() uploadFile = name == "fabric" ? remapJar : jar loaders = project.property("release_mod_loaders_${name}").split(",") as List gameVersions = project.property("release_game_versions_${name}").split(",") as List @@ -91,7 +92,7 @@ subprojects { def file = upload(curseforge_id, module == "fabric" ? remapJar : jar) file.displayName = "v${mod_version}-${capsLoader(module)}" file.releaseType = release_type - file.changelog = rootProject.file("changelog.md").text + file.changelog = versionChangelog() file.changelogType = "markdown" project.property("release_mod_loaders_${module}").split(",").each { String id -> file.addModLoader(id) @@ -126,7 +127,17 @@ subprojects { tagName = "v${mod_version}" prerelease = release_type == "alpha" || release_type == "beta" releaseName = "v${mod_version}" - body = rootProject.file("changelog.md").text + + String changelog = "\n\n## Changelog\n\n" + versionChangelog() + String versions = "## MC versions\n\n" + if (project.hasProperty("release_game_versions_fabric")) + versions = String.format("%s - Fabric: %s\n", versions, + project.property("release_game_versions_fabric")) + if (project.hasProperty("release_game_versions_neoforge")) + versions = String.format("%s - NeoForge: %s\n", versions, + project.property("release_game_versions_neoforge")) + body = versions + changelog + targetCommitish = grgitService.service.get().grgit.branch.current().name overwrite = false allowUploadToExisting = true @@ -138,54 +149,22 @@ subprojects { } } -tasks.register("rebrandProject") { - def rebrandFile = file("rebrand.properties") - if (!rebrandFile.exists()) { - println("'rebrand.properties' file not found.") - return - } - doLast { - def properties = new Properties() - rebrandFile.withInputStream { stream -> - properties.load(stream) - } - - file(".").eachFileRecurse { file -> - if (file.isFile() && !file.name.startsWith(".git") && !file.name.startsWith("gradlew") - && (file.relativePath(project.rootDir) == ".." || file.path.contains("src\\main"))) { - try { - properties.each { key, value -> - if (file.name.contains(key.toString())) { - def newName = file.name.replace(key.toString(), value.toString()) - def newFile = new File(file.parentFile, newName) - if (file.renameTo(newFile)) { - println("Renamed '${file.name}'") - } else { - println("Failed to rename '${file.name}'") - } - } - } - } catch (IOException ex) { - println("Error renaming file '${file.path}': ${ex}") - } - } - } - - file(".").eachFileRecurse { file -> - if (file.isFile() && !file.name.startsWith(".git") && !file.name.startsWith("gradlew") - && (file.relativePath(project.rootDir) == ".." || file.path.contains("src\\main"))) { - try { - def content = file.text - properties.each { key, value -> - content = content.replaceAll(key.toString(), value.toString()) - } - file.withWriter("UTF-8") { writer -> writer.write(content) } - } catch (IOException ex) { - println("Error updating contents of file '${file.path}': ${ex}") - } - } +String versionChangelog() { + List lines = rootProject.file("CHANGELOG.md").readLines() + StringBuilder builder = new StringBuilder() + for (int i = 4; i < lines.size(); i++) { + String line = lines.get(i) + if (line.isBlank()) { + // pass + } else if (line.startsWith("## ")) { + break + } + else { + if (!builder.isEmpty()) builder.append("\n") + builder.append(line) } } + return builder.toString() } static String capsLoader(String loader) { diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle index 61d95ad..e943d60 100644 --- a/buildSrc/src/main/groovy/multiloader-common.gradle +++ b/buildSrc/src/main/groovy/multiloader-common.gradle @@ -62,13 +62,13 @@ repositories { } sourcesJar { - from(rootProject.file("LICENSE")) { + from(rootProject.file("LICENSE.txt")) { rename { "${it}_${mod_name}" } } } jar { - from(rootProject.file("LICENSE")) { + from(rootProject.file("LICENSE.txt")) { rename { "${it}_${mod_name}" } } @@ -94,7 +94,6 @@ processResources { "mod_version": mod_version, "mod_group": mod_group, "mod_id": mod_id, - "mod_id_alt": mod_id_alt, "mod_name": mod_name, "mod_description": mod_description, "mod_icon": "assets/" + mod_id + "/icon.png", @@ -129,7 +128,7 @@ processResources { "clothconfig_versions_neoforge": clothconfig_versions_neoforge, "modmenu_versions_fabric_list": asJsonList(modmenu_versions_fabric), ] - filesMatching(["pack.mcmeta", "*.mod.json", "META-INF/*mods.toml", "*.mixins.json"]) { + filesMatching(["pack.mcmeta", "*.mod.json", "META-INF/*mods.toml", "*.mixins.json", "assets/"+mod_id+"/lang/*.json"]) { expand expandProps } inputs.properties(expandProps) diff --git a/changelog.md b/changelog.md deleted file mode 100644 index e69de29..0000000 diff --git a/common/build.gradle b/common/build.gradle index 30b79c4..8c3fe32 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -5,11 +5,12 @@ plugins { dependencies { compileOnly("org.spongepowered:mixin:${mixin_version}") - compileOnly("io.github.llamalad7:mixinextras-common:${mixinextras_version}") - annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}") + compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}")) - // Mod dependencies use NeoForge version to avoid remapping complications + // MouseTweaks implementation("maven.modrinth:aC3cM3Vq:${mousetweaks_version_neoforge}") + + // Cloth Config API api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}") } diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java b/common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java index f25a65d..b18095d 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinClientPacketListener.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinClientPacketListener.java index 3936df4..eb85424 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinClientPacketListener.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinClientPacketListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinLocalPlayer.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinLocalPlayer.java index e6a4d5b..2fcd1ff 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinLocalPlayer.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/MixinLocalPlayer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinAbstractWidget.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinAbstractWidget.java index a111ecf..622cf60 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinAbstractWidget.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinAbstractWidget.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookComponent.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookComponent.java index 4a8548d..16fd035 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookComponent.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookPage.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookPage.java index e997d48..6da13d4 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookPage.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinRecipeBookPage.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinTradeOfferButton.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinTradeOfferButton.java index b6a6391..a29fbb8 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinTradeOfferButton.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/other/MixinTradeOfferButton.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinAbstractFurnaceScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinAbstractFurnaceScreen.java index bd2ccb3..1ec4f48 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinAbstractFurnaceScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinAbstractFurnaceScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCraftingScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCraftingScreen.java index 2991244..8f886a0 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCraftingScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCraftingScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCreativeModeInventoryScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCreativeModeInventoryScreen.java index 3c8ca70..bcca3f4 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCreativeModeInventoryScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinCreativeModeInventoryScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinInventoryScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinInventoryScreen.java index 82e1ecf..f5561d6 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinInventoryScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinInventoryScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinMerchantScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinMerchantScreen.java index ec3b63c..5ddc7f3 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinMerchantScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/gui/screen/MixinMerchantScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/network/InteractionManager.java b/common/src/main/java/dev/terminalmc/moremousetweaks/network/InteractionManager.java index 21107fe..05f96c8 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/network/InteractionManager.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/network/InteractionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/ScrollAction.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/ScrollAction.java index 0d8b564..7ad3109 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/ScrollAction.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/ScrollAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IMerchantScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IMerchantScreen.java index d9a867e..37581ad 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IMerchantScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IMerchantScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookResults.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookResults.java index 5d595d0..101d923 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookResults.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookResults.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookWidget.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookWidget.java index 825534b..a1e05f5 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookWidget.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IRecipeBookWidget.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IScrollableRecipeBook.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IScrollableRecipeBook.java index a8aee69..fc4c44e 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IScrollableRecipeBook.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/IScrollableRecipeBook.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialClickableButtonWidget.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialClickableButtonWidget.java index deaa67b..1fc6b0c 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialClickableButtonWidget.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialClickableButtonWidget.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialScrollableScreen.java b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialScrollableScreen.java index e4f3b9b..237324c 100644 --- a/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialScrollableScreen.java +++ b/common/src/main/java/dev/terminalmc/moremousetweaks/util/inject/ISpecialScrollableScreen.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2022 Siphalor + * Copyright 2022 Siphalor * Copyright 2024 TerminalMC * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/NOTICE b/common/src/main/resources/assets/moremousetweaks/license/HEADER.txt similarity index 100% rename from NOTICE rename to common/src/main/resources/assets/moremousetweaks/license/HEADER.txt diff --git a/NOTICE_Combined b/common/src/main/resources/assets/moremousetweaks/license/mouse-wheelie/HEADER.txt similarity index 95% rename from NOTICE_Combined rename to common/src/main/resources/assets/moremousetweaks/license/mouse-wheelie/HEADER.txt index b2c5fbf..b407812 100644 --- a/NOTICE_Combined +++ b/common/src/main/resources/assets/moremousetweaks/license/mouse-wheelie/HEADER.txt @@ -1,4 +1,4 @@ -Copyright 2020-2022 Siphalor +Copyright 2022 Siphalor Copyright ${year} ${owner_name} Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/fabric/build.gradle b/fabric/build.gradle index 8c73cee..4c55d53 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -10,13 +10,20 @@ dependencies { parchment("org.parchmentmc.data:parchment-${parchment_minecraft_version}:${parchment_version}@zip") } - include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixinextras_version}"))) - + // Fabric loader and API modImplementation("net.fabricmc:fabric-loader:${fabric_loader_version}") modImplementation("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}") + // JiJ MixinExtras + include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixinextras_version}"))) + + // MouseTweaks modImplementation("maven.modrinth:aC3cM3Vq:${mousetweaks_version_fabric}") + + // Modmenu modImplementation("maven.modrinth:mOgUt4GM:${modmenu_version}") + + // Cloth Config API modApi("me.shedaniel.cloth:cloth-config-fabric:${clothconfig_version}") { exclude(group: "net.fabricmc.fabric-api") } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 8016bbe..aff9f6e 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,7 +2,6 @@ "schemaVersion": 1, "version": "${mod_version}", "id": "${mod_id}", - "provides": ["${mod_id_alt}"], "name": "${mod_name}", "description": "${mod_description}", "icon": "${mod_icon}", @@ -12,6 +11,8 @@ "environment": "client", + "provides": [], + "entrypoints": { "main": [], "client": ["${mod_group}.${mod_id}.${mod_name}Fabric"], diff --git a/gradle.properties b/gradle.properties index 65a02a1..def48d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,17 +46,17 @@ neoforge_versions=[21.0.143, 22) # NeoForm https://projects.neoforged.net/neoforged/neoform neoform_version=1.21-20240613.152323 -# Cloth Config https://modrinth.com/mod/9s6osm5g/versions -clothconfig_version=15.0.140 -clothconfig_versions_fabric=>=15 -clothconfig_versions_neoforge=[15,) - # MouseTweaks https://modrinth.com/mod/aC3cM3Vq/versions mousetweaks_version_fabric=1.21-2.26-fabric mousetweaks_versions_fabric=* mousetweaks_version_neoforge=1.21-2.26.1-neoforge mousetweaks_versions_neoforge=[1,) +# Cloth Config https://modrinth.com/mod/9s6osm5g/versions +clothconfig_version=15.0.140 +clothconfig_versions_fabric=>=15 +clothconfig_versions_neoforge=[15,) + # ModMenu https://modrinth.com/mod/mOgUt4GM/versions modmenu_version=11.0.2 modmenu_versions_fabric=>10 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index da3581e..d0db179 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -4,9 +4,16 @@ plugins { } dependencies { + // JiJ MixinExtras implementation(jarJar("io.github.llamalad7:mixinextras-neoforge:${mixinextras_version}")) + + // MouseTweaks implementation("maven.modrinth:aC3cM3Vq:${mousetweaks_version_neoforge}") + + // Cloth Config API api("me.shedaniel.cloth:cloth-config-neoforge:${clothconfig_version}") + + } neoForge { diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 346a3b7..5a9918e 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -20,8 +20,6 @@ issueTrackerURL="${issues_url}" #optional:none authors="${mod_authors_string}" #optional:none displayURL="${homepage_url}" #optional: none #displayTest="" #optional:"MATCH_VERSION" -[[mods]] - modId="${mod_id_alt}" [[mixins]] config="${mod_id}.mixins.json" diff --git a/settings.gradle b/settings.gradle index 3f23437..2ed894f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,14 +23,9 @@ pluginManagement { } filter { includeGroupAndSubgroups("org.spongepowered") } } - exclusiveContent { - forRepositories( - maven { - name = "NeoForge" - url = "https://maven.neoforged.net/releases" - } - ) - filter { includeGroupAndSubgroups("net.neoforged.licenser") } + maven { + name = "NeoForge" + url = "https://maven.neoforged.net/releases" } } }