Skip to content

Update 1.21.5 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crazymoose7 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update 1.21.5 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: Java CI with Gradle

concurrency:
group: "build-1.20"
group: "build-1.21.5"
cancel-in-progress: true

on:
Expand Down Expand Up @@ -32,8 +32,8 @@ jobs:
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-1.20.6"
automatic_release_tag: "latest-1.21.5"
prerelease: false
title: "1.20.6 Build"
title: "1.21.5 Build"
files: |
./build/libs/*.jar
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ An addon to Meteor Client that adds various modules designed to lag and crash se
<div align="center">
<a href="https://anticope.github.io/meteor-lists/pages/MeteorAddons.html"><img src="https://img.shields.io/badge/Verified%20Addon-Yes-blueviolet" alt="Verified Addon"><a/>
<img src="https://img.shields.io/badge/Version-v0.6-orange" alt="Version">
<img src="https://img.shields.io/badge/Minecraft%20Version-1.20.6-blue" alt="Minecraft Version">
<img src="https://img.shields.io/badge/Minecraft%20Version-1.21.5-blue" alt="Minecraft Version">
<img src="https://img.shields.io/github/last-commit/AntiCope/meteor-crash-addon?logo=git" alt="Last commit">
<img src="https://img.shields.io/github/workflow/status/AntiCope/meteor-crash-addon/Java%20CI%20with%20Gradle?logo=github" alt="build status">
<img src="https://img.shields.io/github/languages/code-size/AntiCope/meteor-crash-addon" alt="Code Size">
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'fabric-loom' version '1.10-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -21,7 +21,7 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Meteor
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT"
modImplementation "meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT"
}

processResources {
Expand Down
8 changes: 3 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
org.gradle.jvmargs=-Xmx2G

# Fabric Properties (https://fabricmc.net/develop/)
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.1
loader_version=0.15.11
minecraft_version=1.21.5
yarn_mappings=1.21.5+build.1
loader_version=0.16.12

# Mod Properties
mod_version=0.6
maven_group=Wide-Cat
archives_base_name=meteor-crash-addon

meteor_version=0.5.7
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 2 additions & 5 deletions src/main/java/widecat/meteorcrashaddon/commands/CrashItemCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
import net.minecraft.nbt.NbtList;
import net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket;

import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
import static meteordevelopment.meteorclient.MeteorClient.mc;

public class CrashItemCommand extends Command {

public CrashItemCommand() {
Expand All @@ -33,7 +30,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
tag1.putString("id", "minecraft:small_fireball");
tag1.put("power", power);
CrashFireball.set(DataComponentTypes.ENTITY_DATA, NbtComponent.of(tag1));
CreativeInventoryActionC2SPacket balls = new CreativeInventoryActionC2SPacket(36 + mc.player.getInventory().selectedSlot, CrashFireball);
CreativeInventoryActionC2SPacket balls = new CreativeInventoryActionC2SPacket(36 + mc.player.getInventory().getSelectedSlot(), CrashFireball);
mc.getNetworkHandler().sendPacket(balls);
return SINGLE_SUCCESS;
}));
Expand All @@ -49,7 +46,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
tag2.putString("id", "minecraft:small_fireball");
tag2.put("Pos", pos);
gato.set(DataComponentTypes.ENTITY_DATA, NbtComponent.of(tag2));
CreativeInventoryActionC2SPacket elgato = new CreativeInventoryActionC2SPacket(36 + mc.player.getInventory().selectedSlot, gato);
CreativeInventoryActionC2SPacket elgato = new CreativeInventoryActionC2SPacket(36 + mc.player.getInventory().getSelectedSlot(), gato);
mc.getNetworkHandler().sendPacket(elgato);
return SINGLE_SUCCESS;
}));
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/widecat/meteorcrashaddon/modules/AACCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ public void onActivate() {
switch (crashMode.get()) {
case NEW -> {
for (double i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (9412 * i), mc.player.getY() + (9412 * i), mc.player.getZ() + (9412 * i), true));
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (9412 * i), mc.player.getY() + (9412 * i), mc.player.getZ() + (9412 * i), true, mc.player.horizontalCollision));
}
}
case OTHER -> {
for (double i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (500000 * i), mc.player.getY() + (500000 * i), mc.player.getZ() + (500000 * i), true));
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (500000 * i), mc.player.getY() + (500000 * i), mc.player.getZ() + (500000 * i), true, mc.player.horizontalCollision));
}
}
case OLD -> mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, true));
case OLD -> mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, true, mc.player.horizontalCollision));
}
if (autoDisable.get()) toggle();
}
Expand All @@ -67,17 +67,17 @@ public void onTick(TickEvent.Pre tickEvent) {
switch (crashMode.get()) {
case NEW -> {
for (double i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (9412 * i), mc.player.getY() + (9412 * i), mc.player.getZ() + (9412 * i), true));
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (9412 * i), mc.player.getY() + (9412 * i), mc.player.getZ() + (9412 * i), true, mc.player.horizontalCollision));
}
}
case OTHER -> {
for (double i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (500000 * i), mc.player.getY() + (500000 * i), mc.player.getZ() + (500000 * i), true));
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(mc.player.getX() + (500000 * i), mc.player.getY() + (500000 * i), mc.player.getZ() + (500000 * i), true, mc.player.horizontalCollision));
}
}
case OLD -> {
for (double i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, true));
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.PositionAndOnGround(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, true, mc.player.horizontalCollision));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/widecat/meteorcrashaddon/modules/BookCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void sendBadBook() {
pages.add(page.toString());
}

mc.getNetworkHandler().sendPacket(new BookUpdateC2SPacket(mc.player.getInventory().selectedSlot, pages, Optional.of(title)));
mc.getNetworkHandler().sendPacket(new BookUpdateC2SPacket(mc.player.getInventory().getSelectedSlot(), pages, Optional.of(title)));
}
case Creative -> {
for (int i = 0; i < 5; i++) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/widecat/meteorcrashaddon/modules/ContainerCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import net.minecraft.block.AbstractChestBlock;
import net.minecraft.block.Block;
import net.minecraft.block.ShulkerBoxBlock;
import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen;
import net.minecraft.client.gui.screen.ingame.HandledScreen;
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
Expand Down Expand Up @@ -75,7 +75,7 @@ private void onTick(TickEvent.Pre event) {
@EventHandler
private void onScreenOpen(OpenScreenEvent event) {
if (event.screen == null) return;
if (!mc.isPaused() && !(event.screen instanceof AbstractInventoryScreen) && (event.screen instanceof HandledScreen)) event.setCancelled(true);
if (!mc.isPaused() && !(event.screen instanceof InventoryScreen) && (event.screen instanceof HandledScreen)) event.setCancelled(true);
}

@EventHandler
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/widecat/meteorcrashaddon/modules/CraftingCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import meteordevelopment.orbit.EventHandler;
import net.minecraft.client.gui.screen.recipebook.RecipeResultCollection;
import net.minecraft.network.packet.c2s.play.CraftRequestC2SPacket;
import net.minecraft.recipe.RecipeEntry;
import net.minecraft.recipe.RecipeDisplayEntry;
import net.minecraft.screen.CraftingScreenHandler;
import widecat.meteorcrashaddon.CrashAddon;

Expand All @@ -35,9 +35,9 @@ private void onTick(TickEvent.Post event) {
try {
List<RecipeResultCollection> recipeResultCollectionList = mc.player.getRecipeBook().getOrderedResults();
for (RecipeResultCollection recipeResultCollection : recipeResultCollectionList) {
for (RecipeEntry<?> recipe : recipeResultCollection.getRecipes(true)) {
for (RecipeDisplayEntry recipe : recipeResultCollection.getAllRecipes()) {
for (int i = 0; i < packets.get(); i++) {
mc.getNetworkHandler().sendPacket(new CraftRequestC2SPacket(mc.player.currentScreenHandler.syncId, recipe, true));
mc.getNetworkHandler().sendPacket(new CraftRequestC2SPacket(mc.player.currentScreenHandler.syncId, recipe.id(), true));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/widecat/meteorcrashaddon/modules/EntityCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ public void onTick(TickEvent.Post event) {
for (int i = 0; i < amount.get(); i++) {
Vec3d v = vehicle.getPos();
vehicle.setPos(v.x, v.y + speed.get(), v.z);
mc.getNetworkHandler().sendPacket(new VehicleMoveC2SPacket(vehicle));
mc.getNetworkHandler().sendPacket(VehicleMoveC2SPacket.fromVehicle(vehicle));
}
}
case Position -> {
BlockPos start = mc.player.getBlockPos();
Vec3d end = new Vec3d(start.getX() + .5, start.getY() + 1, start.getZ() + .5);
vehicle.updatePosition(end.x, end.y - 1, end.z);
for (int i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new VehicleMoveC2SPacket(vehicle));
mc.getNetworkHandler().sendPacket(VehicleMoveC2SPacket.fromVehicle(vehicle));
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/widecat/meteorcrashaddon/modules/ErrorCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
import net.minecraft.screen.slot.SlotActionType;
import net.minecraft.screen.sync.ItemStackHash;
import widecat.meteorcrashaddon.CrashAddon;

public class ErrorCrash extends Module {
Expand All @@ -39,10 +38,10 @@ public ErrorCrash() {

@EventHandler
private void onTick(TickEvent.Post event) {
Int2ObjectMap<ItemStack> REAL = new Int2ObjectArrayMap<>();
REAL.put(0, new ItemStack(Items.RED_DYE, 1));
Int2ObjectMap<ItemStackHash> REAL = new Int2ObjectArrayMap<>();
REAL.put(0, ItemStackHash.EMPTY);
for (int i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new ClickSlotC2SPacket(mc.player.currentScreenHandler.syncId,123344, 2957234, 2859623, SlotActionType.PICKUP, new ItemStack(Items.AIR, -1), REAL));
mc.getNetworkHandler().sendPacket(new ClickSlotC2SPacket(mc.player.currentScreenHandler.syncId,123344, (short) 2957234, (byte) 2859623, SlotActionType.PICKUP, REAL, ItemStackHash.EMPTY));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/widecat/meteorcrashaddon/modules/InteractCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ private void onTick(TickEvent.Post event) {
}
case Item -> {
for (int i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, 0));
mc.getNetworkHandler().sendPacket(new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, 0, mc.player.getYaw(), mc.player.getPitch()));
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/widecat/meteorcrashaddon/modules/LecternCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package widecat.meteorcrashaddon.modules;

import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import meteordevelopment.meteorclient.events.game.OpenScreenEvent;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.client.gui.screen.ingame.LecternScreen;
import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
import net.minecraft.screen.slot.SlotActionType;
import net.minecraft.screen.sync.ItemStackHash;
import widecat.meteorcrashaddon.CrashAddon;

public class LecternCrash extends Module {
Expand All @@ -18,7 +20,9 @@ public LecternCrash() {
@EventHandler
private void onOpenScreenEvent(OpenScreenEvent event) {
if (!(event.screen instanceof LecternScreen)) return;
mc.getNetworkHandler().sendPacket(new ClickSlotC2SPacket(mc.player.currentScreenHandler.syncId, mc.player.currentScreenHandler.getRevision(), 0, 0, SlotActionType.QUICK_MOVE, mc.player.currentScreenHandler.getCursorStack().copy(), Int2ObjectMaps.emptyMap()));
Int2ObjectMap<ItemStackHash> itemMap = new Int2ObjectArrayMap<>();
itemMap.put(0, ItemStackHash.EMPTY);
mc.getNetworkHandler().sendPacket(new ClickSlotC2SPacket(mc.player.currentScreenHandler.syncId, mc.player.currentScreenHandler.getRevision(), (short) 0, (byte) 0, SlotActionType.QUICK_MOVE, itemMap, ItemStackHash.fromItemStack(mc.player.currentScreenHandler.getCursorStack().copy(), mc.player.networkHandler.method_68823())));
toggle();
}
}
2 changes: 1 addition & 1 deletion src/main/java/widecat/meteorcrashaddon/modules/MovementCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ private void onTick(TickEvent.Post event) {
for (int i = 0; i < packets.get(); i++) {
PlayerMoveC2SPacket.Full move_packet = new PlayerMoveC2SPacket.Full(current_pos.x + getDistributedRandom(1),
current_pos.y + getDistributedRandom(1), current_pos.z + getDistributedRandom(1),
(float) rndD(90), (float) rndD(180), true);
(float) rndD(90), (float) rndD(180), true, mc.player.horizontalCollision);
mc.getNetworkHandler().sendPacket(move_packet);
}
} catch (Exception ignored) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/widecat/meteorcrashaddon/modules/PacketSpammer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public PacketSpammer() {
@EventHandler
private void onTick(TickEvent.Post event) {
for (int i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(Math.random() >= 0.5));
mc.getNetworkHandler().sendPacket(new PlayerMoveC2SPacket.OnGroundOnly(Math.random() >= 0.5, mc.player.horizontalCollision));
mc.getNetworkHandler().sendPacket(new HandSwingC2SPacket(Hand.MAIN_HAND));
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/widecat/meteorcrashaddon/modules/SequenceCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private void onTick(TickEvent.Post event) {
switch (mode.get()) {
case Item -> {
for (int i = 0; i < amount.get(); i++) {
mc.getNetworkHandler().sendPacket(new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, -1));
mc.getNetworkHandler().sendPacket(new PlayerInteractItemC2SPacket(Hand.MAIN_HAND, -1, mc.player.getYaw(), mc.player.getPitch()));
}
}
case Block -> {
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/widecat/meteorcrashaddon/modules/WindowCrash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.client.MinecraftClient;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.screen.slot.SlotActionType;
import net.minecraft.screen.sync.ItemStackHash;
import widecat.meteorcrashaddon.CrashAddon;

public class WindowCrash extends Module {
Expand Down Expand Up @@ -40,10 +39,10 @@ public WindowCrash() {
@EventHandler
private void onTick(TickEvent.Post event) {
ScreenHandler handler = MinecraftClient.getInstance().player.currentScreenHandler;
Int2ObjectArrayMap itemMap = new Int2ObjectArrayMap();
itemMap.put(0, new ItemStack(Items.ACACIA_BOAT, 1));
Int2ObjectArrayMap<ItemStackHash> itemMap = new Int2ObjectArrayMap<>();
itemMap.put(0, ItemStackHash.EMPTY);
for (int i = 0; i < crashPower.get() + 1; i++) {
MinecraftClient.getInstance().player.networkHandler.sendPacket(new ClickSlotC2SPacket(handler.syncId, handler.getRevision(), 36, -1, SlotActionType.SWAP, handler.getCursorStack().copy(), itemMap));
MinecraftClient.getInstance().player.networkHandler.sendPacket(new ClickSlotC2SPacket(handler.syncId, handler.getRevision(), (short) 36, (byte) -1, SlotActionType.SWAP, itemMap, ItemStackHash.fromItemStack(handler.getCursorStack().copy(), mc.player.networkHandler.method_68823())));
}
}

Expand Down