From 0e6b99c8f7d50e7a51e656e3676b455b7f862e1f Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 5 Oct 2023 17:23:14 +0200 Subject: [PATCH 01/26] [Wurst-Bot] Update to 23w40a --- gradle.properties | 10 +++++----- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 26c3651a87..db8fa04466 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.14.22 +minecraft_version=23w40a +yarn_mappings=23w40a+build.3 +loader_version=0.14.23 #Fabric api -fabric_version=0.89.3+1.20.2 +fabric_version=0.89.4+1.20.3 # Mod Properties -mod_version = v7.37.1-MC1.20.2 +mod_version = v7.37.1-MC23w40a 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 fd4fa86b4f..e9bd696c1d 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.37.1"; - public static final String MC_VERSION = "1.20.2"; + public static final String MC_VERSION = "23w40a"; private WurstAnalytics analytics; private EventManager eventManager; From dfbd3d6e66160897b4bff569c9c42049890486ed Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 5 Oct 2023 17:45:57 +0200 Subject: [PATCH 02/26] Update to 23w40a --- src/main/java/net/wurstclient/hacks/AutoFarmHack.java | 2 +- .../wurstclient/nochatreports/ForcedChatReportsScreen.java | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java index 9406254993..0a1ef5522c 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java @@ -206,7 +206,7 @@ private boolean shouldBeHarvested(BlockPos pos) if(block instanceof CocoaBlock) return state.get(CocoaBlock.AGE) >= 2; - if(block instanceof GourdBlock) + if(block == Blocks.PUMPKIN || block == Blocks.MELON) return true; if(block instanceof SugarCaneBlock) diff --git a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java index 98cc86ddce..d0b61b4b85 100644 --- a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java @@ -11,12 +11,12 @@ import java.util.List; import java.util.function.Supplier; +import net.minecraft.class_8828.LiteralTextContent; import net.minecraft.client.font.MultilineText; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.text.LiteralTextContent; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; import net.wurstclient.WurstClient; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 49a4ad447c..ff5fe76e85 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,9 +29,9 @@ "accessWidener" : "wurst.accesswidener", "depends": { - "fabricloader": ">=0.14.22", - "fabric-api": ">=0.88.4", - "minecraft": "~1.20.2-beta.4", + "fabricloader": ">=0.14.23", + "fabric-api": ">=0.89.4", + "minecraft": "~1.20.3-alpha.23.40.a", "java": ">=17" }, "suggests": { From 403db5e6efb17e5f22ee6861dabe80c14591b352 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 11 Oct 2023 18:58:40 +0200 Subject: [PATCH 03/26] [Wurst-Bot] Update to 23w41a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- .../nochatreports/ForcedChatReportsScreen.java | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index db8fa04466..a86da2c0d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w40a -yarn_mappings=23w40a+build.3 +minecraft_version=23w41a +yarn_mappings=23w41a+build.1 loader_version=0.14.23 #Fabric api -fabric_version=0.89.4+1.20.3 +fabric_version=0.90.1+1.20.3 # Mod Properties -mod_version = v7.37.1-MC23w40a +mod_version = v7.37.1-MC23w41a 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 e9bd696c1d..34b0212cf3 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.37.1"; - public static final String MC_VERSION = "23w40a"; + public static final String MC_VERSION = "23w41a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java index d0b61b4b85..7448e2df91 100644 --- a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java @@ -10,13 +10,12 @@ import java.util.Arrays; import java.util.List; import java.util.function.Supplier; - -import net.minecraft.class_8828.LiteralTextContent; import net.minecraft.client.font.MultilineText; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.text.PlainTextContent.Literal; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; import net.wurstclient.WurstClient; @@ -134,7 +133,7 @@ public static boolean isCausedByNoChatReports(Text disconnectReason) && TRANSLATABLE_DISCONNECT_REASONS.contains(tr.getKey())) return true; - if(disconnectReason.getContent() instanceof LiteralTextContent lt + if(disconnectReason.getContent() instanceof Literal lt && LITERAL_DISCONNECT_REASONS.contains(lt.string())) return true; From bd04ea95ff9e758d644f60ab767983dd6fff031b Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 18 Oct 2023 19:10:22 +0200 Subject: [PATCH 04/26] [Wurst-Bot] Update to 23w42a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index a86da2c0d6..ebdbc54689 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w41a -yarn_mappings=23w41a+build.1 +minecraft_version=23w42a +yarn_mappings=23w42a+build.1 loader_version=0.14.23 #Fabric api -fabric_version=0.90.1+1.20.3 +fabric_version=0.90.2+1.20.3 # Mod Properties -mod_version = v7.37.1-MC23w41a +mod_version = v7.37.1-MC23w42a 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 34b0212cf3..f148d8630f 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.37.1"; - public static final String MC_VERSION = "23w41a"; + public static final String MC_VERSION = "23w42a"; private WurstAnalytics analytics; private EventManager eventManager; From 7f26ccb7d5e550ebe366749b3fb444feb33f9416 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 18 Oct 2023 20:00:30 +0200 Subject: [PATCH 05/26] Update to 23w42a --- .../mixin/PlayerSkinProviderMixin.java | 27 ++++++++----------- .../ForcedChatReportsScreen.java | 1 + src/main/resources/fabric.mod.json | 4 +-- src/main/resources/wurst.accesswidener | 1 - 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java b/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java index 1525253985..69b7695923 100644 --- a/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java +++ b/src/main/java/net/wurstclient/mixin/PlayerSkinProviderMixin.java @@ -9,6 +9,7 @@ import java.io.InputStreamReader; import java.net.URL; +import java.util.UUID; import java.util.concurrent.CompletableFuture; import org.spongepowered.asm.mixin.Mixin; @@ -19,11 +20,10 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import com.mojang.authlib.minecraft.MinecraftProfileTextures; import net.minecraft.client.texture.PlayerSkinProvider; -import net.minecraft.client.texture.PlayerSkinProvider.Textures; import net.minecraft.client.util.SkinTextures; @Mixin(PlayerSkinProvider.class) @@ -33,26 +33,21 @@ public abstract class PlayerSkinProviderMixin private MinecraftProfileTexture currentCape; @Inject(at = @At("HEAD"), - method = "fetchSkinTextures(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider$Textures;)Ljava/util/concurrent/CompletableFuture;") - private void onFetchSkinTextures(GameProfile profile, Textures textures, + method = "fetchSkinTextures(Ljava/util/UUID;Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;)Ljava/util/concurrent/CompletableFuture;") + private void onFetchSkinTextures(UUID uuid, + MinecraftProfileTextures textures, CallbackInfoReturnable> cir) { - String name = profile.getName(); - String uuid = profile.getId().toString(); + String uuidString = uuid.toString(); try { if(capes == null) setupWurstCapes(); - if(capes.has(name)) + if(capes.has(uuidString)) { - String capeURL = capes.get(name).getAsString(); - currentCape = new MinecraftProfileTexture(capeURL, null); - - }else if(capes.has(uuid)) - { - String capeURL = capes.get(uuid).getAsString(); + String capeURL = capes.get(uuidString).getAsString(); currentCape = new MinecraftProfileTexture(capeURL, null); }else @@ -60,15 +55,15 @@ private void onFetchSkinTextures(GameProfile profile, Textures textures, }catch(Exception e) { - System.err.println("[Wurst] Failed to load cape for '" + name - + "' (" + uuid + ")"); + System.err + .println("[Wurst] Failed to load cape for UUID " + uuidString); e.printStackTrace(); } } @ModifyVariable(at = @At("STORE"), - method = "fetchSkinTextures(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/texture/PlayerSkinProvider$Textures;)Ljava/util/concurrent/CompletableFuture;", + method = "fetchSkinTextures(Ljava/util/UUID;Lcom/mojang/authlib/minecraft/MinecraftProfileTextures;)Ljava/util/concurrent/CompletableFuture;", ordinal = 1, name = "minecraftProfileTexture2") private MinecraftProfileTexture modifyCapeTexture( diff --git a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java index 7448e2df91..1ebe7fb415 100644 --- a/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java +++ b/src/main/java/net/wurstclient/nochatreports/ForcedChatReportsScreen.java @@ -10,6 +10,7 @@ import java.util.Arrays; import java.util.List; import java.util.function.Supplier; + import net.minecraft.client.font.MultilineText; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ff5fe76e85..b9262b4511 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.23", - "fabric-api": ">=0.89.4", - "minecraft": "~1.20.3-alpha.23.40.a", + "fabric-api": ">=0.90.2", + "minecraft": "~1.20.3-alpha.23.42.a", "java": ">=17" }, "suggests": { diff --git a/src/main/resources/wurst.accesswidener b/src/main/resources/wurst.accesswidener index 83369db15f..6961e92ae3 100644 --- a/src/main/resources/wurst.accesswidener +++ b/src/main/resources/wurst.accesswidener @@ -1,6 +1,5 @@ accessWidener v1 named accessible class net/minecraft/client/render/BackgroundRenderer$StatusEffectFogModifier -accessible class net/minecraft/client/texture/PlayerSkinProvider$Textures accessible method net/minecraft/client/MinecraftClient doItemUse ()V accessible method net/minecraft/client/render/GameRenderer loadPostProcessor (Lnet/minecraft/util/Identifier;)V accessible method net/minecraft/entity/projectile/FishingBobberEntity isOpenOrWaterAround (Lnet/minecraft/util/math/BlockPos;)Z From 561e01e8d92ea5b134c2ff0b5513b63d8541241f Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Sun, 22 Oct 2023 17:35:39 +0200 Subject: [PATCH 06/26] Add support for crafters and decorated pots to ChestESP --- .../net/wurstclient/hacks/ChestEspHack.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/ChestEspHack.java b/src/main/java/net/wurstclient/hacks/ChestEspHack.java index 18b23871a0..4bb891bc76 100644 --- a/src/main/java/net/wurstclient/hacks/ChestEspHack.java +++ b/src/main/java/net/wurstclient/hacks/ChestEspHack.java @@ -17,6 +17,7 @@ import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.class_8887; import net.minecraft.block.entity.*; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.util.math.MatrixStack; @@ -79,6 +80,11 @@ public class ChestEspHack extends Hack implements UpdateListener, "Barrels will be highlighted in this color.", Color.GREEN), new CheckboxSetting("Include barrels", true)); + private final ChestEspBlockGroup pots = new ChestEspBlockGroup( + new ColorSetting("Pots color", + "Decorated pots will be highlighted in this color.", Color.GREEN), + new CheckboxSetting("Include pots", false)); + private final ChestEspBlockGroup shulkerBoxes = new ChestEspBlockGroup( new ColorSetting("Shulker color", "Shulker boxes will be highlighted in this color.", Color.MAGENTA), @@ -107,14 +113,20 @@ public class ChestEspHack extends Hack implements UpdateListener, new Color(0xFF8000)), new CheckboxSetting("Include dispensers", false)); + private final ChestEspBlockGroup crafters = new ChestEspBlockGroup( + new ColorSetting("Crafter color", + "Crafters will be highlighted in this color.", Color.WHITE), + new CheckboxSetting("Include crafters", false)); + private final ChestEspBlockGroup furnaces = new ChestEspBlockGroup(new ColorSetting("Furnace color", "Furnaces, smokers, and blast furnaces will be highlighted in this color.", Color.RED), new CheckboxSetting("Include furnaces", false)); - private final List groups = Arrays.asList(basicChests, - trapChests, enderChests, chestCarts, chestBoats, barrels, shulkerBoxes, - hoppers, hopperCarts, droppers, dispensers, furnaces); + private final List groups = + Arrays.asList(basicChests, trapChests, enderChests, chestCarts, + chestBoats, barrels, pots, shulkerBoxes, hoppers, hopperCarts, + droppers, dispensers, crafters, furnaces); private final List entityGroups = Arrays.asList(chestCarts, chestBoats, hopperCarts); @@ -170,12 +182,16 @@ else if(blockEntity instanceof ShulkerBoxBlockEntity) shulkerBoxes.add(blockEntity); else if(blockEntity instanceof BarrelBlockEntity) barrels.add(blockEntity); + else if(blockEntity instanceof DecoratedPotBlockEntity) + pots.add(blockEntity); else if(blockEntity instanceof HopperBlockEntity) hoppers.add(blockEntity); else if(blockEntity instanceof DropperBlockEntity) droppers.add(blockEntity); else if(blockEntity instanceof DispenserBlockEntity) dispensers.add(blockEntity); + else if(blockEntity instanceof class_8887) + crafters.add(blockEntity); else if(blockEntity instanceof AbstractFurnaceBlockEntity) furnaces.add(blockEntity); From b361c702ac94496d22f3a3bcbffcb7f9a69bb16b Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 23 Oct 2023 17:12:27 +0200 Subject: [PATCH 07/26] Add crafter & decorated pot to default X-Ray list --- src/main/java/net/wurstclient/hacks/XRayHack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/wurstclient/hacks/XRayHack.java b/src/main/java/net/wurstclient/hacks/XRayHack.java index d989824dad..31fd437bc8 100644 --- a/src/main/java/net/wurstclient/hacks/XRayHack.java +++ b/src/main/java/net/wurstclient/hacks/XRayHack.java @@ -48,7 +48,8 @@ public final class XRayHack extends Hack implements UpdateListener, "minecraft:brewing_stand", "minecraft:chain_command_block", "minecraft:chest", "minecraft:clay", "minecraft:coal_block", "minecraft:coal_ore", "minecraft:command_block", "minecraft:copper_ore", - "minecraft:crafting_table", "minecraft:deepslate_coal_ore", + "minecraft:crafter", "minecraft:crafting_table", + "minecraft:decorated_pot", "minecraft:deepslate_coal_ore", "minecraft:deepslate_copper_ore", "minecraft:deepslate_diamond_ore", "minecraft:deepslate_emerald_ore", "minecraft:deepslate_gold_ore", "minecraft:deepslate_iron_ore", "minecraft:deepslate_lapis_ore", From 1705eb28fd0f26a1064ad6e864a0647f3029cdea Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 23 Oct 2023 17:28:07 +0200 Subject: [PATCH 08/26] Update Fabric stuff --- gradle.properties | 4 ++-- src/main/java/net/wurstclient/hacks/ChestEspHack.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5840672c57..eb10bcccfe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,11 @@ org.gradle.parallel=true # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=23w42a -yarn_mappings=23w42a+build.1 +yarn_mappings=23w42a+build.5 loader_version=0.14.23 #Fabric api -fabric_version=0.90.2+1.20.3 +fabric_version=0.90.4+1.20.3 # Mod Properties mod_version = v7.38-MC23w42a diff --git a/src/main/java/net/wurstclient/hacks/ChestEspHack.java b/src/main/java/net/wurstclient/hacks/ChestEspHack.java index 4bb891bc76..47757501c6 100644 --- a/src/main/java/net/wurstclient/hacks/ChestEspHack.java +++ b/src/main/java/net/wurstclient/hacks/ChestEspHack.java @@ -17,7 +17,6 @@ import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.class_8887; import net.minecraft.block.entity.*; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.util.math.MatrixStack; @@ -190,7 +189,7 @@ else if(blockEntity instanceof DropperBlockEntity) droppers.add(blockEntity); else if(blockEntity instanceof DispenserBlockEntity) dispensers.add(blockEntity); - else if(blockEntity instanceof class_8887) + else if(blockEntity instanceof CrafterBlockEntity) crafters.add(blockEntity); else if(blockEntity instanceof AbstractFurnaceBlockEntity) furnaces.add(blockEntity); From d37ab4f54d5fa459c0d21381a936205eaf04424b Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 25 Oct 2023 19:48:02 +0200 Subject: [PATCH 09/26] [Wurst-Bot] Update to 23w43a --- gradle.properties | 10 +++++----- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index eb10bcccfe..0ef2165dbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w42a -yarn_mappings=23w42a+build.5 -loader_version=0.14.23 +minecraft_version=23w43a +yarn_mappings=23w43a+build.1 +loader_version=0.14.24 #Fabric api -fabric_version=0.90.4+1.20.3 +fabric_version=0.90.5+1.20.3 # Mod Properties -mod_version = v7.38-MC23w42a +mod_version = v7.38-MC23w43a 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 27bbd5dcdc..2b62a3343a 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.38"; - public static final String MC_VERSION = "23w42a"; + public static final String MC_VERSION = "23w43a"; private WurstAnalytics analytics; private EventManager eventManager; From 58eb1f9668dad723d3e17c7a79b954afb207c241 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 1 Nov 2023 19:12:35 +0100 Subject: [PATCH 10/26] [Wurst-Bot] Update to 23w44a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- .../net/wurstclient/mixin/DirectConnectScreenMixin.java | 3 +-- .../java/net/wurstclient/util/LastServerRememberer.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0ef2165dbc..aeec59c23d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w43a -yarn_mappings=23w43a+build.1 +minecraft_version=23w44a +yarn_mappings=23w44a+build.1 loader_version=0.14.24 #Fabric api -fabric_version=0.90.5+1.20.3 +fabric_version=0.90.6+1.20.3 # Mod Properties -mod_version = v7.38-MC23w43a +mod_version = v7.38-MC23w44a 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 2b62a3343a..e895236fd3 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.38"; - public static final String MC_VERSION = "23w43a"; + public static final String MC_VERSION = "23w44a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java b/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java index 31a195b8e3..e31a1da4e5 100644 --- a/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java @@ -13,9 +13,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.client.gui.screen.DirectConnectScreen; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.multiplayer.DirectConnectScreen; import net.minecraft.client.network.ServerInfo; import net.minecraft.text.Text; import net.wurstclient.WurstClient; diff --git a/src/main/java/net/wurstclient/util/LastServerRememberer.java b/src/main/java/net/wurstclient/util/LastServerRememberer.java index 2ac7eedef7..28b5b88f60 100644 --- a/src/main/java/net/wurstclient/util/LastServerRememberer.java +++ b/src/main/java/net/wurstclient/util/LastServerRememberer.java @@ -7,8 +7,8 @@ */ package net.wurstclient.util; -import net.minecraft.client.gui.screen.ConnectScreen; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.multiplayer.ConnectScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.network.ServerAddress; import net.minecraft.client.network.ServerInfo; From ee781b23b240fc693f50d9198fbedcd92444486c Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 1 Nov 2023 19:37:10 +0100 Subject: [PATCH 11/26] Update to 23w44a --- .../net/wurstclient/mixin/DirectConnectScreenMixin.java | 1 + src/main/resources/fabric.mod.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java b/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java index e31a1da4e5..c65e19cf4c 100644 --- a/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/DirectConnectScreenMixin.java @@ -13,6 +13,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.DirectConnectScreen; import net.minecraft.client.network.ServerInfo; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b9262b4511..230c2ff8bc 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,9 +29,9 @@ "accessWidener" : "wurst.accesswidener", "depends": { - "fabricloader": ">=0.14.23", - "fabric-api": ">=0.90.2", - "minecraft": "~1.20.3-alpha.23.42.a", + "fabricloader": ">=0.14.24", + "fabric-api": ">=0.90.6", + "minecraft": "~1.20.3-alpha.23.44.a", "java": ">=17" }, "suggests": { From ce923802f77843f9c3a77979ed8174dfb9af8bf5 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 8 Nov 2023 19:40:52 +0100 Subject: [PATCH 12/26] [Wurst-Bot] Update to 23w45a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index aeec59c23d..b02c3faddb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w44a -yarn_mappings=23w44a+build.1 +minecraft_version=23w45a +yarn_mappings=23w45a+build.1 loader_version=0.14.24 #Fabric api -fabric_version=0.90.6+1.20.3 +fabric_version=0.90.8+1.20.3 # Mod Properties -mod_version = v7.38-MC23w44a +mod_version = v7.38-MC23w45a 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 e895236fd3..4cd0359c69 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.38"; - public static final String MC_VERSION = "23w44a"; + public static final String MC_VERSION = "23w45a"; private WurstAnalytics analytics; private EventManager eventManager; From f77abbb67a7435f2acc080eddd21530da0bf3b7e Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 16 Nov 2023 18:23:07 +0100 Subject: [PATCH 13/26] [Wurst-Bot] Update to 23w46a --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/FriendsList.java | 4 ++-- src/main/java/net/wurstclient/WurstClient.java | 2 +- src/main/java/net/wurstclient/commands/CopyItemCmd.java | 2 +- src/main/java/net/wurstclient/hacks/AnchorAuraHack.java | 2 +- src/main/java/net/wurstclient/hacks/CrystalAuraHack.java | 2 +- src/main/java/net/wurstclient/hacks/PlayerEspHack.java | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 936009ef2d..17a56d117d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w45a -yarn_mappings=23w45a+build.1 +minecraft_version=23w46a +yarn_mappings=23w46a+build.1 loader_version=0.14.24 #Fabric api -fabric_version=0.90.8+1.20.3 +fabric_version=0.90.9+1.20.3 # Mod Properties -mod_version = v7.39-MC23w45a +mod_version = v7.39-MC23w46a maven_group = net.wurstclient archives_base_name = Wurst-Client diff --git a/src/main/java/net/wurstclient/FriendsList.java b/src/main/java/net/wurstclient/FriendsList.java index 3e166752bd..ae53e002c2 100644 --- a/src/main/java/net/wurstclient/FriendsList.java +++ b/src/main/java/net/wurstclient/FriendsList.java @@ -60,7 +60,7 @@ public void middleClick(Entity entity) if(!middleClickFriends.isChecked()) return; - String name = entity.getEntityName(); + String name = entity.method_5820(); if(contains(name)) removeAndSave(name); @@ -75,7 +75,7 @@ public boolean contains(String name) public boolean isFriend(Entity entity) { - return entity != null && contains(entity.getEntityName()); + return entity != null && contains(entity.method_5820()); } public ArrayList toList() diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java index b49c3824b0..0b69220bda 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39"; - public static final String MC_VERSION = "23w45a"; + public static final String MC_VERSION = "23w46a"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/commands/CopyItemCmd.java b/src/main/java/net/wurstclient/commands/CopyItemCmd.java index 5c2dea044a..4185349c1c 100644 --- a/src/main/java/net/wurstclient/commands/CopyItemCmd.java +++ b/src/main/java/net/wurstclient/commands/CopyItemCmd.java @@ -47,7 +47,7 @@ private AbstractClientPlayerEntity getPlayer(String name) throws CmdError { for(AbstractClientPlayerEntity player : MC.world.getPlayers()) { - if(!player.getEntityName().equalsIgnoreCase(name)) + if(!player.method_5820().equalsIgnoreCase(name)) continue; return player; diff --git a/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java b/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java index 824fa6922c..84706a5b74 100644 --- a/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java @@ -333,7 +333,7 @@ private ArrayList getNearbyTargets() && ((LivingEntity)e).getHealth() > 0) .filter(e -> e != MC.player) .filter(e -> !(e instanceof FakePlayerEntity)) - .filter(e -> !WURST.getFriends().contains(e.getEntityName())) + .filter(e -> !WURST.getFriends().contains(e.method_5820())) .filter(e -> MC.player.squaredDistanceTo(e) <= rangeSq); stream = entityFilters.applyTo(stream); diff --git a/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java b/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java index 28cb935353..24dbeb0f4d 100644 --- a/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java @@ -251,7 +251,7 @@ private ArrayList getNearbyTargets() && ((LivingEntity)e).getHealth() > 0) .filter(e -> e != MC.player) .filter(e -> !(e instanceof FakePlayerEntity)) - .filter(e -> !WURST.getFriends().contains(e.getEntityName())) + .filter(e -> !WURST.getFriends().contains(e.method_5820())) .filter(e -> MC.player.squaredDistanceTo(e) <= rangeSq); stream = entityFilters.applyTo(stream); diff --git a/src/main/java/net/wurstclient/hacks/PlayerEspHack.java b/src/main/java/net/wurstclient/hacks/PlayerEspHack.java index a44a5d2e1c..43aa32d1a5 100644 --- a/src/main/java/net/wurstclient/hacks/PlayerEspHack.java +++ b/src/main/java/net/wurstclient/hacks/PlayerEspHack.java @@ -160,7 +160,7 @@ private void renderBoxes(MatrixStack matrixStack, float partialTicks, e.getHeight() + extraSize, e.getWidth() + extraSize); // set color - if(WURST.getFriends().contains(e.getEntityName())) + if(WURST.getFriends().contains(e.method_5820())) RenderSystem.setShaderColor(0, 0, 1, 0.5F); else { @@ -199,7 +199,7 @@ private void renderTracers(MatrixStack matrixStack, float partialTicks, float r, g, b; - if(WURST.getFriends().contains(e.getEntityName())) + if(WURST.getFriends().contains(e.method_5820())) { r = 0; g = 0; From c0252d541f4c662272bbb4a454df367717ea18ba Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 16 Nov 2023 18:45:14 +0100 Subject: [PATCH 14/26] Update to 23w46a --- src/main/java/net/wurstclient/FriendsList.java | 4 ++-- src/main/java/net/wurstclient/commands/CopyItemCmd.java | 2 +- src/main/java/net/wurstclient/hacks/AnchorAuraHack.java | 3 ++- src/main/java/net/wurstclient/hacks/CrystalAuraHack.java | 3 ++- src/main/java/net/wurstclient/hacks/PlayerEspHack.java | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/wurstclient/FriendsList.java b/src/main/java/net/wurstclient/FriendsList.java index ae53e002c2..22261e01ee 100644 --- a/src/main/java/net/wurstclient/FriendsList.java +++ b/src/main/java/net/wurstclient/FriendsList.java @@ -60,7 +60,7 @@ public void middleClick(Entity entity) if(!middleClickFriends.isChecked()) return; - String name = entity.method_5820(); + String name = entity.getName().getString(); if(contains(name)) removeAndSave(name); @@ -75,7 +75,7 @@ public boolean contains(String name) public boolean isFriend(Entity entity) { - return entity != null && contains(entity.method_5820()); + return entity != null && contains(entity.getName().getString()); } public ArrayList toList() diff --git a/src/main/java/net/wurstclient/commands/CopyItemCmd.java b/src/main/java/net/wurstclient/commands/CopyItemCmd.java index 4185349c1c..08ff593503 100644 --- a/src/main/java/net/wurstclient/commands/CopyItemCmd.java +++ b/src/main/java/net/wurstclient/commands/CopyItemCmd.java @@ -47,7 +47,7 @@ private AbstractClientPlayerEntity getPlayer(String name) throws CmdError { for(AbstractClientPlayerEntity player : MC.world.getPlayers()) { - if(!player.method_5820().equalsIgnoreCase(name)) + if(!player.getName().getString().equalsIgnoreCase(name)) continue; return player; diff --git a/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java b/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java index 84706a5b74..554494f589 100644 --- a/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/AnchorAuraHack.java @@ -333,7 +333,8 @@ private ArrayList getNearbyTargets() && ((LivingEntity)e).getHealth() > 0) .filter(e -> e != MC.player) .filter(e -> !(e instanceof FakePlayerEntity)) - .filter(e -> !WURST.getFriends().contains(e.method_5820())) + .filter( + e -> !WURST.getFriends().contains(e.getName().getString())) .filter(e -> MC.player.squaredDistanceTo(e) <= rangeSq); stream = entityFilters.applyTo(stream); diff --git a/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java b/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java index 24dbeb0f4d..b19cfaae13 100644 --- a/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java +++ b/src/main/java/net/wurstclient/hacks/CrystalAuraHack.java @@ -251,7 +251,8 @@ private ArrayList getNearbyTargets() && ((LivingEntity)e).getHealth() > 0) .filter(e -> e != MC.player) .filter(e -> !(e instanceof FakePlayerEntity)) - .filter(e -> !WURST.getFriends().contains(e.method_5820())) + .filter( + e -> !WURST.getFriends().contains(e.getName().getString())) .filter(e -> MC.player.squaredDistanceTo(e) <= rangeSq); stream = entityFilters.applyTo(stream); diff --git a/src/main/java/net/wurstclient/hacks/PlayerEspHack.java b/src/main/java/net/wurstclient/hacks/PlayerEspHack.java index 43aa32d1a5..2b2835f498 100644 --- a/src/main/java/net/wurstclient/hacks/PlayerEspHack.java +++ b/src/main/java/net/wurstclient/hacks/PlayerEspHack.java @@ -160,7 +160,7 @@ private void renderBoxes(MatrixStack matrixStack, float partialTicks, e.getHeight() + extraSize, e.getWidth() + extraSize); // set color - if(WURST.getFriends().contains(e.method_5820())) + if(WURST.getFriends().contains(e.getName().getString())) RenderSystem.setShaderColor(0, 0, 1, 0.5F); else { @@ -199,7 +199,7 @@ private void renderTracers(MatrixStack matrixStack, float partialTicks, float r, g, b; - if(WURST.getFriends().contains(e.method_5820())) + if(WURST.getFriends().contains(e.getName().getString())) { r = 0; g = 0; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 230c2ff8bc..a339f6f393 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.24", - "fabric-api": ">=0.90.6", - "minecraft": "~1.20.3-alpha.23.44.a", + "fabric-api": ">=0.90.9", + "minecraft": "~1.20.3-alpha.23.46.a", "java": ">=17" }, "suggests": { From 42f6074457f3999ed826e3163244f0d05d440fdf Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 20 Nov 2023 20:02:28 +0100 Subject: [PATCH 15/26] [Wurst-Bot] Update to 1.20.3-pre1 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 17a56d117d..2f3bb5561d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=23w46a -yarn_mappings=23w46a+build.1 +minecraft_version=1.20.3-pre1 +yarn_mappings=1.20.3-pre1+build.1 loader_version=0.14.24 #Fabric api -fabric_version=0.90.9+1.20.3 +fabric_version=0.90.11+1.20.3 # Mod Properties -mod_version = v7.39-MC23w46a +mod_version = v7.39-MC1.20.3-pre1 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 0b69220bda..240ff19a1f 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39"; - public static final String MC_VERSION = "23w46a"; + public static final String MC_VERSION = "1.20.3-pre1"; private WurstAnalytics analytics; private EventManager eventManager; From c3aaccf36d33f2c28833dd4d394b41c173227829 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 20 Nov 2023 20:14:06 +0100 Subject: [PATCH 16/26] Update to 1.20.3-pre1 --- .../wurstclient/mixin/ClientPlayNetworkHandlerMixin.java | 6 +++--- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java index b195f1018b..4dd219a3c0 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -52,8 +52,8 @@ public void onOnServerMetadata(ServerMetadataS2CPacket packet, // Remove Mojang's dishonest warning toast on safe servers if(!packet.isSecureChatEnforced()) { - client.getToastManager().toastQueue.removeIf(toast -> toast - .getType() == SystemToast.Type.UNSECURE_SERVER_WARNING); + client.getToastManager().toastQueue.removeIf( + toast -> toast.getType() == SystemToast.class_9037.field_47589); return; } @@ -64,7 +64,7 @@ public void onOnServerMetadata(ServerMetadataS2CPacket packet, .translatable("toast.wurst.nochatreports.unsafe_server.message"); SystemToast systemToast = SystemToast.create(client, - SystemToast.Type.UNSECURE_SERVER_WARNING, title, message); + SystemToast.class_9037.field_47589, title, message); client.getToastManager().add(systemToast); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a339f6f393..cefd897513 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ "depends": { "fabricloader": ">=0.14.24", "fabric-api": ">=0.90.9", - "minecraft": "~1.20.3-alpha.23.46.a", + "minecraft": "~1.20.3-beta.1", "java": ">=17" }, "suggests": { From a327950cae48f18611aee6100a63b14a021e774c Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 22 Nov 2023 18:43:44 +0100 Subject: [PATCH 17/26] [Wurst-Bot] Update to 1.20.3-pre2 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- .../wurstclient/mixin/ClientPlayNetworkHandlerMixin.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2f3bb5561d..60e03127ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.3-pre1 -yarn_mappings=1.20.3-pre1+build.1 +minecraft_version=1.20.3-pre2 +yarn_mappings=1.20.3-pre2+build.2 loader_version=0.14.24 #Fabric api -fabric_version=0.90.11+1.20.3 +fabric_version=0.90.12+1.20.3 # Mod Properties -mod_version = v7.39-MC1.20.3-pre1 +mod_version = v7.39-MC1.20.3-pre2 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 240ff19a1f..237cef0345 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39"; - public static final String MC_VERSION = "1.20.3-pre1"; + public static final String MC_VERSION = "1.20.3-pre2"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java index 4dd219a3c0..6845a61dd7 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -53,7 +53,7 @@ public void onOnServerMetadata(ServerMetadataS2CPacket packet, if(!packet.isSecureChatEnforced()) { client.getToastManager().toastQueue.removeIf( - toast -> toast.getType() == SystemToast.class_9037.field_47589); + toast -> toast.getType() == SystemToast.Type.UNSECURE_SERVER_WARNING); return; } @@ -64,7 +64,7 @@ public void onOnServerMetadata(ServerMetadataS2CPacket packet, .translatable("toast.wurst.nochatreports.unsafe_server.message"); SystemToast systemToast = SystemToast.create(client, - SystemToast.class_9037.field_47589, title, message); + SystemToast.Type.UNSECURE_SERVER_WARNING, title, message); client.getToastManager().add(systemToast); } From 41d5963abb6977f3ea8fe415920ec1299e1aae97 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 22 Nov 2023 18:59:13 +0100 Subject: [PATCH 18/26] Update to 1.20.3-pre2 --- src/main/resources/fabric.mod.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cefd897513..7f2b51aa6c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.24", - "fabric-api": ">=0.90.9", - "minecraft": "~1.20.3-beta.1", + "fabric-api": ">=0.90.11", + "minecraft": "~1.20.3-beta.2", "java": ">=17" }, "suggests": { From 03b46d3fc89e289df4d1b427a5e39410872ff73a Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 27 Nov 2023 17:46:33 +0100 Subject: [PATCH 19/26] [Wurst-Bot] Update to 1.20.3-pre3 --- gradle.properties | 10 +++++----- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index c1ac06fff9..d5fc58fae0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.3-pre2 -yarn_mappings=1.20.3-pre2+build.2 -loader_version=0.14.24 +minecraft_version=1.20.3-pre3 +yarn_mappings=1.20.3-pre3+build.1 +loader_version=0.14.25 #Fabric api -fabric_version=0.90.12+1.20.3 +fabric_version=0.91.1+1.20.3 # Mod Properties -mod_version = v7.39.1-MC1.20.3-pre2 +mod_version = v7.39.1-MC1.20.3-pre3 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 491fd0196b..1a5c87a5b4 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39.1"; - public static final String MC_VERSION = "1.20.3-pre2"; + public static final String MC_VERSION = "1.20.3-pre3"; private WurstAnalytics analytics; private EventManager eventManager; From 70e03e8cfad998f92a85318b2af35d0db78f0d71 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Mon, 27 Nov 2023 18:13:23 +0100 Subject: [PATCH 20/26] Update to 1.20.3-pre3 --- .../mixin/ClientPlayNetworkHandlerMixin.java | 4 ++-- .../mixin/MinecraftClientMixin.java | 18 ++---------------- src/main/resources/fabric.mod.json | 4 ++-- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java index 6845a61dd7..b195f1018b 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayNetworkHandlerMixin.java @@ -52,8 +52,8 @@ public void onOnServerMetadata(ServerMetadataS2CPacket packet, // Remove Mojang's dishonest warning toast on safe servers if(!packet.isSecureChatEnforced()) { - client.getToastManager().toastQueue.removeIf( - toast -> toast.getType() == SystemToast.Type.UNSECURE_SERVER_WARNING); + client.getToastManager().toastQueue.removeIf(toast -> toast + .getType() == SystemToast.Type.UNSECURE_SERVER_WARNING); return; } diff --git a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java b/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java index c12af4285f..4020cdcc4c 100644 --- a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java +++ b/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java @@ -19,7 +19,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.mojang.authlib.GameProfile; -import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.UserApiService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; @@ -179,23 +178,10 @@ public void setSession(Session session) { wurstSession = session; - UserApiService userApiService = - wurst_createUserApiService(session.getAccessToken()); + UserApiService userApiService = authenticationService + .createUserApiService(session.getAccessToken()); UUID uuid = wurstSession.getUuidOrNull(); wurstProfileKeys = new ProfileKeysImpl(userApiService, uuid, runDirectory.toPath()); } - - private UserApiService wurst_createUserApiService(String accessToken) - { - try - { - return authenticationService.createUserApiService(accessToken); - - }catch(AuthenticationException e) - { - e.printStackTrace(); - return UserApiService.OFFLINE; - } - } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7f2b51aa6c..caba92d048 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ "depends": { "fabricloader": ">=0.14.24", - "fabric-api": ">=0.90.11", - "minecraft": "~1.20.3-beta.2", + "fabric-api": ">=0.91.1", + "minecraft": "~1.20.3-beta.3", "java": ">=17" }, "suggests": { From 5e90a9fc6fd2a5ad56bad2f0bb80a185cc330b38 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 28 Nov 2023 17:35:21 +0100 Subject: [PATCH 21/26] [Wurst-Bot] Update to 1.20.3-pre4 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index d5fc58fae0..ff56dce828 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.3-pre3 -yarn_mappings=1.20.3-pre3+build.1 +minecraft_version=1.20.3-pre4 +yarn_mappings=1.20.3-pre4+build.1 loader_version=0.14.25 #Fabric api fabric_version=0.91.1+1.20.3 # Mod Properties -mod_version = v7.39.1-MC1.20.3-pre3 +mod_version = v7.39.1-MC1.20.3-pre4 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 1a5c87a5b4..a194149d46 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39.1"; - public static final String MC_VERSION = "1.20.3-pre3"; + public static final String MC_VERSION = "1.20.3-pre4"; private WurstAnalytics analytics; private EventManager eventManager; From d5e48cba8959051e2258a1fda2e6e8b40a39a72a Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 30 Nov 2023 19:40:43 +0100 Subject: [PATCH 22/26] [Wurst-Bot] Update to 1.20.3-rc1 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index ff56dce828..865bb3e008 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.3-pre4 -yarn_mappings=1.20.3-pre4+build.1 -loader_version=0.14.25 +minecraft_version=1.20.3-rc1 +yarn_mappings=1.20.3-rc1+build.2 +loader_version=0.15.0 #Fabric api fabric_version=0.91.1+1.20.3 # Mod Properties -mod_version = v7.39.1-MC1.20.3-pre4 +mod_version = v7.39.1-MC1.20.3-rc1 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 a194149d46..92ae9bc60b 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39.1"; - public static final String MC_VERSION = "1.20.3-pre4"; + public static final String MC_VERSION = "1.20.3-rc1"; private WurstAnalytics analytics; private EventManager eventManager; From 979bed4a5b6839cb051ed2be71b64b207066f7bb Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 5 Dec 2023 17:56:38 +0100 Subject: [PATCH 23/26] [Wurst-Bot] Update to 1.20.3 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 865bb3e008..e42a26df9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.3-rc1 -yarn_mappings=1.20.3-rc1+build.2 +minecraft_version=1.20.3 +yarn_mappings=1.20.3+build.1 loader_version=0.15.0 #Fabric api fabric_version=0.91.1+1.20.3 # Mod Properties -mod_version = v7.39.1-MC1.20.3-rc1 +mod_version = v7.39.1-MC1.20.3 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 92ae9bc60b..8fd61dc22f 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39.1"; - public static final String MC_VERSION = "1.20.3-rc1"; + public static final String MC_VERSION = "1.20.3"; private WurstAnalytics analytics; private EventManager eventManager; From 872dae2b17b8348e6f374d9ae7525409096e0123 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Wed, 6 Dec 2023 19:21:06 +0100 Subject: [PATCH 24/26] [Wurst-Bot] Update to 1.20.4-rc1 --- gradle.properties | 8 ++++---- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index e42a26df9e..81bc04ae48 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.3 -yarn_mappings=1.20.3+build.1 +minecraft_version=1.20.4-rc1 +yarn_mappings=1.20.4-rc1+build.1 loader_version=0.15.0 #Fabric api -fabric_version=0.91.1+1.20.3 +fabric_version=0.91.1+1.20.4 # Mod Properties -mod_version = v7.39.1-MC1.20.3 +mod_version = v7.39.1-MC1.20.4-rc1 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 8fd61dc22f..6df508e660 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39.1"; - public static final String MC_VERSION = "1.20.3"; + public static final String MC_VERSION = "1.20.4-rc1"; private WurstAnalytics analytics; private EventManager eventManager; From a7a3eb734ad603bdb1bad1b4937ed5f38957bff1 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 7 Dec 2023 16:13:39 +0100 Subject: [PATCH 25/26] [Wurst-Bot] Update to 1.20.4 --- gradle.properties | 6 +++--- src/main/java/net/wurstclient/WurstClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 81bc04ae48..c822ef7ca4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.20.4-rc1 -yarn_mappings=1.20.4-rc1+build.1 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.1 loader_version=0.15.0 #Fabric api fabric_version=0.91.1+1.20.4 # Mod Properties -mod_version = v7.39.1-MC1.20.4-rc1 +mod_version = v7.39.1-MC1.20.4 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 6df508e660..ee072a548c 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -58,7 +58,7 @@ public enum WurstClient public static IMinecraftClient IMC; public static final String VERSION = "7.39.1"; - public static final String MC_VERSION = "1.20.4-rc1"; + public static final String MC_VERSION = "1.20.4"; private WurstAnalytics analytics; private EventManager eventManager; From b704bf85a3b2b100c9d4173ee4406b10dec74189 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 7 Dec 2023 16:19:29 +0100 Subject: [PATCH 26/26] Update required Fabric loader version --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index caba92d048..8bcaafa05d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "accessWidener" : "wurst.accesswidener", "depends": { - "fabricloader": ">=0.14.24", + "fabricloader": ">=0.15.0", "fabric-api": ">=0.91.1", "minecraft": "~1.20.3-beta.3", "java": ">=17"