diff --git a/gradle.properties b/gradle.properties index 913081ab..ad9968ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=22w19a -yarn_mappings=22w19a+build.1 -loader_version=0.14.5 +minecraft_version=1.19-pre1 +yarn_mappings=1.19-pre1+build.7 +loader_version=0.14.6 #Fabric api -fabric_version=0.52.2+1.19 +fabric_version=0.53.2+1.19 # Mod Properties -mod_version = v7.26-MC22w19a +mod_version = v7.26-MC1.19-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 b5dc3055..0025ec42 100644 --- a/src/main/java/net/wurstclient/WurstClient.java +++ b/src/main/java/net/wurstclient/WurstClient.java @@ -56,7 +56,7 @@ public enum WurstClient public static final IMinecraftClient IMC = (IMinecraftClient)MC; public static final String VERSION = "7.26"; - public static final String MC_VERSION = "22w19a"; + public static final String MC_VERSION = "1.19-pre1"; private WurstAnalytics analytics; private EventManager eventManager; diff --git a/src/main/java/net/wurstclient/altmanager/AltRenderer.java b/src/main/java/net/wurstclient/altmanager/AltRenderer.java index 32ad5adc..ae5e3dbd 100644 --- a/src/main/java/net/wurstclient/altmanager/AltRenderer.java +++ b/src/main/java/net/wurstclient/altmanager/AltRenderer.java @@ -44,7 +44,7 @@ public final class AltRenderer PlayerListEntry entry = new PlayerListEntry( new PlayerListS2CPacket.Entry(new GameProfile(uuid, name), 0, GameMode.CREATIVE, Text.literal(name), null), - WurstClient.MC.getSessionService()); + WurstClient.MC.method_44256()); loadedSkins.put(name, entry.getSkinTexture()); } diff --git a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java index f5a149e5..425cdeec 100644 --- a/src/main/java/net/wurstclient/hacks/AutoFarmHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoFarmHack.java @@ -19,7 +19,7 @@ import net.minecraft.block.*; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.Shader; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormat; @@ -542,7 +542,7 @@ public final class AutoFarmHack extends Hack RenderUtils.drawOutlinedBox(renderBox, bufferBuilder); } - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); greenBuffer.bind(); greenBuffer.upload(buffer); VertexBuffer.unbind(); diff --git a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java index 686477fb..4df55653 100644 --- a/src/main/java/net/wurstclient/hacks/BaseFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/BaseFinderHack.java @@ -18,7 +18,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Shader; import net.minecraft.client.render.Tessellator; @@ -219,7 +219,7 @@ public final class BaseFinderHack extends Hack .vertex(vertex[0] - regionX, vertex[1], vertex[2] - regionZ) .next(); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); diff --git a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java index b32547cb..a1d6dd8d 100644 --- a/src/main/java/net/wurstclient/hacks/CaveFinderHack.java +++ b/src/main/java/net/wurstclient/hacks/CaveFinderHack.java @@ -30,7 +30,7 @@ import net.minecraft.block.Block; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Shader; import net.minecraft.client.render.Tessellator; @@ -472,7 +472,7 @@ public final class CaveFinderHack extends Hack for(int[] vertex : vertices) bufferBuilder.vertex(vertex[0], vertex[1], vertex[2]).next(); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); diff --git a/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java b/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java index 9f52f93c..248b91aa 100644 --- a/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java +++ b/src/main/java/net/wurstclient/hacks/ItemGeneratorHack.java @@ -12,7 +12,7 @@ import java.util.Optional; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket; -import net.minecraft.util.math.random.AbstractRandom; +import net.minecraft.util.math.random.Random; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryEntry; import net.wurstclient.Category; @@ -36,7 +36,7 @@ public final class ItemGeneratorHack extends Hack implements UpdateListener + "Doesn't seem to affect performance.", 1, 1, 64, 1, ValueDisplay.INTEGER); - private final AbstractRandom random = AbstractRandom.create(); + private final Random random = Random.createLocal(); public ItemGeneratorHack() { diff --git a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java index f3cc54fe..1bc66667 100644 --- a/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java +++ b/src/main/java/net/wurstclient/hacks/MobSpawnEspHack.java @@ -20,7 +20,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Shader; import net.minecraft.client.render.Tessellator; @@ -377,7 +377,7 @@ public final class MobSpawnEspHack extends Hack .color(1, 1, 0, 0.5F).next(); }); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); VertexBuffer.unbind(); diff --git a/src/main/java/net/wurstclient/hacks/SearchHack.java b/src/main/java/net/wurstclient/hacks/SearchHack.java index a01d0b43..25d80206 100644 --- a/src/main/java/net/wurstclient/hacks/SearchHack.java +++ b/src/main/java/net/wurstclient/hacks/SearchHack.java @@ -29,7 +29,7 @@ import net.minecraft.block.Block; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Shader; import net.minecraft.client.render.Tessellator; @@ -439,7 +439,7 @@ public final class SearchHack extends Hack for(int[] vertex : vertices) bufferBuilder.vertex(vertex[0], vertex[1], vertex[2]).next(); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); diff --git a/src/main/java/net/wurstclient/hacks/TunnellerHack.java b/src/main/java/net/wurstclient/hacks/TunnellerHack.java index aa062806..ac6818e7 100644 --- a/src/main/java/net/wurstclient/hacks/TunnellerHack.java +++ b/src/main/java/net/wurstclient/hacks/TunnellerHack.java @@ -26,7 +26,7 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.option.GameOptions; import net.minecraft.client.option.KeyBinding; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Shader; import net.minecraft.client.render.Tessellator; @@ -294,7 +294,7 @@ public final class TunnellerHack extends Hack .multiply(Math.max(0.5, length)).add(offset); RenderUtils.drawArrow(arrowStart, arrowEnd, bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffers[0].bind(); vertexBuffers[0].upload(buffer); VertexBuffer.unbind(); @@ -422,7 +422,7 @@ public final class TunnellerHack extends Hack RenderUtils.drawOutlinedBox(box.offset(pos), bufferBuilder); } - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffers[1].bind(); vertexBuffers[1].upload(buffer); VertexBuffer.unbind(); @@ -523,7 +523,7 @@ public final class TunnellerHack extends Hack for(BlockPos pos : blocks) RenderUtils.drawOutlinedBox(box.offset(pos), bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffers[2].bind(); vertexBuffers[2].upload(buffer); VertexBuffer.unbind(); @@ -669,7 +669,7 @@ public final class TunnellerHack extends Hack for(BlockPos pos : liquids) RenderUtils.drawOutlinedBox(box.offset(pos), bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffers[3].bind(); vertexBuffers[3].upload(buffer); diff --git a/src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java b/src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java index 49b5bf80..3b1c9125 100644 --- a/src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/BlockModelRendererMixin.java @@ -19,7 +19,7 @@ import net.minecraft.client.render.block.BlockModelRenderer; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.random.AbstractRandom; +import net.minecraft.util.math.random.Random; import net.minecraft.world.BlockRenderView; import net.wurstclient.event.EventManager; import net.wurstclient.events.ShouldDrawSideListener.ShouldDrawSideEvent; @@ -30,13 +30,13 @@ public abstract class BlockModelRendererMixin { @Inject(at = {@At("HEAD")}, method = { - "renderSmooth(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLnet/minecraft/util/math/random/AbstractRandom;JI)V", - "renderFlat(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLnet/minecraft/util/math/random/AbstractRandom;JI)V"}, + "renderSmooth(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLnet/minecraft/util/math/random/Random;JI)V", + "renderFlat(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLnet/minecraft/util/math/random/Random;JI)V"}, cancellable = true) private void onRenderSmoothOrFlat(BlockRenderView world, BakedModel model, BlockState state, BlockPos pos, MatrixStack matrices, - VertexConsumer vertexConsumer, boolean cull, AbstractRandom random, - long seed, int overlay, CallbackInfo ci) + VertexConsumer vertexConsumer, boolean cull, Random random, long seed, + int overlay, CallbackInfo ci) { TesselateBlockEvent event = new TesselateBlockEvent(state); EventManager.fire(event); @@ -62,8 +62,8 @@ public abstract class BlockModelRendererMixin @Shadow public void renderSmooth(BlockRenderView world, BakedModel model, BlockState state, BlockPos pos, MatrixStack matrices, - VertexConsumer vertexConsumer, boolean cull, AbstractRandom random, - long seed, int overlay) + VertexConsumer vertexConsumer, boolean cull, Random random, long seed, + int overlay) { } diff --git a/src/main/java/net/wurstclient/mixin/ChatScreenMixin.java b/src/main/java/net/wurstclient/mixin/ChatScreenMixin.java index 63ea7a42..e7a6dc96 100644 --- a/src/main/java/net/wurstclient/mixin/ChatScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/ChatScreenMixin.java @@ -13,10 +13,10 @@ 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.class_7479; import net.minecraft.client.gui.screen.ChatScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.client.network.ChatPreviewer; import net.minecraft.text.Text; import net.wurstclient.WurstClient; @@ -26,11 +26,8 @@ public class ChatScreenMixin extends Screen @Shadow protected TextFieldWidget chatField; - /** - * previewManager - */ @Shadow - private class_7479 field_39347; + private ChatPreviewer chatPreviewer; private ChatScreenMixin(WurstClient wurst, Text text_1) { @@ -44,42 +41,29 @@ public class ChatScreenMixin extends Screen chatField.setMaxLength(Integer.MAX_VALUE); } - /** - * Currently unnamed method that decides whether or not to send preview - * data. - *

