Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-09-30 04:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved building, fixed incompatibility

Browse Source
This commit is contained in:
FlorianMichael 2023-02-26 17:00:34 +01:00
parent e40aa02544
commit d404c5b820
3 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ViaFabricPlus-Visual/src/main/java/de/florianmichael/viafabricplus_visual/injection/mixin/MixinChatHud.java
View File

@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(ChatHud.class) @Mixin(ChatHud.class)
public class MixinChatHud { 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) { public MessageIndicator removeIndicators(ChatHudLine.Visible instance) {
if (ViaFabricPlusVisual.hideSignatureIndicator.getValue()) { if (ViaFabricPlusVisual.hideSignatureIndicator.getValue()) {
return null; return null;

48
build.gradle
View File

@ -10,10 +10,8 @@ version = project.mod_version
group = project.maven_group group = project.maven_group
configurations { configurations {
include implementation.extendsFrom libs
api.extendsFrom libs
implementation.extendsFrom include
api.extendsFrom include
} }
allprojects { allprojects {
@ -38,17 +36,18 @@ dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}" minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" 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}" libs "com.viaversion:viaversion:${project.viaversion_version}"
include "com.viaversion:viabackwards-common:${project.viabackwards_version}" libs "com.viaversion:viabackwards-common:${project.viabackwards_version}"
include "org.yaml:snakeyaml:1.29" libs "org.yaml:snakeyaml:1.29"
include "com.github.RaphiMC:ViaLegacy:${project.vialegacy_version}" libs "com.github.RaphiMC:ViaLegacy:${project.vialegacy_version}"
include "com.github.RaphiMC:ViaAprilFools:${project.viaaprilfools_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 { processResources {
@ -68,10 +67,10 @@ java {
} }
jar { jar {
dependsOn configurations.include dependsOn configurations.libs
from { from {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
configurations.include.collect { configurations.libs.collect {
zipTree(it) zipTree(it)
} }
} { } {
@ -81,26 +80,3 @@ jar {
rename { "${it}_${project.archivesBaseName}" } 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"
}
}
}
}
}

2
gradle.properties
View File

@ -5,7 +5,7 @@ minecraft_version=1.19.3
yarn_mappings=1.19.3+build.5 yarn_mappings=1.19.3+build.5
loader_version=0.14.14 loader_version=0.14.14
mod_version=1.3.8 mod_version=1.4.0
maven_group=de.florianmichael maven_group=de.florianmichael
archives_base_name=viafabricplus archives_base_name=viafabricplus