Merge branch 'master' into master

AntiCope · Nov 14, 2023 · 2005c10 · 2005c10
2 parents df71fa3 + fb2be95
commit 2005c10
Show file tree

Hide file tree

Showing 20 changed files with 86 additions and 104 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -4,7 +4,7 @@
 name: Java CI with Gradle
 
 concurrency: 
-  group: "build-1.20"
+  group: "build"
   cancel-in-progress: true
 
 on:
@@ -34,9 +34,9 @@ jobs:
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest-1.20.1"
+          automatic_release_tag: "latest-1.20.2"
           prerelease: false
-          title: "1.20.1 Build"
+          title: "1.20.2 Build"
           files: |
             ./build/libs/*.jar
     
diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_version=1.20.1+build.1
-loader_version=0.14.21
+minecraft_version=1.20.2
+yarn_version=1.20.2+build.4
+loader_version=0.14.24
 
 # Mod Properties
 mod_version = 0.3
 maven_group = anticope.rejects
 archives_base_name = meteor-rejects-addon
 
-meteor_version=0.5.4
+meteor_version=0.5.5
diff --git a/src/main/java/anticope/rejects/commands/KickCommand.java b/src/main/java/anticope/rejects/commands/KickCommand.java
@@ -7,7 +7,7 @@
 import net.minecraft.command.CommandSource;
 import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
+import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
 import net.minecraft.text.Text;
 import org.apache.commons.lang3.SystemUtils;
 

diff --git a/src/main/java/anticope/rejects/gui/servers/LegacyServerFinderScreen.java b/src/main/java/anticope/rejects/gui/servers/LegacyServerFinderScreen.java
@@ -156,7 +156,7 @@ private void updatePingers(ArrayList<LegacyServerPinger> pingers) {
                     if (!isServerInList(pingers.get(i).getServerIP())) {
                         multiplayerScreen.getServerList()
                                 .add(new ServerInfo("Server discovery " + working,
-                                        pingers.get(i).getServerIP(), false), false);
+                                        pingers.get(i).getServerIP(), ServerInfo.ServerType.OTHER), false);
                         multiplayerScreen.getServerList().saveFile();
                         ((MultiplayerScreenAccessor) multiplayerScreen).getServerListWidget()
                                 .setSelected(null);

diff --git a/src/main/java/anticope/rejects/gui/servers/ServerFinderScreen.java b/src/main/java/anticope/rejects/gui/servers/ServerFinderScreen.java
@@ -241,7 +241,7 @@ public void onServerDone(ServerPinger pinger) {
             if (!isServerInList(pinger.getServerIP()) && filterPass(pinger.getServerInfo())) {
                 synchronized (serverFinderLock) {
                     working++;
-                    multiplayerScreen.getServerList().add(new ServerInfo("Server discovery #" + working, pinger.getServerIP(), false), false);
+                    multiplayerScreen.getServerList().add(new ServerInfo("Server discovery #" + working, pinger.getServerIP(), ServerInfo.ServerType.OTHER), false);
                     multiplayerScreen.getServerList().saveFile();
                     ((MultiplayerScreenAccessor) multiplayerScreen).getServerListWidget().setSelected(null);
                     ((MultiplayerScreenAccessor) multiplayerScreen).getServerListWidget().setServers(multiplayerScreen.getServerList());

diff --git a/src/main/java/anticope/rejects/gui/servers/ServerManagerScreen.java b/src/main/java/anticope/rejects/gui/servers/ServerManagerScreen.java
@@ -120,7 +120,7 @@ public void initWidgets() {
             for (ServerInfo server : servers) presentAddresses.add(server.address);
             for (String addr : MinecraftClient.getInstance().keyboard.getClipboard().split("[\r\n]+")) {
                 if (presentAddresses.add(addr = addr.split(" ")[0])) {
-                    servers.add(new ServerInfo("Server discovery #" + presentAddresses.size(), addr, false));
+                    servers.add(new ServerInfo("Server discovery #" + presentAddresses.size(), addr, ServerInfo.ServerType.OTHER));
                     newIPs++;
                 }
             }

diff --git a/src/main/java/anticope/rejects/mixin/ClientCommonNetwokHandlerMixin.java b/src/main/java/anticope/rejects/mixin/ClientCommonNetwokHandlerMixin.java
@@ -0,0 +1,25 @@
+package anticope.rejects.mixin;
+
+import anticope.rejects.modules.SilentDisconnect;
+import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.meteorclient.utils.player.ChatUtils;
+import net.minecraft.client.network.ClientCommonNetworkHandler;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import static meteordevelopment.meteorclient.MeteorClient.mc;
+
+@Mixin(ClientCommonNetworkHandler.class)
+public class ClientCommonNetwokHandlerMixin {
+	@Inject(method = "onDisconnected", at = @At("HEAD"), cancellable = true)
+	private void onDisconnected(Text reason, CallbackInfo info) {
+		if (Modules.get().isActive(SilentDisconnect.class) && mc.world != null && mc.player != null) {
+			ChatUtils.info(Text.translatable("disconnect.lost").getString() + ":");
+			ChatUtils.sendMsg(reason);
+			info.cancel();
+		}
+	}
+}
diff --git a/src/main/java/anticope/rejects/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/anticope/rejects/mixin/ClientPlayNetworkHandlerMixin.java
@@ -1,20 +1,14 @@
 package anticope.rejects.mixin;
 
 import anticope.rejects.events.PlayerRespawnEvent;
-import anticope.rejects.modules.SilentDisconnect;
 import meteordevelopment.meteorclient.MeteorClient;
-import meteordevelopment.meteorclient.systems.modules.Modules;
-import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
-import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 @Mixin(ClientPlayNetworkHandler.class)
 public class ClientPlayNetworkHandlerMixin {
 
@@ -23,13 +17,4 @@ public class ClientPlayNetworkHandlerMixin {
     public void onPlayerRespawn(PlayerRespawnS2CPacket packet, CallbackInfo ci) {
         MeteorClient.EVENT_BUS.post(PlayerRespawnEvent.get());
     }
-
-    @Inject(method = "onDisconnected", at = @At("HEAD"), cancellable = true)
-    private void onDisconnected(Text reason, CallbackInfo info) {
-        if (Modules.get().isActive(SilentDisconnect.class) && mc.world != null && mc.player != null) {
-            ChatUtils.info(Text.translatable("disconnect.lost").getString() + ":");
-            ChatUtils.sendMsg(reason);
-            info.cancel();
-        }
-    }
 }
diff --git a/src/main/java/anticope/rejects/modules/AutoCraft.java b/src/main/java/anticope/rejects/modules/AutoCraft.java
@@ -11,6 +11,7 @@
 import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection;
 import net.minecraft.item.Item;
 import net.minecraft.recipe.Recipe;
+import net.minecraft.recipe.RecipeEntry;
 import net.minecraft.screen.CraftingScreenHandler;
 import net.minecraft.screen.slot.SlotActionType;
 
@@ -70,8 +71,8 @@ private void onTick(TickEvent.Post event) {
         List<Item> itemList = items.get();
         List<RecipeResultCollection> recipeResultCollectionList  = mc.player.getRecipeBook().getOrderedResults();
         for (RecipeResultCollection recipeResultCollection : recipeResultCollectionList) {
-            for (Recipe<?> recipe : recipeResultCollection.getRecipes(true)) {
-                if (!itemList.contains(recipe.getOutput(mc.world.getRegistryManager()).getItem())) continue;
+            for (RecipeEntry<?> recipe : recipeResultCollection.getRecipes(true)) {
+                if (!itemList.contains(recipe.value().getResult(mc.world.getRegistryManager()).getItem())) continue;
                 mc.interactionManager.clickRecipe(currentScreenHandler.syncId, recipe, craftAll.get());
                 mc.interactionManager.clickSlot(currentScreenHandler.syncId, 0, 1,
                         drop.get() ? SlotActionType.THROW : SlotActionType.QUICK_MOVE, mc.player);

diff --git a/src/main/java/anticope/rejects/modules/AutoSoup.java b/src/main/java/anticope/rejects/modules/AutoSoup.java
@@ -104,7 +104,7 @@ private void onTick(TickEvent.Post event) {
 
         // move soup in inventory to hotbar
         if (soupInInventory != -1)
-            InvUtils.shiftClick().slot(soupInInventory);
+            InvUtils.quickSwap().slot(soupInInventory);
     }
 
     private int findSoup(int startSlot, int endSlot) {

diff --git a/src/main/java/anticope/rejects/modules/BungeeCordSpoof.java b/src/main/java/anticope/rejects/modules/BungeeCordSpoof.java
@@ -54,16 +54,16 @@ public BungeeCordSpoof() {
 
     @EventHandler
     private void onPacketSend(PacketEvent.Send event) {
-        if (event.packet instanceof HandshakeC2SPacket packet && packet.getIntendedState() == NetworkState.LOGIN) {
+        if (event.packet instanceof HandshakeC2SPacket packet && packet.getNewNetworkState() == NetworkState.LOGIN) {
             if (whitelist.get() && !whitelistedServers.get().contains(Utils.getWorldName())) return;
-            String address = packet.getAddress() + "\0" + forwardedIP + "\0" + mc.getSession().getUuid().replace("-", "")
+            String address = packet.address() + "\0" + forwardedIP + "\0" + mc.getSession().getUuidOrNull().toString().replace("-", "")
                     + (spoofProfile.get() ? getProperty() : "");
-            ((HandshakeC2SPacketAccessor) packet).setAddress(address);
+            ((HandshakeC2SPacketAccessor) (Object) packet).setAddress(address);
         }
     }
 
     private String getProperty() {
-        PropertyMap propertyMap = mc.getSession().getProfile().getProperties();
+        PropertyMap propertyMap = mc.getGameProfile().getProperties();
         return "\0" + GSON.toJson(propertyMap.values().toArray());
     }
 }
diff --git a/src/main/java/anticope/rejects/modules/ColorSigns.java b/src/main/java/anticope/rejects/modules/ColorSigns.java
@@ -35,7 +35,7 @@ public void onActivate() {
     }
 
     private void checkWarning() {
-        String brand = mc.player.getServerBrand();
+        String brand = mc.player.getServer().getServerModName();
         if (brand == null) return;
         if (brand.contains("Paper")) warning("You are on a paper server. Color signs won't work here");
     }

diff --git a/src/main/java/anticope/rejects/modules/CustomPackets.java b/src/main/java/anticope/rejects/modules/CustomPackets.java
@@ -5,6 +5,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
+import io.netty.buffer.Unpooled;
 import meteordevelopment.meteorclient.events.packets.PacketEvent;
 import meteordevelopment.meteorclient.settings.BoolSetting;
 import meteordevelopment.meteorclient.settings.Setting;
@@ -13,7 +14,7 @@
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
+import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -53,27 +54,33 @@ public CustomPackets() {
     @EventHandler
     private void onCustomPayloadPacket(PacketEvent.Receive event) {
         if (event.packet instanceof CustomPayloadS2CPacket packet) {
-            switch (packet.getChannel().toString()) {
+            switch (packet.payload().id().toString()) {
                 case "badlion:mods" -> event.setCancelled(onBadlionModsPacket(packet));
                 default -> onUnknownPacket(packet);
             }
         }
     }
 
+    PacketByteBuf buffer = new PacketByteBuf(Unpooled.buffer());
+
     private void onUnknownPacket(CustomPayloadS2CPacket packet) {
         if (!unknownPackets.get()) return;
-        MutableText text = Text.literal(packet.getChannel().toString());
+        MutableText text = Text.literal(packet.payload().id().toString());
+        buffer.clear();
+        packet.payload().write(buffer);
         text.setStyle(text.getStyle()
                 .withHoverEvent(new HoverEvent(
                         HoverEvent.Action.SHOW_TEXT,
-                        Text.literal(readString(packet.getData()))
-                )));
+                        Text.literal(readString(buffer)
+                ))));
         info(text);
     }
 
     private boolean onBadlionModsPacket(CustomPayloadS2CPacket packet) {
         if (!mods.get()) return false;
-        String json = readString(packet.getData());
+        buffer.clear();
+        packet.payload().write(buffer);
+        String json = readString(buffer);
         Map<String, BadlionMod> mods = GSON_NON_PRETTY.fromJson(json, BADLION_MODS_TYPE);
         ChatUtils.sendMsg("Badlion", format("Mods", formatMods(mods)));
         return true;

diff --git a/src/main/java/anticope/rejects/modules/NewChunks.java b/src/main/java/anticope/rejects/modules/NewChunks.java
@@ -171,12 +171,12 @@ else if (event.packet instanceof BlockUpdateS2CPacket) {
 		else if (event.packet instanceof ChunkDataS2CPacket && mc.world != null) {
 			ChunkDataS2CPacket packet = (ChunkDataS2CPacket) event.packet;
 
-			ChunkPos pos = new ChunkPos(packet.getX(), packet.getZ());
+			ChunkPos pos = new ChunkPos(packet.getChunkX(), packet.getChunkZ());
 
-			if (!newChunks.contains(pos) && mc.world.getChunkManager().getChunk(packet.getX(), packet.getZ()) == null) {
+			if (!newChunks.contains(pos) && mc.world.getChunkManager().getChunk(packet.getChunkX(), packet.getChunkZ()) == null) {
 				WorldChunk chunk = new WorldChunk(mc.world, pos);
 				try {
-					chunk.loadFromPacket(packet.getChunkData().getSectionsDataBuf(), new NbtCompound(), packet.getChunkData().getBlockEntities(packet.getX(), packet.getZ()));
+					chunk.loadFromPacket(packet.getChunkData().getSectionsDataBuf(), new NbtCompound(), packet.getChunkData().getBlockEntities(packet.getChunkX(), packet.getChunkZ()));
 				} catch (ArrayIndexOutOfBoundsException e) {
 					return;
 				}

diff --git a/src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilAccount.java b/src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilAccount.java
@@ -7,7 +7,7 @@
 import meteordevelopment.meteorclient.systems.accounts.Account;
 import meteordevelopment.meteorclient.systems.accounts.AccountType;
 import meteordevelopment.meteorclient.utils.misc.NbtException;
-import net.minecraft.client.util.Session;
+import net.minecraft.client.session.Session;
 import net.minecraft.nbt.NbtCompound;
 
 import static meteordevelopment.meteorclient.MeteorClient.mc;
@@ -27,7 +27,7 @@ public boolean fetchInfo() {
             Session session = CustomYggdrasilLogin.login(name, password, server);
 
             cache.username = session.getUsername();
-            cache.uuid = session.getUuid();
+            cache.uuid = session.getUuidOrNull().toString();
 
             return true;
         } catch (AuthenticationException e) {