From 5c99309a7b9b94d500d1e6448fb3cab49301d8b5 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 19 Feb 2020 14:43:46 +0100 Subject: [PATCH] Port to 1.15 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/hacks/FullbrightHack.java | 2 +- .../wurstclient/mixin/ClientPlayNetworkHandlerMixin.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4d4a021a..f74a9c7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.15.1 -yarn_mappings=1.15.1+build.37 +minecraft_version=1.15 +yarn_mappings=1.15+build.2 loader_version=0.7.8+build.184 #Fabric api fabric_version=0.4.32+build.292-1.15 # Mod Properties -mod_version = v7.0-MC1.15.1 +mod_version = v7.0-MC1.15 maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index 0534f90f..9676865a 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -51,7 +51,7 @@ public enum WurstClient public static final IMinecraftClient IMC = (IMinecraftClient)MC; public static final String VERSION = "7.0"; - public static final String MC_VERSION = "1.15.1"; + public static final String MC_VERSION = "1.15"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/hacks/FullbrightHack.java b/src/main/java/net/wurstclient/hacks/FullbrightHack.java index ea1f4117..d4c51d59 100644 --- a/src/main/java/net/wurstclient/hacks/FullbrightHack.java +++ b/src/main/java/net/wurstclient/hacks/FullbrightHack.java @@ -91,7 +91,7 @@ public final class FullbrightHack extends Hack implements UpdateListener if(!hasAppliedNightVision) return; - MC.player.removeStatusEffectInternal(StatusEffects.NIGHT_VISION); + MC.player.removeStatusEffect(StatusEffects.NIGHT_VISION); hasAppliedNightVision = false; } diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java index aba8100b..a7578aaa 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -649,14 +649,14 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener @Shadow @Override - public void onOpenContainer(OpenContainerS2CPacket var1) + public void onOpenContainer(OpenContainerPacket var1) { } @Shadow @Override - public void onSetTradeOffers(SetTradeOffersS2CPacket var1) + public void onSetTradeOffers(SetTradeOffersPacket var1) { } @@ -678,7 +678,7 @@ public class ClientPlayNetworkHandlerMixin implements ClientPlayPacketListener @Shadow @Override - public void onPlayerActionResponse(PlayerActionResponseS2CPacket var1) + public void handlePlayerActionResponse(PlayerActionResponseS2CPacket var1) { }