From 40b30bbbe82a7c27d5cfd0014a4ba4eeae8b8e0d Mon Sep 17 00:00:00 2001 From: nxyi Date: Sun, 10 Mar 2024 13:52:27 +0000 Subject: [PATCH] 1.20.4 --- build.gradle | 4 ++-- gradle.properties | 8 ++++---- .../java/com/dark/zewo2/commands/HologramCommand.java | 4 ++-- src/main/java/com/dark/zewo2/modules/AutoL.java | 2 +- src/main/java/com/dark/zewo2/modules/Bookchat.java | 6 +++--- src/main/java/com/dark/zewo2/modules/SitModule.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index ac1b257..87ff98a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' } sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 @@ -25,7 +25,7 @@ configurations { dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + mappings "net.fabricmc:yarn:${project.yarn_version}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Meteor Client diff --git a/gradle.properties b/gradle.properties index 48d942f..b83a344 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties (https://fabricmc.net/versions.html) -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.14.12 +minecraft_version=1.20.4 +yarn_version=1.20.4+build.3 +loader_version=0.15.2 # Mod Properties mod_version=1.0.6 @@ -13,4 +13,4 @@ archives_base_name=zewo2 # Dependencies # Meteor (https://maven.meteordev.org/) -meteor_version=0.5.5 +meteor_version=0.5.6 diff --git a/src/main/java/com/dark/zewo2/commands/HologramCommand.java b/src/main/java/com/dark/zewo2/commands/HologramCommand.java index 5a8ee52..3c35aef 100644 --- a/src/main/java/com/dark/zewo2/commands/HologramCommand.java +++ b/src/main/java/com/dark/zewo2/commands/HologramCommand.java @@ -42,7 +42,7 @@ public void build(LiteralArgumentBuilder builder) { tag.putBoolean("Interpret", true); tag.putBoolean("NoGravity", true); tag.putBoolean("CustomNameVisible", true); - tag.putString("CustomName", Text.Serializer.toJson(Text.literal(message))); + tag.putString("CustomName", Text.Serialization.toJsonString(Text.literal(message))); stack.setSubNbt("EntityTag", tag); if (!mc.player.getAbilities().creativeMode) throw NOT_IN_CREATIVE.create(); mc.interactionManager.clickCreativeStack(stack, 36 + mc.player.getInventory().selectedSlot); @@ -62,7 +62,7 @@ public void build(LiteralArgumentBuilder builder) { tag.putBoolean("Interpret", true); tag.putBoolean("NoGravity", true); tag.putBoolean("CustomNameVisible", true); - tag.putString("CustomName", Text.Serializer.toJson(Text.literal(message))); + tag.putString("CustomName", Text.Serialization.toJsonString(Text.literal(message))); tag.put("Pos", nbtList); stack.setSubNbt("EntityTag", tag); if (!mc.player.getAbilities().creativeMode) throw NOT_IN_CREATIVE.create(); diff --git a/src/main/java/com/dark/zewo2/modules/AutoL.java b/src/main/java/com/dark/zewo2/modules/AutoL.java index e0ac690..950d078 100644 --- a/src/main/java/com/dark/zewo2/modules/AutoL.java +++ b/src/main/java/com/dark/zewo2/modules/AutoL.java @@ -39,7 +39,7 @@ private void OnPacket(PacketEvent.Receive event) { String text = messages.get().get(Utils.random(0, messages.get().size())); //replace syntax - text = text.replace("(target)", player.getEntityName()); + text = text.replace("(target)", player.getGameProfile().getName()); text = text.replace("(target.coords)", player.getBlockPos().toString()); ChatUtils.sendPlayerMsg(text); diff --git a/src/main/java/com/dark/zewo2/modules/Bookchat.java b/src/main/java/com/dark/zewo2/modules/Bookchat.java index 57e3f4c..0fdd53b 100644 --- a/src/main/java/com/dark/zewo2/modules/Bookchat.java +++ b/src/main/java/com/dark/zewo2/modules/Bookchat.java @@ -30,7 +30,7 @@ private void onchat(SendMessageEvent event){ String msg = event.message; if (mc.player.getMainHandStack().getItem().equals(Items.WRITABLE_BOOK)){ event.cancel(); - info(mc.player.getEntityName() + " : " + msg); + info(mc.player.getGameProfile().getName() + " : " + msg); String encrypted = Base64.getEncoder().encodeToString(msg.getBytes()); mc.player.networkHandler.sendPacket(new BookUpdateC2SPacket(mc.player.getInventory().selectedSlot, Collections.singletonList(encrypted), Optional.empty())); } @@ -52,7 +52,7 @@ private void ontick(TickEvent.Pre event){ if (person.get().isEmpty()) return; if(mc.world.getPlayers() == null) return; for (PlayerEntity p : mc.world.getPlayers()){ - if (p.getEntityName().equalsIgnoreCase(person.get())){ + if (p.getGameProfile().getName().equalsIgnoreCase(person.get())){ playerEntity = p; } } @@ -73,7 +73,7 @@ private void ontick(TickEvent.Pre event){ if (Objects.equals(lasttext, text)) return; lasttext = text; - info(playerEntity.getEntityName() + " : " + decodedString); + info(playerEntity.getGameProfile().getName() + " : " + decodedString); } } } diff --git a/src/main/java/com/dark/zewo2/modules/SitModule.java b/src/main/java/com/dark/zewo2/modules/SitModule.java index c6c70a6..bbbb831 100644 --- a/src/main/java/com/dark/zewo2/modules/SitModule.java +++ b/src/main/java/com/dark/zewo2/modules/SitModule.java @@ -32,7 +32,7 @@ private void ontick(TickEvent.Pre event){ mc.player.setVelocity(0,0,0); if (kickdelay <= 0) { - mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), mc.player.getY() - 0.04, mc.player.getZ(), mc.player.isOnGround())); + mc.player.networkHandler.sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX(), mc.player.getHeight() - 0.04, mc.player.getZ(), mc.player.isOnGround())); kickdelay = 25; } else { kickdelay--;