- * Calls one of the following: - *

- */ @Inject(at = @At("HEAD"), - method = "method_44059(Ljava/lang/String;)V", + method = "updatePreviewer(Ljava/lang/String;)V", cancellable = true) - private void method_44059(String message, CallbackInfo ci) + private void onUpdatePreviewer(String chatText, CallbackInfo ci) { - String normalized = method_44054(message); + String normalized = normalize(chatText); if(normalized.startsWith(".say ")) { // send preview, but only for the part after ".say " - field_39347.method_44035(normalized.substring(5)); + chatPreviewer.method_44274(normalized.substring(5)); ci.cancel(); }else if(normalized.startsWith(".")) { - // disable preview (as if typing a /command) - field_39347.method_44036(); + // disable & delete preview + chatPreviewer.method_44275(); ci.cancel(); } } - /** - * normalize() - */ @Shadow - public String method_44054(String string) + public String normalize(String chatText) { return null; } diff --git a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java index a661daa9..186f58b1 100644 --- a/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/net/wurstclient/mixin/ClientPlayerEntityMixin.java @@ -68,9 +68,9 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity } @Inject(at = @At("HEAD"), - method = "method_44096(Ljava/lang/String;Lnet/minecraft/text/Text;)V", + method = "sendChatMessage(Ljava/lang/String;Lnet/minecraft/text/Text;)V", cancellable = true) - private void onSendChatMessage(String message, @Nullable Text text, + private void onSendChatMessage(String message, @Nullable Text preview, CallbackInfo ci) { ChatOutputEvent event = new ChatOutputEvent(message); @@ -93,7 +93,7 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity public void sendChatMessageBypass(String message) { ChatMessageSigner signer = ChatMessageSigner.create(getUuid()); - method_44097(signer, message, null); + sendChatMessagePacket(signer, message, null); } @Inject(at = @At(value = "INVOKE", @@ -260,8 +260,8 @@ public class ClientPlayerEntityMixin extends AbstractClientPlayerEntity } @Shadow - private void method_44097(ChatMessageSigner chatMessageSigner, - String string, @Nullable Text text) + private void sendChatMessagePacket(ChatMessageSigner signer, String message, + @Nullable Text preview) { } diff --git a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java index 1c811a44..cc69779d 100644 --- a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java @@ -184,8 +184,10 @@ public class ServerFinderScreen extends Screen if(!isServerInList(pingers.get(i).getServerIP())) { prevScreen.getServerList() - .add(new ServerInfo("Grief me #" + working, - pingers.get(i).getServerIP(), false)); + .add( + new ServerInfo("Grief me #" + working, + pingers.get(i).getServerIP(), false), + false); prevScreen.getServerList().saveFile(); ((IMultiplayerScreen)prevScreen).getServerListSelector() .setSelected(null); diff --git a/src/main/java/net/wurstclient/treebot/Tree.java b/src/main/java/net/wurstclient/treebot/Tree.java index 898d7d61..5ea267d9 100644 --- a/src/main/java/net/wurstclient/treebot/Tree.java +++ b/src/main/java/net/wurstclient/treebot/Tree.java @@ -13,7 +13,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormats; @@ -60,7 +60,7 @@ public class Tree implements AutoCloseable RenderUtils.drawOutlinedBox( box.offset(log).offset(-regionX, 0, -regionZ), bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); VertexBuffer.unbind(); diff --git a/src/main/java/net/wurstclient/util/RenderUtils.java b/src/main/java/net/wurstclient/util/RenderUtils.java index 0b1f3eae..97815b55 100644 --- a/src/main/java/net/wurstclient/util/RenderUtils.java +++ b/src/main/java/net/wurstclient/util/RenderUtils.java @@ -13,7 +13,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gl.VertexBuffer; import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.BufferBuilder.class_7433; +import net.minecraft.client.render.BufferBuilder.BuiltBuffer; import net.minecraft.client.render.Camera; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.Tessellator; @@ -228,7 +228,7 @@ public enum RenderUtils bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION); drawSolidBox(bb, bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); @@ -376,7 +376,7 @@ public enum RenderUtils bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); drawOutlinedBox(bb, bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); @@ -524,7 +524,7 @@ public enum RenderUtils bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); drawCrossBox(bb, bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); @@ -655,7 +655,7 @@ public enum RenderUtils bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); drawNode(bb, bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); @@ -788,7 +788,7 @@ public enum RenderUtils bufferBuilder.begin(VertexFormat.DrawMode.DEBUG_LINES, VertexFormats.POSITION); drawArrow(from, to, bufferBuilder); - class_7433 buffer = bufferBuilder.end(); + BuiltBuffer buffer = bufferBuilder.end(); vertexBuffer.bind(); vertexBuffer.upload(buffer); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bc0a7092..6d1c066a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "depends": { "fabricloader": ">=0.14.0", "fabric": ">=0.51.0", - "minecraft": "~1.19-alpha.22.19.a", + "minecraft": "~1.19-beta.1", "java": ">=17" }, "suggests": {