Merge pull request #37 from Basicprogrammer10/update-mc-1.20.2

Update to Minecraft 1.20.2

README.md

@@ -1,8 +1,8 @@
 # SigmaUtils ![build](/~https://github.com/Basicprogrammer10/SigmaUtils/actions/workflows/build.yml/badge.svg) ![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Basicprogrammer10/SigmaUtils?include_prereleases) ![GitHub all releases](https://img.shields.io/github/downloads/Basicprogrammer10/SigmaUtils/total)
 
-Requires: <kbd>[Minecraft 1.20.1](https://minecraft.fandom.com/wiki/Java_Edition_1.20.1)</kbd> <kbd>[Fabric API](https://modrinth.com/mod/fabric-api/version/0.75.3+1.19.4)</kbd>
+Requires: <kbd>[Minecraft 1.20.2](https://minecraft.fandom.com/wiki/Java_Edition_1.20.2)</kbd> <kbd>[Fabric API](https://modrinth.com/mod/fabric-api/version/0.89.2+1.20.2)</kbd>
 
-SigmaUtils is a utility mod for Minecraft 1.20.1.
+SigmaUtils is a utility mod for Minecraft 1.20.2.
 It is made up of 'modules', which are discrete features that can be toggled and configured.
 By default, SigmaUtils changes nothing about the game, except adding a button to the title screen to open the config
 GUI.

gradle.properties

@@ -1,13 +1,13 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.8
-loader_version=0.14.21
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.2
+loader_version=0.14.22
 # Mod Properties
-mod_version=0.1.6-alpha
+mod_version=0.1.7-alpha
 maven_group=com.connorcode
 archives_base_name=sigma-utils
 # Dependencies
-fabric_version=0.84.0+1.20.1
-mod_menu_version=7.1.0
+fabric_version=0.89.2+1.20.2
+mod_menu_version=8.0.0

src/main/java/com/connorcode/sigmautils/commands/About.java

@@ -12,6 +12,7 @@
 
 import static com.connorcode.sigmautils.SigmaUtils.client;
 
+
 public class About implements Command {
     public void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
         dispatcher.register(ClientCommandManager.literal("util")

src/main/java/com/connorcode/sigmautils/commands/Dump.java

@@ -67,6 +67,7 @@ int execute(CommandContext<FabricClientCommandSource> context) throws IOExceptio
                         .append(i.getSimpleName())
                         .append("\n");
             Files.write(dumps.toPath().resolve("packets.txt"), out.toString().getBytes());
+            context.getSource().sendFeedback(Text.of("Dumped packets to " + dumps.toPath().resolve("packets.txt")));
             return 0;
         }
 
@@ -91,6 +92,7 @@ int execute(CommandContext<FabricClientCommandSource> context) throws IOExceptio
 
                 Files.write(file.toPath(), text.toString().getBytes());
             }
+            context.getSource().sendFeedback(Text.of("Dumped docs to " + docs.toPath()));
         }
 
         return 0;

src/main/java/com/connorcode/sigmautils/commands/Note.java

@@ -143,7 +143,7 @@ protected void init() {
 
         @Override
         public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-            renderBackground(drawContext);
+            renderBackground(drawContext, mouseX, mouseY, delta);
 
             var lines = textRenderer.wrapLines(StringVisitable.plain(note.text), noteWidth);
             var startX = width / 2f - noteWidth / 2f;

src/main/java/com/connorcode/sigmautils/commands/PlayerCommand.java

@@ -8,6 +8,7 @@
 import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger;
 import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
 
+
 public class PlayerCommand implements Command {
     @Override
     public void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {

src/main/java/com/connorcode/sigmautils/config/Config.java

@@ -23,6 +23,7 @@
 
 import static com.connorcode.sigmautils.SigmaUtils.*;
 
+
 public class Config {
     public static final File configFile = new File(directory.toFile(), "config.nbt");
     static final KeyBinding configKeybinding = KeyBindingHelper.registerKeyBinding(

src/main/java/com/connorcode/sigmautils/config/ConfigGui.java

@@ -65,7 +65,7 @@ protected void init() {
 
     public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
         int padding = getPadding();
-        this.renderBackground(drawContext);
+        this.renderBackground(drawContext, mouseX, mouseY, delta);
 
         for (int x = 0; x < Category.realValues().length; x++)
             drawContext.drawCenteredTextWithShadow(textRenderer,

src/main/java/com/connorcode/sigmautils/config/ModuleConfigGui.java

@@ -85,7 +85,7 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
         Setting.RenderData renderData = new Setting.RenderData(this, drawContext, mouseX, mouseY, delta);
         int padding = getPadding();
 
-        this.renderBackground(drawContext);
+        this.renderBackground(drawContext, mouseX, mouseY, delta);
         super.render(drawContext, mouseX, mouseY, delta);
 
         int x = -75 + 20 + padding;

src/main/java/com/connorcode/sigmautils/config/settings/DynamicListSetting.java

@@ -171,11 +171,6 @@ protected void init() {
             }
         }
 
-        @Override
-        public void tick() {
-            this.searchField.tick();
-        }
-
         private boolean search(K resource, String search) {
             var finalSearch = search.toLowerCase(Locale.ROOT);
             return Arrays.stream(renderer.getSearch(resource)).anyMatch(s -> s.contains(finalSearch));
@@ -188,7 +183,7 @@ public void close() {
 
         @Override
         public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-            renderBackground(drawContext);
+            renderBackground(drawContext, mouseX, mouseY, delta);
             super.render(drawContext, mouseX, mouseY, delta);
             this.searchField.render(drawContext, mouseX, mouseY, delta);
         }
@@ -267,7 +262,7 @@ public void close() {
 
         @Override
         public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-            renderBackground(drawContext);
+            renderBackground(drawContext, mouseX, mouseY, delta);
             super.render(drawContext, mouseX, mouseY, delta);
         }
 

src/main/java/com/connorcode/sigmautils/config/settings/DynamicSelectorSetting.java

@@ -19,6 +19,7 @@
 import static com.connorcode.sigmautils.SigmaUtils.client;
 import static com.connorcode.sigmautils.modules.meta.Padding.getPadding;
 
+
 public class DynamicSelectorSetting<K> extends Setting<DynamicSelectorSetting<K>> {
     ResourceManager<K> manager;
     K value;
@@ -164,11 +165,6 @@ protected void init() {
             }
         }
 
-        @Override
-        public void tick() {
-            this.searchField.tick();
-        }
-
         private boolean search(K resource, String search) {
             var finalSearch = search.toLowerCase(Locale.ROOT);
             return Arrays.stream(renderer.getSearch(resource)).anyMatch(s -> s.contains(finalSearch));
@@ -181,7 +177,7 @@ public void close() {
 
         @Override
         public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
-            renderBackground(drawContext);
+            renderBackground(drawContext, mouseX, mouseY, delta);
             super.render(drawContext, mouseX, mouseY, delta);
             this.searchField.render(drawContext, mouseX, mouseY, delta);
         }

src/main/java/com/connorcode/sigmautils/config/settings/list/PacketList.java

@@ -1,5 +1,6 @@
 package com.connorcode.sigmautils.config.settings.list;
 
+
 import com.connorcode.sigmautils.config.settings.DynamicListSetting;
 import com.connorcode.sigmautils.misc.util.NetworkUtils;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
@@ -11,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class PacketList implements DynamicListSetting.ResourceManager<Class<? extends Packet<?>>> {
     DynamicListSetting<Class<? extends Packet<?>>> setting;
@@ -34,7 +36,7 @@ public List<Class<? extends Packet<?>>> getAllResources() {
 
     @Override
     public String getDisplay(Class<? extends Packet<?>> resource) {
-        return NetworkUtils.getPacketName(resource);
+        return Optional.ofNullable(NetworkUtils.getPacketName(resource)).orElse(resource.getName());
     }
 
     @Override

src/main/java/com/connorcode/sigmautils/config/settings/list/SimpleSelector.java

@@ -18,6 +18,7 @@
 import static com.connorcode.sigmautils.SigmaUtils.client;
 import static com.connorcode.sigmautils.modules.meta.Padding.getPadding;
 
+
 public abstract class SimpleSelector<T> implements DynamicSelectorSetting.ResourceManager<T> {
     protected Registry<T> registry;
     protected DynamicSelectorSetting<T> setting;

src/main/java/com/connorcode/sigmautils/event/network/PacketSendEvent.java

@@ -5,9 +5,11 @@
 
 public class PacketSendEvent extends Cancellable {
     public Packet<?> packet;
+    public boolean flush;
 
-    public PacketSendEvent(Packet<?> packet) {
+    public PacketSendEvent(Packet<?> packet, boolean flush) {
         this.packet = packet;
+        this.flush = flush;
     }
 
     public Packet<?> get() {

src/main/java/com/connorcode/sigmautils/event/network/UnknownPacketEvent.java

@@ -1,20 +1,20 @@
 package com.connorcode.sigmautils.event.network;
 
 import com.connorcode.sigmautils.event.Cancellable;
-import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
+import net.minecraft.network.PacketByteBuf;
 import net.minecraft.util.Identifier;
 
 public class UnknownPacketEvent extends Cancellable {
-    public CustomPayloadS2CPacket packet;
     public Identifier identifier;
+    PacketByteBuf buf;
 
-    public UnknownPacketEvent(CustomPayloadS2CPacket packet) {
-        this.packet = packet;
-        this.identifier = packet.getChannel();
+    public UnknownPacketEvent(PacketByteBuf buf, Identifier identifier) {
+        this.buf = buf;
+        this.identifier = identifier;
     }
 
-    public CustomPayloadS2CPacket get() {
-        return packet;
+    public PacketByteBuf get() {
+        return buf;
     }
 
     public Identifier getIdentifier() {

src/main/java/com/connorcode/sigmautils/misc/CancelledUnknownPacket.java

@@ -0,0 +1,23 @@
+package com.connorcode.sigmautils.misc;
+
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.util.Identifier;
+
+public class CancelledUnknownPacket implements CustomPayload {
+    Identifier id;
+
+    public CancelledUnknownPacket(Identifier id) {
+        this.id = id;
+    }
+
+    @Override
+    public void write(PacketByteBuf buf) {
+
+    }
+
+    @Override
+    public Identifier id() {
+        return this.id;
+    }
+}

src/main/java/com/connorcode/sigmautils/misc/Components.java

@@ -110,8 +110,8 @@ public void render(DrawContext drawContext, int mouseX, int mouseY, float delta)
         protected abstract double maxScroll();
 
         @Override
-        public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-            scroll -= amount * (entryHeight + padding);
+        public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+            scroll -= verticalAmount * (entryHeight + padding);
             refreshScrollConstrains();
             this.clearAndInit();
             return true;

src/main/java/com/connorcode/sigmautils/misc/Player.java

@@ -49,8 +49,10 @@ private void onTick(Tick.GameTickEvent event) {
 
     @EventHandler
     private void onPacketSend_PacketSendEvent(PacketSendEvent event) {
-        if (event.get() instanceof PlayerActionC2SPacket packet)
-            Objects.requireNonNull(client.player).sendMessage(Text.of(String.format("Action: %s [%d]", packet.getAction(), packet.getSequence())), false);
+        if (event.get() instanceof PlayerActionC2SPacket packet && debug)
+            Objects.requireNonNull(client.player)
+                    .sendMessage(Text.of(String.format("Action: %s [%d]", packet.getAction(), packet.getSequence())),
+                                 false);
     }
 
     public void addAction(Action action) {
@@ -95,7 +97,6 @@ public void tick() {
     }
 
     public static class AttackAction extends InteractAction {
-        Direction lastDirection = Direction.UP;
         BlockPos lastBlock;
 
         public AttackAction(InteractTime time) {
@@ -115,20 +116,14 @@ void interact() {
             }
 
             if (client.crosshairTarget instanceof BlockHitResult hit) {
-                if (lastBlock == null) {
-                    net.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, hit.getBlockPos(), hit.getSide()));
-                    sequenced(sequence -> new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, hit.getBlockPos(), hit.getSide(), sequence));
-                } else if (!lastBlock.equals(hit.getBlockPos())) {
-//                    sequenced(sequence -> new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, lastBlock, lastDirection, sequence));
-                    sequenced(sequence -> new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, hit.getBlockPos(), hit.getSide(), sequence));
+                if (lastBlock == null || !lastBlock.equals(hit.getBlockPos())) {
+                    sequenced(sequence -> new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, hit.getBlockPos(), hit.getSide()));
                     sequenced(sequence -> new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, hit.getBlockPos(), hit.getSide(), sequence));
                 }
                 lastBlock = hit.getBlockPos();
-                lastDirection = hit.getSide();
             } else if (lastBlock != null) {
-                net.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, lastBlock, lastDirection));
+                net.sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, lastBlock, Direction.UP));
                 lastBlock = null;
-                lastDirection = Direction.UP;
             }
         }
     }

src/main/java/com/connorcode/sigmautils/misc/util/ClientUtils.java

@@ -0,0 +1,9 @@
+package com.connorcode.sigmautils.misc.util;
+
+import static com.connorcode.sigmautils.SigmaUtils.client;
+
+public class ClientUtils {
+    public static boolean isConnectedToRealms() {
+        return client.getCurrentServerEntry() != null && client.getCurrentServerEntry().isLocal();
+    }
+}

src/main/java/com/connorcode/sigmautils/misc/util/NetworkUtils.java

@@ -9,6 +9,7 @@
 import net.minecraft.network.NetworkSide;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.Packet;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -28,7 +29,7 @@ public static Object2IntOpenHashMap<Class<? extends Packet<?>>> getPackets(Netwo
         Arrays.stream(NetworkState.values())
                 .map(state -> state.packetHandlers.get(side))
                 .filter(Objects::nonNull)
-                .forEach(handler -> packets.putAll(handler.packetIds));
+                .forEach(handler -> packets.putAll(handler.backingHandler.packetIds));
         return packets;
     }
 
@@ -43,6 +44,7 @@ public static String getPacketName(Class<? extends Packet<?>> packet) {
         return getPacketName(packet.getName());
     }
 
+    @Nullable
     public static String getPacketName(String bytecodeName) {
         var intermediary = mappingResolver.unmapClassName("intermediary", bytecodeName);
         if (packetNames.isEmpty())
@@ -61,18 +63,17 @@ public static synchronized AuthStatus getAuthStatus() {
         authStatus = AuthStatus.Waiting;
         lastAuthStatusCheck = System.currentTimeMillis();
 
+        // TODO: Verify that this works
         new Thread(() -> {
             var session = client.getSession();
-            var profile = session.getProfile();
             var token = session.getAccessToken();
             var id = UUID.randomUUID().toString();
 
             // Thank you /~https://github.com/axieum/authme
             var sessionService = (YggdrasilMinecraftSessionService) client.getSessionService();
             try {
-                sessionService.joinServer(profile, token, id);
-                authStatus = sessionService.hasJoinedServer(profile, id, null)
-                        .isComplete() ? AuthStatus.Online : AuthStatus.Offline;
+                sessionService.joinServer(client.getSession().getUuidOrNull(), token, id);
+                authStatus = sessionService.hasJoinedServer(session.getUsername(), id, null) != null ? AuthStatus.Online : AuthStatus.Offline;
             } catch (AuthenticationException e) {
                 authStatus = AuthStatus.Invalid;
             }