From 94d5eb649ff78beb79fdc3fc7df07338b362ad77 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 7 Oct 2020 19:48:31 +0200 Subject: [PATCH] Update Fabric stuff --- build.gradle | 2 +- gradle.properties | 6 +++--- src/main/java/net/wurstclient/hacks/BowAimbotHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/ClickAuraHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/FightBotHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/FollowHack.java | 5 ++--- src/main/java/net/wurstclient/hacks/KillauraHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/KillauraLegitHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/MultiAuraHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/ProtectHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/RemoteViewHack.java | 5 ++--- src/main/java/net/wurstclient/hacks/TpAuraHack.java | 4 ++-- src/main/java/net/wurstclient/hacks/TriggerBotHack.java | 4 ++-- src/main/java/net/wurstclient/util/ListWidget.java | 4 ++-- 14 files changed, 28 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 6bd23893..214ee911 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.4-SNAPSHOT' + id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 549416bd..111f7b6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=1.16.3 -yarn_mappings=1.16.3+build.1 -loader_version=0.9.3+build.207 +yarn_mappings=1.16.3+build.28 +loader_version=0.10.1+build.209 #Fabric api -fabric_version=0.20.2+build.402-1.16 +fabric_version=0.23.0+build.410-1.16 # Mod Properties mod_version = v7.5-MC1.16.3 diff --git a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java index c69d1f34..cedb4ca7 100644 --- a/src/main/java/net/wurstclient/hacks/BowAimbotHack.java +++ b/src/main/java/net/wurstclient/hacks/BowAimbotHack.java @@ -26,10 +26,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -290,7 +290,7 @@ public final class BowAimbotHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/ClickAuraHack.java b/src/main/java/net/wurstclient/hacks/ClickAuraHack.java index 84559297..e4303c83 100644 --- a/src/main/java/net/wurstclient/hacks/ClickAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/ClickAuraHack.java @@ -23,10 +23,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -240,7 +240,7 @@ public final class ClickAuraHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/FightBotHack.java b/src/main/java/net/wurstclient/hacks/FightBotHack.java index 14d81e3c..4d26ef29 100644 --- a/src/main/java/net/wurstclient/hacks/FightBotHack.java +++ b/src/main/java/net/wurstclient/hacks/FightBotHack.java @@ -21,10 +21,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -234,7 +234,7 @@ public final class FightBotHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/FollowHack.java b/src/main/java/net/wurstclient/hacks/FollowHack.java index f4e7ee20..ff87c52b 100644 --- a/src/main/java/net/wurstclient/hacks/FollowHack.java +++ b/src/main/java/net/wurstclient/hacks/FollowHack.java @@ -20,10 +20,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -205,8 +205,7 @@ public final class FollowHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = - stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/KillauraHack.java b/src/main/java/net/wurstclient/hacks/KillauraHack.java index f23bbc94..1da54954 100644 --- a/src/main/java/net/wurstclient/hacks/KillauraHack.java +++ b/src/main/java/net/wurstclient/hacks/KillauraHack.java @@ -25,10 +25,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -245,7 +245,7 @@ public final class KillauraHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/KillauraLegitHack.java b/src/main/java/net/wurstclient/hacks/KillauraLegitHack.java index 74877330..d7977524 100644 --- a/src/main/java/net/wurstclient/hacks/KillauraLegitHack.java +++ b/src/main/java/net/wurstclient/hacks/KillauraLegitHack.java @@ -25,10 +25,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -224,7 +224,7 @@ public final class KillauraLegitHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/MultiAuraHack.java b/src/main/java/net/wurstclient/hacks/MultiAuraHack.java index 879dd66b..10807431 100644 --- a/src/main/java/net/wurstclient/hacks/MultiAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/MultiAuraHack.java @@ -23,10 +23,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -228,7 +228,7 @@ public final class MultiAuraHack extends Hack implements UpdateListener && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/ProtectHack.java b/src/main/java/net/wurstclient/hacks/ProtectHack.java index 322441bb..baf9f8d8 100644 --- a/src/main/java/net/wurstclient/hacks/ProtectHack.java +++ b/src/main/java/net/wurstclient/hacks/ProtectHack.java @@ -21,10 +21,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -271,7 +271,7 @@ public final class ProtectHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/RemoteViewHack.java b/src/main/java/net/wurstclient/hacks/RemoteViewHack.java index 9c3ecb55..edcaf049 100644 --- a/src/main/java/net/wurstclient/hacks/RemoteViewHack.java +++ b/src/main/java/net/wurstclient/hacks/RemoteViewHack.java @@ -19,10 +19,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -176,8 +176,7 @@ public final class RemoteViewHack extends Hack && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = - stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/TpAuraHack.java b/src/main/java/net/wurstclient/hacks/TpAuraHack.java index a87c6db9..b2cea9c1 100644 --- a/src/main/java/net/wurstclient/hacks/TpAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/TpAuraHack.java @@ -23,10 +23,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -215,7 +215,7 @@ public final class TpAuraHack extends Hack implements UpdateListener && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/hacks/TriggerBotHack.java b/src/main/java/net/wurstclient/hacks/TriggerBotHack.java index 1ed5fab9..adb34425 100644 --- a/src/main/java/net/wurstclient/hacks/TriggerBotHack.java +++ b/src/main/java/net/wurstclient/hacks/TriggerBotHack.java @@ -20,10 +20,10 @@ import net.minecraft.entity.mob.EndermanEntity; import net.minecraft.entity.mob.Monster; import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.mob.ZombifiedPiglinEntity; -import net.minecraft.entity.passive.AbstractTraderEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.GolemEntity; import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.MerchantEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.passive.TameableEntity; import net.minecraft.entity.player.PlayerEntity; @@ -215,7 +215,7 @@ public final class TriggerBotHack extends Hack implements UpdateListener && ((HorseBaseEntity)e).isTame())); if(filterTraders.isChecked()) - stream = stream.filter(e -> !(e instanceof AbstractTraderEntity)); + stream = stream.filter(e -> !(e instanceof MerchantEntity)); if(filterGolems.isChecked()) stream = stream.filter(e -> !(e instanceof GolemEntity)); diff --git a/src/main/java/net/wurstclient/util/ListWidget.java b/src/main/java/net/wurstclient/util/ListWidget.java index 7c60815e..247b7baf 100644 --- a/src/main/java/net/wurstclient/util/ListWidget.java +++ b/src/main/java/net/wurstclient/util/ListWidget.java @@ -133,7 +133,7 @@ public abstract class ListWidget extends AbstractParentElement Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); client.getTextureManager() - .bindTexture(DrawableHelper.BACKGROUND_TEXTURE); + .bindTexture(DrawableHelper.OPTIONS_BACKGROUND_TEXTURE); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); bufferBuilder.begin(7, VertexFormats.POSITION_TEXTURE_COLOR); bufferBuilder.vertex(left, bottom, 0.0D) @@ -420,7 +420,7 @@ public abstract class ListWidget extends AbstractParentElement Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferBuilder = tessellator.getBuffer(); client.getTextureManager() - .bindTexture(DrawableHelper.BACKGROUND_TEXTURE); + .bindTexture(DrawableHelper.OPTIONS_BACKGROUND_TEXTURE); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); bufferBuilder.begin(7, VertexFormats.POSITION_TEXTURE_COLOR); bufferBuilder.vertex(left, bottom, 0.0D).texture(0.0F, bottom / 32.0F)