diff --git a/ViaFabricPlus-Visual/src/main/java/de/florianmichael/viafabricplus_visual/injection/mixin/MixinChatHud.java b/ViaFabricPlus-Visual/src/main/java/de/florianmichael/viafabricplus_visual/injection/mixin/MixinChatHud.java index 3592f0a7..2e2f7ddf 100644 --- a/ViaFabricPlus-Visual/src/main/java/de/florianmichael/viafabricplus_visual/injection/mixin/MixinChatHud.java +++ b/ViaFabricPlus-Visual/src/main/java/de/florianmichael/viafabricplus_visual/injection/mixin/MixinChatHud.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ChatHud.class) public class MixinChatHud { - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHudLine$Visible;indicator()Lnet/minecraft/client/gui/hud/MessageIndicator;")) + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/ChatHudLine$Visible;indicator()Lnet/minecraft/client/gui/hud/MessageIndicator;"), require = 0) public MessageIndicator removeIndicators(ChatHudLine.Visible instance) { if (ViaFabricPlusVisual.hideSignatureIndicator.getValue()) { return null; diff --git a/build.gradle b/build.gradle index 82576ae4..83ff792c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,10 +10,8 @@ version = project.mod_version group = project.maven_group configurations { - include - - implementation.extendsFrom include - api.extendsFrom include + implementation.extendsFrom libs + api.extendsFrom libs } allprojects { @@ -38,17 +36,18 @@ dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + include project(":ViaFabricPlus-Visual") - include "com.github.FlorianMichael:ViaLoadingBase:${project.vialoadingbase_version}" + libs "com.github.FlorianMichael:ViaLoadingBase:${project.vialoadingbase_version}" - include "com.viaversion:viaversion:${project.viaversion_version}" - include "com.viaversion:viabackwards-common:${project.viabackwards_version}" - include "org.yaml:snakeyaml:1.29" + libs "com.viaversion:viaversion:${project.viaversion_version}" + libs "com.viaversion:viabackwards-common:${project.viabackwards_version}" + libs "org.yaml:snakeyaml:1.29" - include "com.github.RaphiMC:ViaLegacy:${project.vialegacy_version}" - include "com.github.RaphiMC:ViaAprilFools:${project.viaaprilfools_version}" + libs "com.github.RaphiMC:ViaLegacy:${project.vialegacy_version}" + libs "com.github.RaphiMC:ViaAprilFools:${project.viaaprilfools_version}" - include "net.lenni0451.mcstructs:text:${project.mcstructs_text_version}" + libs "net.lenni0451.mcstructs:text:${project.mcstructs_text_version}" } processResources { @@ -68,10 +67,10 @@ java { } jar { - dependsOn configurations.include + dependsOn configurations.libs from { duplicatesStrategy = DuplicatesStrategy.EXCLUDE - configurations.include.collect { + configurations.libs.collect { zipTree(it) } } { @@ -81,26 +80,3 @@ jar { rename { "${it}_${project.archivesBaseName}" } } } - -tasks.register("installAddons") { - group archivesBaseName - dependsOn "build" - doLast { - File base = file(".") - base.listFiles().each { - if (it.name.startsWith("ViaFabricPlus-") && it.isDirectory()) { - String addonName = it.name.toLowerCase() + "-" + project(it.name).version + ".jar" - File build = new File(it, "build" + File.separator + "libs" + File.separator + addonName) - File modDest = new File(base, "run" + File.separator + "mods" + File.separator + addonName) - if(build.exists()) { - if (modDest.delete()) - println "Deleted old $addonName" - else - println "Failed to delete old $addonName version" - if (build.renameTo(modDest)) - println "Copied $addonName" - } - } - } - } -} diff --git a/gradle.properties b/gradle.properties index cedc28d6..791f429c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ minecraft_version=1.19.3 yarn_mappings=1.19.3+build.5 loader_version=0.14.14 -mod_version=1.3.8 +mod_version=1.4.0 maven_group=de.florianmichael archives_base_name=viafabricplus