From 295bbfa24a13b7189f5418007065de6c95150183 Mon Sep 17 00:00:00 2001 From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com> Date: Sat, 11 Jun 2022 16:50:19 -0300 Subject: [PATCH] update deps, fix runClient --- build.gradle | 2 +- gradle.properties | 2 +- viafabric-mc116/build.gradle.kts | 2 +- viafabric-mc117/build.gradle.kts | 4 ++-- viafabric-mc118/build.gradle.kts | 2 +- viafabric-mc119/build.gradle.kts | 6 +++--- .../fabric/mc119/mixin/gui/client/MixinServerEntry.java | 3 +-- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 09f664f..c5e23ed 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ allprojects { subprojects { dependencies { - implementation rootProject + modImplementation rootProject } publishing { diff --git a/gradle.properties b/gradle.properties index 141a102..252cf73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication org.gradle.parallel=true -loader_version=0.14.6 +loader_version=0.14.7 viaver_version=4.3.2-SNAPSHOT yaml_version=1.30 diff --git a/viafabric-mc116/build.gradle.kts b/viafabric-mc116/build.gradle.kts index 3918401..69e62fa 100644 --- a/viafabric-mc116/build.gradle.kts +++ b/viafabric-mc116/build.gradle.kts @@ -2,6 +2,6 @@ dependencies { minecraft("com.mojang:minecraft:1.16.5") mappings("net.fabricmc:yarn:1.16.5+build.10:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.40.1+1.16") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.42.0+1.16") modImplementation("com.terraformersmc:modmenu:1.16.9") } \ No newline at end of file diff --git a/viafabric-mc117/build.gradle.kts b/viafabric-mc117/build.gradle.kts index d081e5b..48a7b26 100644 --- a/viafabric-mc117/build.gradle.kts +++ b/viafabric-mc117/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { minecraft("com.mojang:minecraft:1.17.1") - mappings("net.fabricmc:yarn:1.17.1+build.64:v2") + mappings("net.fabricmc:yarn:1.17.1+build.65:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.43.1+1.17") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.46.1+1.17") modImplementation("com.terraformersmc:modmenu:2.0.2") } diff --git a/viafabric-mc118/build.gradle.kts b/viafabric-mc118/build.gradle.kts index eeff7db..b81abaf 100644 --- a/viafabric-mc118/build.gradle.kts +++ b/viafabric-mc118/build.gradle.kts @@ -2,6 +2,6 @@ dependencies { minecraft("com.mojang:minecraft:1.18.2") mappings("net.fabricmc:yarn:1.18.2+build.3:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.51.1+1.18.2") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.55.1+1.18.2") modImplementation("com.terraformersmc:modmenu:3.0.0") } diff --git a/viafabric-mc119/build.gradle.kts b/viafabric-mc119/build.gradle.kts index c6a356f..9e80b03 100644 --- a/viafabric-mc119/build.gradle.kts +++ b/viafabric-mc119/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { minecraft("com.mojang:minecraft:1.19") - mappings("net.fabricmc:yarn:1.19+build.1:v2") + mappings("net.fabricmc:yarn:1.19+build.2:v2") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.55.1+1.19") - modImplementation("com.terraformersmc:modmenu:4.0.0-beta.4") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.55.3+1.19") + modImplementation("com.terraformersmc:modmenu:4.0.0") } diff --git a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java index c4ccaff..c1f9b17 100644 --- a/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java +++ b/viafabric-mc119/src/main/java/com/viaversion/fabric/mc119/mixin/gui/client/MixinServerEntry.java @@ -24,9 +24,8 @@ public class MixinServerEntry { @Final private ServerInfo server; - // todo fix this intermediary @Redirect(method = "render", at = @At(value = "INVOKE", ordinal = 0, - target = "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderTexture(ILnet/minecraft/class_2960;)V")) + target = "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderTexture(ILnet/minecraft/util/Identifier;)V")) private void redirectPingIcon(int i, Identifier identifier) { if (identifier.equals(DrawableHelper.GUI_ICONS_TEXTURE) && ((ViaServerInfo) this.server).isViaTranslating()) { RenderSystem.setShaderTexture(i, new Identifier("viafabric:textures/gui/icons.png"));