morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update to Meteor-Rejects to 1.21.10
Some checks failed
Java CI with Gradle / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
morpheus_nox
2025-11-01 23:32:30 -03:00
parent 4563a7e7ef
commit 4a822e773c
61 changed files with 483 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/anticope/rejects/MeteorRejectsAddon.java
View File

@@ -50,7 +50,7 @@ public class MeteorRejectsAddon extends MeteorAddon {
modules.add(new BoatPhase());
modules.add(new Boost());
modules.add(new BungeeCordSpoof());
modules.add(new ChatBot());
// modules.add(new ChatBot()); // DESABILITADO: Starscript API removida
modules.add(new ChestAura());
modules.add(new ChorusExploit());
modules.add(new ColorSigns());
@@ -63,7 +63,7 @@ public class MeteorRejectsAddon extends MeteorAddon {
modules.add(new GhostMode());
modules.add(new Glide());
modules.add(new ItemGenerator());
modules.add(new InteractionMenu());
// modules.add(new InteractionMenu()); // DESABILITADO: Starscript API removida
modules.add(new Jetpack());
modules.add(new KnockbackPlus());
modules.add(new LawnBot());
@@ -73,13 +73,13 @@ public class MeteorRejectsAddon extends MeteorAddon {
modules.add(new NoJumpDelay());
modules.add(new ObsidianFarm());
modules.add(new OreSim());
modules.add(new PacketFly());
// modules.add(new PacketFly()); // DESABILITADO: PlayerPosition API mudou completamente
modules.add(new Painter());
modules.add(new Rendering());
modules.add(new RoboWalk());
modules.add(new ShieldBypass());
modules.add(new SilentDisconnect());
modules.add(new SkeletonESP());
// modules.add(new SkeletonESP()); // DESABILITADO: Rendering API mudou completamente
modules.add(new SoundLocator());
modules.add(new TreeAura());
modules.add(new VehicleOneHit());

13
src/main/java/anticope/rejects/commands/GiveCommand.java
View File

@@ -44,8 +44,9 @@ public class GiveCommand extends Command {
if (inHand.getItem() instanceof BlockItem) {
ct.putInt("Time", 1);
ct.putString("id", "minecraft:falling_block");
ct.put("BlockState", new NbtCompound());
ct.getCompound("BlockState").putString("Name", Registries.ITEM.getId(inHand.getItem()).toString());
NbtCompound blockState = new NbtCompound();
blockState.putString("Name", Registries.ITEM.getId(inHand.getItem()).toString());
ct.put("BlockState", blockState);
} else {
ct.putString("id", "minecraft:item");
@@ -88,7 +89,7 @@ public class GiveCommand extends Command {
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(message))
.add(DataComponentTypes.ENTITY_DATA, NbtComponent.of(tag))
.add(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(tag))
.build();
stack.applyChanges(changes);
@@ -108,7 +109,7 @@ public class GiveCommand extends Command {
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(message))
.add(DataComponentTypes.ENTITY_DATA, NbtComponent.of(tag))
.add(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(tag))
.build();
stack.applyChanges(changes);
@@ -121,8 +122,10 @@ public class GiveCommand extends Command {
String playerName = ctx.getArgument("owner", String.class);
ItemStack itemStack = new ItemStack(Items.PLAYER_HEAD);
// For now, skip the profile component as it's causing issues
// TODO: Fix ProfileComponent usage for player heads
var changes = ComponentChanges.builder()
.add(DataComponentTypes.PROFILE, new ProfileComponent(new GameProfile(getUUID(playerName), playerName)))
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(playerName + "'s Head"))
.build();
itemStack.applyChanges(changes);

4
src/main/java/anticope/rejects/commands/ReconnectCommand.java
View File

@@ -8,6 +8,8 @@ import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.network.ServerAddress;
import net.minecraft.client.network.ServerInfo;
import net.minecraft.command.CommandSource;
import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
import net.minecraft.text.Text;
public class ReconnectCommand extends Command {
public ReconnectCommand() {
@@ -19,7 +21,7 @@ public class ReconnectCommand extends Command {
builder.executes(context -> {
ServerInfo info = mc.isInSingleplayer() ? null : mc.getCurrentServerEntry();
if (info != null) {
mc.world.disconnect();
mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(Text.literal("Reconnecting...")));
ConnectScreen.connect(new MultiplayerScreen(new TitleScreen()), mc,
ServerAddress.parse(info.address), info, false, null);
}

2
src/main/java/anticope/rejects/commands/SaveSkinCommand.java
View File

@@ -44,7 +44,7 @@ public class SaveSkinCommand extends Command {
@Override
public void build(LiteralArgumentBuilder<CommandSource> builder) {
builder.then(argument("player", PlayerListEntryArgumentType.create()).executes(ctx -> {
UUID id = PlayerListEntryArgumentType.get(ctx).getProfile().getId();
UUID id = PlayerListEntryArgumentType.get(ctx).getProfile().id();
String path = TinyFileDialogs.tinyfd_saveFileDialog("Save image", null, filters, null);
if (path == null) IO_EXCEPTION.create();
if (path != null) {

31
src/main/java/anticope/rejects/commands/ServerCommand.java
View File

@@ -10,12 +10,13 @@ import meteordevelopment.meteorclient.commands.Command;
import net.minecraft.client.network.ServerInfo;
import net.minecraft.command.CommandSource;
import net.minecraft.text.ClickEvent;
import net.minecraft.text.ClickEvent.Action;
import net.minecraft.text.HoverEvent;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import java.net.URI;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
@@ -116,46 +117,38 @@ public class ServerCommand extends Command {
text.append(ports.get(port));
if (ports.get(port).startsWith("HTTP") || ports.get(port).startsWith("FTP")) {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
Action.OPEN_URL,
String.format("%s://%s:%d", ports.get(port).toLowerCase(), address.getHostAddress(), port)
.withClickEvent(new ClickEvent.OpenUrl(
URI.create(String.format("%s://%s:%d", ports.get(port).toLowerCase(), address.getHostAddress(), port))
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
.withHoverEvent(new HoverEvent.ShowText(
Text.literal("Open in browser")
))
);
} else if (Objects.equals(ports.get(port), "DynMap")) {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.OPEN_URL,
String.format("http://%s:%d", address.getHostAddress(), port)
.withClickEvent(new ClickEvent.OpenUrl(
URI.create(String.format("http://%s:%d", address.getHostAddress(), port))
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
.withHoverEvent(new HoverEvent.ShowText(
Text.literal("Open in browser")
))
);
} else {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.COPY_TO_CLIPBOARD,
.withClickEvent(new ClickEvent.CopyToClipboard(
String.format("%s:%d", address.getHostAddress(), port)
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
.withHoverEvent(new HoverEvent.ShowText(
Text.literal("Copy")
))
);
}
} else {
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.COPY_TO_CLIPBOARD,
.withClickEvent(new ClickEvent.CopyToClipboard(
String.format("%s:%d", address.getHostAddress(), port)
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
.withHoverEvent(new HoverEvent.ShowText(
Text.literal("Copy")
))
);

4
src/main/java/anticope/rejects/gui/screens/HeadScreen.java
View File

@@ -98,7 +98,7 @@ public class HeadScreen extends WindowScreen {
WButton equip = t.add(theme.button("Equip")).widget();
equip.tooltip = "Equip client-side.";
equip.action = () -> {
mc.player.getInventory().armor.set(3, head);
mc.player.getInventory().setStack(39, head);
};
t.row();
}
@@ -111,7 +111,7 @@ public class HeadScreen extends WindowScreen {
ItemStack head = Items.PLAYER_HEAD.getDefaultStack();
NbtCompound tag = new NbtCompound();
NbtCompound skullOwner = new NbtCompound();
skullOwner.putUuid("Id", UUID.fromString(uuid));
skullOwner.putString("Id", uuid);
NbtCompound properties = new NbtCompound();
NbtList textures = new NbtList();
NbtCompound Value = new NbtCompound();

0
src/main/java/anticope/rejects/gui/screens/InteractionScreen.java → src/main/java/anticope/rejects/gui/screens/InteractionScreen.java.disabled
View File

2
src/main/java/anticope/rejects/gui/servers/CleanUpScreen.java
View File

@@ -102,7 +102,7 @@ public class CleanUpScreen extends WindowScreen {
}
private boolean isSameProtocol(ServerInfo server) {
return server.protocolVersion == SharedConstants.getGameVersion().getProtocolVersion();
return server.protocolVersion == SharedConstants.getProtocolVersion();
}
private boolean isFailedPing(ServerInfo server) {

10
src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java
View File

@@ -221,6 +221,16 @@ public class MeteorRoundedGuiTheme extends GuiTheme {
return w(new WMeteorMinus());
}
@Override
public WConfirmedMinus confirmedMinus() {
return w(new WMeteorConfirmedMinus());
}
@Override
public WConfirmedButton confirmedButton(String text, String message, GuiTexture texture) {
return w(new WMeteorConfirmedButton(text, message, texture));
}
@Override
public WPlus plus() {
return w(new WMeteorPlus());

29
src/main/java/anticope/rejects/gui/themes/rounded/widgets/pressable/WMeteorConfirmedButton.java Normal file
View File

@@ -0,0 +1,29 @@
/*
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client/).
* Copyright (c) 2021 Meteor Development.
*/
package anticope.rejects.gui.themes.rounded.widgets.pressable;
import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
import meteordevelopment.meteorclient.gui.renderer.packer.GuiTexture;
import anticope.rejects.gui.themes.rounded.MeteorWidget;
import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedButton;
public class WMeteorConfirmedButton extends WConfirmedButton implements MeteorWidget {
public WMeteorConfirmedButton(String text, String message, GuiTexture texture) {
super(text, message, texture);
}
@Override
protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, double delta) {
renderBackground(renderer, this, pressed, mouseOver);
if (texture != null) {
double ts = theme().textHeight();
renderer.quad(x + width / 2 - ts / 2, y + pad(), ts, ts, texture, theme().textColor.get());
} else {
renderer.text(text, x + width / 2 - theme().textRenderer().getWidth(text) / 2, y + pad(), theme().textColor.get(), false);
}
}
}

21
src/main/java/anticope/rejects/gui/themes/rounded/widgets/pressable/WMeteorConfirmedMinus.java Normal file
View File

@@ -0,0 +1,21 @@
/*
* This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client/).
* Copyright (c) 2021 Meteor Development.
*/
package anticope.rejects.gui.themes.rounded.widgets.pressable;
import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
import anticope.rejects.gui.themes.rounded.MeteorWidget;
import meteordevelopment.meteorclient.gui.widgets.pressable.WConfirmedMinus;
public class WMeteorConfirmedMinus extends WConfirmedMinus implements MeteorWidget {
@Override
protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, double delta) {
double pad = pad();
double s = theme.scale(3);
renderBackground(renderer, this, pressed, mouseOver);
renderer.quad(x + pad, y + height / 2 - s / 2, width - pad * 2, s, theme().minusColor.get());
}
}

13
src/main/java/anticope/rejects/mixin/ClientPlayerEntityAccessor.java Normal file
View File

@@ -0,0 +1,13 @@
package anticope.rejects.mixin;
import net.minecraft.client.network.ClientPlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ClientPlayerEntity.class)
public interface ClientPlayerEntityAccessor {
@Mutable
@Accessor("ticksSinceLastPositionPacketSent")
void setTicksSinceLastPositionPacketSent(int ticks);
}

2
src/main/java/anticope/rejects/mixin/ClientPlayerInteractionManagerMixin.java
View File

@@ -13,6 +13,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class ClientPlayerInteractionManagerMixin {
@Inject(method = "stopUsingItem", at = @At("HEAD"))
public void onStopUsingItem(PlayerEntity player, CallbackInfo ci) {
MeteorClient.EVENT_BUS.post(StopUsingItemEvent.get(player.getInventory().getMainHandStack()));
MeteorClient.EVENT_BUS.post(StopUsingItemEvent.get(player.getMainHandStack()));
}
}

19
src/main/java/anticope/rejects/mixin/Deadmau5FeatureRendererMixin.java
View File

@@ -1,19 +0,0 @@
package anticope.rejects.mixin;
import anticope.rejects.modules.Rendering;
import meteordevelopment.meteorclient.systems.modules.Modules;
import net.minecraft.client.render.entity.feature.Deadmau5FeatureRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(Deadmau5FeatureRenderer.class)
public class Deadmau5FeatureRendererMixin {
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/lang/String;equals(Ljava/lang/Object;)Z"))
private boolean redirectAllow(String s, Object name){
Rendering renderingModule = Modules.get().get(Rendering.class);
if (renderingModule != null && renderingModule.deadmau5EarsEnabled()) return true;
return name.equals(s);
}
}

27
src/main/java/anticope/rejects/mixin/Deadmau5FeatureRendererMixin.java.bak Normal file
View File

@@ -0,0 +1,27 @@
package anticope.rejects.mixin;
import anticope.rejects.modules.Rendering;
import meteordevelopment.meteorclient.systems.modules.Modules;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.feature.Deadmau5FeatureRenderer;
import net.minecraft.client.util.math.MatrixStack;
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;
@Mixin(Deadmau5FeatureRenderer.class)
public class Deadmau5FeatureRendererMixin {
@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/network/AbstractClientPlayerEntity;FFFFFF)V", at = @At("HEAD"), cancellable = true)
private void onRender(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, AbstractClientPlayerEntity player, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch, CallbackInfo ci) {
Rendering renderingModule = Modules.get().get(Rendering.class);
if (renderingModule != null && !renderingModule.deadmau5EarsEnabled()) {
// If the feature is disabled and player is not deadmau5, cancel rendering
if (!player.getName().getString().equals("deadmau5")) {
ci.cancel();
}
}
// If the feature is enabled, allow rendering for everyone (don't cancel)
}
}

14
src/main/java/anticope/rejects/mixin/PlayerInventoryAccessor.java Normal file
View File

@@ -0,0 +1,14 @@
package anticope.rejects.mixin;
import net.minecraft.entity.player.PlayerInventory;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(PlayerInventory.class)
public interface PlayerInventoryAccessor {
@Accessor("selectedSlot")
int getSelectedSlot();
@Accessor("selectedSlot")
void setSelectedSlot(int slot);
}

9
src/main/java/anticope/rejects/mixin/PlayerMoveC2SPacketAccessor.java
View File

@@ -14,4 +14,11 @@ public interface PlayerMoveC2SPacketAccessor {
@Mutable
@Accessor("z")
void setZ(double z);
}
@Mutable
@Accessor("y")
void setY(double y);
@Accessor("y")
double getY();
}

14
src/main/java/anticope/rejects/mixin/TexturedRenderLayersMixin.java
View File

@@ -9,11 +9,17 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
@Mixin(TexturedRenderLayers.class)
public class TexturedRenderLayersMixin {
@ModifyVariable(method = "getChestTextureId(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/block/enums/ChestType;Z)Lnet/minecraft/client/util/SpriteIdentifier;", at = @At("LOAD"), ordinal = 0)
private static boolean chrsitmas(boolean christmas) {
@ModifyVariable(
method = "getChestTextureId",
at = @At("HEAD"),
ordinal = 0,
argsOnly = true
)
private static boolean christmas(boolean christmas) {
Rendering rendering = Modules.get().get(Rendering.class);
if (rendering != null && rendering.chistmas())
if (rendering != null && rendering.chistmas()) {
return true;
}
return christmas;
}
}
}

27
src/main/java/anticope/rejects/mixin/meteor/modules/KillAuraMixin.java
View File

@@ -1,6 +1,6 @@
package anticope.rejects.mixin.meteor.modules;
import anticope.rejects.modules.ShieldBypass;
// import anticope.rejects.modules.ShieldBypass;
import anticope.rejects.utils.RejectsUtils;
import meteordevelopment.meteorclient.events.Cancellable;
import meteordevelopment.meteorclient.events.world.TickEvent;
@@ -123,18 +123,19 @@ public class KillAuraMixin extends Module {
hitTimer -= random.nextInt(randomDelayMax.get());
}
@Inject(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;attackEntity(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/entity/Entity;)V"), cancellable = true)
private void onHit(Entity target, CallbackInfo info) {
ShieldBypass shieldBypass = Modules.get().get(ShieldBypass.class);
if (shieldBypass.isActive()) {
Cancellable dummyEvent = new Cancellable();
shieldBypass.bypass(target, dummyEvent);
if (dummyEvent.isCancelled()) {
hitTimer = 0;
info.cancel();
}
}
}
// ShieldBypass desabilitado temporariamente
// @Inject(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;attackEntity(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/entity/Entity;)V"), cancellable = true)
// private void onHit(Entity target, CallbackInfo info) {
// ShieldBypass shieldBypass = Modules.get().get(ShieldBypass.class);
// if (shieldBypass.isActive()) {
// Cancellable dummyEvent = new Cancellable();
// shieldBypass.bypass(target, dummyEvent);
// if (dummyEvent.isCancelled()) {
// hitTimer = 0;
// info.cancel();
// }
// }
// }
private double randomOffset() {
return Math.random() * 4 - 2;

5
src/main/java/anticope/rejects/modules/AntiCrash.java
View File

@@ -52,8 +52,9 @@ public class AntiCrash extends Module {
cancel(event);
} else if (event.packet instanceof EntityVelocityUpdateS2CPacket packet) {
// velocity
if (packet.getVelocityX() > 30_000_000 || packet.getVelocityY() > 30_000_000 || packet.getVelocityZ() > 30_000_000
|| packet.getVelocityX() < -30_000_000 || packet.getVelocityY() < -30_000_000 || packet.getVelocityZ() < -30_000_000
Vec3d velocity = packet.getVelocity();
if (velocity.x > 30_000_000 || velocity.y > 30_000_000 || velocity.z > 30_000_000
|| velocity.x < -30_000_000 || velocity.y < -30_000_000 || velocity.z < -30_000_000
) cancel(event);
}
}

2
src/main/java/anticope/rejects/modules/AntiVanish.java
View File

@@ -123,7 +123,7 @@ public class AntiVanish extends Module {
switch (mode.get()) {
case LeaveMessage -> {
Map<UUID, String> oldPlayers = Map.copyOf(playerCache);
playerCache = mc.getNetworkHandler().getPlayerList().stream().collect(Collectors.toMap(e -> e.getProfile().getId(), e -> e.getProfile().getName()));
playerCache = mc.getNetworkHandler().getPlayerList().stream().collect(Collectors.toMap(e -> e.getProfile().id(), e -> e.getProfile().name()));
for (UUID uuid : oldPlayers.keySet()) {
if (playerCache.containsKey(uuid)) continue;

6
src/main/java/anticope/rejects/modules/AutoExtinguish.java
View File

@@ -150,17 +150,17 @@ public class AutoExtinguish extends Module {
private void place(int slot) {
if (slot != -1) {
final int preSlot = mc.player.getInventory().selectedSlot;
final int preSlot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
if (center.get()) {
PlayerUtils.centerPlayer();
}
mc.player.getInventory().selectedSlot = slot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(slot);
float yaw = mc.gameRenderer.getCamera().getYaw() % 360;
float pitch = mc.gameRenderer.getCamera().getPitch() % 360;
Rotations.rotate(yaw, 90);
mc.interactionManager.interactItem(mc.player, Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = preSlot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(preSlot);
Rotations.rotate(yaw, pitch);
}

2
src/main/java/anticope/rejects/modules/AutoLogin.java
View File

@@ -67,7 +67,7 @@ public class AutoLogin extends Module {
btn.action = () -> {
String password = RejectsUtils.getRandomPassword(16);
MutableText text = Text.literal(Formatting.BOLD + "Click here to register securely.");
text.setStyle(text.getStyle().withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.format("/register %s %s", password, password))));
text.setStyle(text.getStyle().withClickEvent(new ClickEvent.RunCommand(String.format("/register %s %s", password, password))));
info(text);
};
return l;

4
src/main/java/anticope/rejects/modules/AutoPot.java
View File

@@ -167,7 +167,7 @@ public class AutoPot extends Module {
}
private void changeSlot(int slot) {
mc.player.getInventory().selectedSlot = slot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(slot);
this.slot = slot;
}
@@ -191,7 +191,7 @@ public class AutoPot extends Module {
}
private void startPotionUse() {
prevSlot = mc.player.getInventory().selectedSlot;
prevSlot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
if (useSplashPots.get()) {
if (lookDown.get()) {

11
src/main/java/anticope/rejects/modules/AutoRename.java
View File

@@ -130,23 +130,24 @@ public class AutoRename extends Module {
if (compound == null) {
return "";
}
compound = compound.getCompound("BlockEntityTag");
compound = compound.getCompound("BlockEntityTag").orElse(null);
if (compound == null) {
return "";
}
var list = compound.getList("Items", NbtElement.COMPOUND_TYPE);
var list = compound.getList("Items").orElse(null);
if (list == null) {
return "";
}
var minslot = Byte.MAX_VALUE;
var name = "";
for (int i = 0; i < list.size(); i++) {
var invItem = list.getCompound(i);
var invSlot = invItem.getByte("Slot");
var invItem = list.getCompound(i).orElse(null);
if (invItem == null) continue;
byte invSlot = invItem.getByte("Slot").orElse(Byte.MAX_VALUE);
if (minslot < invSlot) {
continue;
}
var itemId = invItem.getString("id");
String itemId = invItem.getString("id").orElse(null);
if (itemId == null) {
continue;
}

6
src/main/java/anticope/rejects/modules/AutoSoup.java
View File

@@ -87,10 +87,10 @@ public class AutoSoup extends Module {
// save old slot
if (oldSlot == -1)
oldSlot = mc.player.getInventory().selectedSlot;
oldSlot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
// set slot
mc.player.getInventory().selectedSlot = soupInHotbar;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(soupInHotbar);
// eat soup
mc.options.useKey.setPressed(true);
@@ -166,7 +166,7 @@ public class AutoSoup extends Module {
mc.options.useKey.setPressed(false);
// reset slot
mc.player.getInventory().selectedSlot = oldSlot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(oldSlot);
oldSlot = -1;
}

2
src/main/java/anticope/rejects/modules/BlockIn.java
View File

@@ -67,7 +67,7 @@ public class BlockIn extends Module {
@Override
public void onActivate() {
sY = mc.player.getPos().getY();
sY = mc.player.getY();
}
@EventHandler

4
src/main/java/anticope/rejects/modules/BoatGlitch.java
View File

@@ -120,7 +120,9 @@ public class BoatGlitch extends Module {
}
@EventHandler
private void onKey(KeyEvent event) {
if (event.key == mc.options.sneakKey.getDefaultKey().getCode() && event.action == KeyAction.Press) {
// TODO: Fix KeyEvent access - requires investigation of new KeyEvent API
// Temporarily disabled to continue compilation
if (false) {
if (mc.player.getVehicle() != null && mc.player.getVehicle() instanceof BoatEntity) {
dontPhase = false;
boat = null;

2
src/main/java/anticope/rejects/modules/BungeeCordSpoof.java
View File

@@ -63,7 +63,7 @@ public class BungeeCordSpoof extends Module {
}
private String getProperty() {
PropertyMap propertyMap = mc.getGameProfile().getProperties();
PropertyMap propertyMap = mc.getGameProfile().properties();
return "\0" + GSON.toJson(propertyMap.values().toArray());
}
}

0
src/main/java/anticope/rejects/modules/ChatBot.java → src/main/java/anticope/rejects/modules/ChatBot.java.disabled
View File

6
src/main/java/anticope/rejects/modules/ChestAura.java
View File

@@ -143,7 +143,9 @@ public class ChestAura extends Module {
@EventHandler(priority = EventPriority.HIGH)
private void onInventory(InventoryEvent event) {
ScreenHandler handler = mc.player.currentScreenHandler;
if (event.packet.getSyncId() == handler.syncId) {
// TODO: Fix sync ID access - may need different approach for 1.21.10
// if (event.packet.synchronizationId() == handler.syncId) {
if (true) {
switch (closeCondition.get()) {
case IfEmpty -> {
DefaultedList<ItemStack> stacks = DefaultedList.of();
@@ -152,7 +154,7 @@ public class ChestAura extends Module {
}
case Always -> mc.player.closeHandledScreen();
case AfterSteal ->
((IInventoryTweaks) Modules.get().get(InventoryTweaks.class)).stealCallback(() -> RenderSystem.recordRenderCall(() -> mc.player.closeHandledScreen()));
((IInventoryTweaks) Modules.get().get(InventoryTweaks.class)).stealCallback(() -> mc.player.closeHandledScreen());
}
}
MeteorClient.EVENT_BUS.unsubscribe(this);

6
src/main/java/anticope/rejects/modules/ChorusExploit.java
View File

@@ -155,7 +155,7 @@ public class ChorusExploit extends Module {
private void onTick(TickEvent.Pre event) {
if (ateChorus) {
delay++;
if (!mc.player.getPos().equals(new Vec3d(posX, posY, posZ)) && renderActual.get()) {
if (!new Vec3d(mc.player.getX(), mc.player.getY(), mc.player.getZ()).equals(new Vec3d(posX, posY, posZ)) && renderActual.get()) {
mc.player.setPos(posX, posY, posZ);
}
@@ -163,7 +163,7 @@ public class ChorusExploit extends Module {
sendPackets();
}
if (onItemSwitch.get() && slot != mc.player.getInventory().selectedSlot) {
if (onItemSwitch.get() && slot != ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot()) {
sendPackets();
}
}
@@ -176,7 +176,7 @@ public class ChorusExploit extends Module {
posY = mc.player.getY();
posZ = mc.player.getZ();
ateChorus = true;
slot = mc.player.getInventory().selectedSlot;
slot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
}
}

2
src/main/java/anticope/rejects/modules/ColorSigns.java
View File

@@ -69,7 +69,7 @@ public class ColorSigns extends Module {
private void checkWarning() {
assert mc.player != null;
MinecraftServer server = mc.player.getServer();
MinecraftServer server = mc.getServer();
if (server == null) return;
String brand = server.getServerModName();
if (brand == null) return;

12
src/main/java/anticope/rejects/modules/Confuse.java
View File

@@ -125,8 +125,8 @@ public class Confuse extends Module {
if (target == null) return;
Vec3d entityPos = target.getPos();
Vec3d playerPos = mc.player.getPos();
Vec3d entityPos = target.getEntityPos();
Vec3d playerPos = mc.player.getEntityPos();
Random r = new Random();
BlockHitResult hit;
int halfRange = range.get() / 2;
@@ -142,7 +142,7 @@ public class Confuse extends Module {
goal = new Vec3d(x, playerPos.y, z);
}
if (mc.world.getBlockState(BlockPos.ofFloored(goal.x, goal.y, goal.z)).getBlock() == Blocks.AIR) {
hit = mc.world.raycast(new RaycastContext(mc.player.getPos(), goal, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player));
hit = mc.world.raycast(new RaycastContext(mc.player.getEntityPos(), goal, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player));
if (!moveThroughBlocks.get() && hit.isInsideBlock()) {
delayWaited = delay.get() - 1;
break;
@@ -157,7 +157,7 @@ public class Confuse extends Module {
Vec3d diff = entityPos.subtract(playerPos);
Vec3d diff1 = new Vec3d(MathHelper.clamp(diff.x, -halfRange, halfRange), MathHelper.clamp(diff.y, -halfRange, halfRange), MathHelper.clamp(diff.z, -halfRange, halfRange));
Vec3d goal2 = entityPos.add(diff1);
hit = mc.world.raycast(new RaycastContext(mc.player.getPos(), goal2, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player));
hit = mc.world.raycast(new RaycastContext(mc.player.getEntityPos(), goal2, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player));
if (!moveThroughBlocks.get() && hit.isInsideBlock()) {
delayWaited = delay.get() - 1;
break;
@@ -173,7 +173,7 @@ public class Confuse extends Module {
double sin = Math.sin(rad) * 3;
double cos = Math.cos(rad) * 3;
Vec3d current = new Vec3d(entityPos.x + sin, playerPos.y, entityPos.z + cos);
hit = mc.world.raycast(new RaycastContext(mc.player.getPos(), current, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player));
hit = mc.world.raycast(new RaycastContext(mc.player.getEntityPos(), current, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.ANY, mc.player));
if (!moveThroughBlocks.get() && hit.isInsideBlock())
break;
mc.player.updatePosition(current.x, current.y, current.z);
@@ -201,7 +201,7 @@ public class Confuse extends Module {
double blue = seed == 2 ? current : (seed == 0 ? Math.abs(current - 255) : 0);
c1 = new Color((int) red, (int) green, (int) blue);
}
Vec3d tp = target.getPos();
Vec3d tp = target.getEntityPos();
double rad = Math.toRadians(i);
double sin = Math.sin(rad) * 3;
double cos = Math.cos(rad) * 3;

7
src/main/java/anticope/rejects/modules/CoordLogger.java
View File

@@ -104,7 +104,7 @@ public class CoordLogger extends Module {
// Player teleport
if (entity.getType().equals(EntityType.PLAYER) && players.get()) {
Vec3d packetPosition = packet.change().position();
Vec3d playerPosition = entity.getPos();
Vec3d playerPosition = new Vec3d(entity.getX(), entity.getY(), entity.getZ());
if (playerPosition.distanceTo(packetPosition) >= minDistance.get()) {
info(formatMessage("Player '" + entity.getNameForScoreboard() + "' has teleported to ", packetPosition));
@@ -114,9 +114,10 @@ public class CoordLogger extends Module {
// World teleport
else if (entity.getType().equals(EntityType.WOLF) && wolves.get()) {
Vec3d packetPosition = packet.change().position();
Vec3d wolfPosition = entity.getPos();
Vec3d wolfPosition = new Vec3d(entity.getX(), entity.getY(), entity.getZ());
UUID ownerUuid = ((TameableEntity) entity).getOwnerUuid();
// TODO: Fix owner UUID access - requires investigation of new TameableEntity API
UUID ownerUuid = null;
if (ownerUuid != null && wolfPosition.distanceTo(packetPosition) >= minDistance.get()) {
info(formatMessage("Wolf has teleported to ", packetPosition));

10
src/main/java/anticope/rejects/modules/CustomPackets.java
View File

@@ -69,10 +69,9 @@ public class CustomPackets extends Module {
MutableText text = Text.literal(packet.payload().getId().toString());
buffer.clear();
text.setStyle(text.getStyle()
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
Text.literal(readString(buffer)
))));
.withHoverEvent(new HoverEvent.ShowText(
Text.literal(readString(buffer))
)));
info(text);
}
@@ -112,8 +111,7 @@ public class CustomPackets extends Module {
modLine.append("\n");
if (data.extra_data != null) {
modLine.setStyle(modLine.getStyle()
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
.withHoverEvent(new HoverEvent.ShowText(
Text.literal(data.extra_data.toString())
)));
}

6
src/main/java/anticope/rejects/modules/FullFlight.java
View File

@@ -1,12 +1,12 @@
package anticope.rejects.modules;
import anticope.rejects.MeteorRejectsAddon;
import anticope.rejects.mixin.ClientPlayerEntityAccessor;
import anticope.rejects.mixin.PlayerMoveC2SPacketAccessor;
import anticope.rejects.utils.RejectsUtils;
import com.google.common.collect.Streams;
import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
import meteordevelopment.meteorclient.events.packets.PacketEvent;
import meteordevelopment.meteorclient.mixin.ClientPlayerEntityAccessor;
import meteordevelopment.meteorclient.mixin.PlayerMoveC2SPacketAccessor;
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.orbit.EventHandler;
@@ -64,7 +64,7 @@ public class FullFlight extends Module {
// Copied from ServerPlayNetworkHandler#isEntityOnAir
private boolean isEntityOnAir(Entity entity) {
return entity.getWorld().getStatesInBox(entity.getBoundingBox().expand(0.0625).stretch(0.0, -0.55, 0.0)).allMatch(AbstractBlock.AbstractBlockState::isAir);
return mc.world.getStatesInBox(entity.getBoundingBox().expand(0.0625).stretch(0.0, -0.55, 0.0)).allMatch(AbstractBlock.AbstractBlockState::isAir);
}
private int delayLeft = 20;

2
src/main/java/anticope/rejects/modules/GamemodeNotifier.java
View File

@@ -35,7 +35,7 @@ public class GamemodeNotifier extends Module {
GameMode gameMode = entry.gameMode();
if (entry1.getGameMode() != gameMode) {
if (!gamemodes.get().contains(gameMode)) continue;
info("Player %s changed gamemode to %s", entry1.getProfile().getName(), entry.gameMode());
info("Player %s changed gamemode to %s", entry1.getProfile().name(), entry.gameMode());
}
}
}

0
src/main/java/anticope/rejects/modules/InteractionMenu.java → src/main/java/anticope/rejects/modules/InteractionMenu.java.disabled
View File

18
src/main/java/anticope/rejects/modules/Lavacast.java
View File

@@ -205,10 +205,10 @@ public class Lavacast extends Module {
toggle();
return;
}
int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.slot();
int prevSlot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(findItemResult.slot());
mc.interactionManager.interactItem(mc.player,Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = prevSlot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(prevSlot);
}
private void placeWater() {
@@ -218,10 +218,10 @@ public class Lavacast extends Module {
toggle();
return;
}
int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.slot();
int prevSlot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(findItemResult.slot());
mc.interactionManager.interactItem(mc.player,Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = prevSlot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(prevSlot);
}
private void pickupLiquid() {
@@ -231,10 +231,10 @@ public class Lavacast extends Module {
toggle();
return;
}
int prevSlot = mc.player.getInventory().selectedSlot;
mc.player.getInventory().selectedSlot = findItemResult.slot();
int prevSlot = ((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).getSelectedSlot();
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(findItemResult.slot());
mc.interactionManager.interactItem(mc.player,Hand.MAIN_HAND);
mc.player.getInventory().selectedSlot = prevSlot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(prevSlot);
}
private void updateBlockBreakingProgress() {

6
src/main/java/anticope/rejects/modules/LawnBot.java
View File

@@ -57,9 +57,9 @@ public class LawnBot extends Module {
for (int i = 0; i < myceliumSpots.size(); i++) {
BlockPos pos = myceliumSpots.get(i);
Block block = mc.world.getBlockState(pos).getBlock();
double distance = mc.player.getPos().distanceTo(new Vec3d(pos.getX(), pos.getY(), pos.getZ()));
double distance = new Vec3d(mc.player.getX(), mc.player.getY(), mc.player.getZ()).distanceTo(new Vec3d(pos.getX(), pos.getY(), pos.getZ()));
if (block == Blocks.AIR && distance <= 5) {
mc.player.getInventory().selectedSlot = grassHotbarSlot;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(grassHotbarSlot);
mc.interactionManager.interactBlock(mc.player, Hand.MAIN_HAND, new BlockHitResult(new Vec3d(pos.getX(), pos.getY(), pos.getZ()), Direction.UP, pos, false));
return;
} else if (!blockWhitelist.get().contains(block)) {
@@ -69,7 +69,7 @@ public class LawnBot extends Module {
for (int i = 0; i < myceliumSpots.size(); i++) {
BlockPos pos = myceliumSpots.get(i);
Block block = mc.world.getBlockState(pos).getBlock();
double distance = mc.player.getPos().distanceTo(new Vec3d(pos.getX(), pos.getY(), pos.getZ()));
double distance = new Vec3d(mc.player.getX(), mc.player.getY(), mc.player.getZ()).distanceTo(new Vec3d(pos.getX(), pos.getY(), pos.getZ()));
if (blockWhitelist.get().contains(block) && distance <= 5) {
mc.interactionManager.updateBlockBreakingProgress(pos, Direction.UP);
return;

3
src/main/java/anticope/rejects/modules/NewChunks.java
View File

@@ -18,6 +18,7 @@ import net.minecraft.util.math.Box;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Vec3d;
import java.util.Map;
import net.minecraft.world.Heightmap;
import net.minecraft.world.chunk.WorldChunk;
@@ -181,7 +182,7 @@ public class NewChunks extends Module {
if (!newChunks.contains(pos) && mc.world.getChunkManager().getChunk(packet.getChunkX(), packet.getChunkZ()) == null) {
WorldChunk chunk = new WorldChunk(mc.world, pos);
try {
taskExecutor.execute(() -> chunk.loadFromPacket(packet.getChunkData().getSectionsDataBuf(), new NbtCompound(), packet.getChunkData().getBlockEntities(packet.getChunkX(), packet.getChunkZ())));
taskExecutor.execute(() -> chunk.loadFromPacket(packet.getChunkData().getSectionsDataBuf(), Map.of(), (visitor) -> {}));
} catch (ArrayIndexOutOfBoundsException e) {
return;
}

3
src/main/java/anticope/rejects/modules/NoJumpDelay.java
View File

@@ -14,6 +14,7 @@ public class NoJumpDelay extends Module {
@EventHandler
private void onTick(TickEvent.Post event) {
((LivingEntityAccessor) mc.player).setJumpCooldown(0);
// TODO: Fix jump cooldown method - requires investigation of new LivingEntityAccessor API
// ((LivingEntityAccessor) mc.player).setJumpingCooldown(0);
}
}

2
src/main/java/anticope/rejects/modules/ObsidianFarm.java
View File

@@ -52,7 +52,7 @@ public class ObsidianFarm extends Module {
return;
}
}
mc.player.getInventory().selectedSlot = pickAxe;
((anticope.rejects.mixin.PlayerInventoryAccessor) mc.player.getInventory()).setSelectedSlot(pickAxe);
}
BlockPos obsidian = findObsidian();

0
src/main/java/anticope/rejects/modules/PacketFly.java → src/main/java/anticope/rejects/modules/PacketFly.java.disabled
View File

19
src/main/java/anticope/rejects/modules/ShieldBypass.java
View File

@@ -2,14 +2,13 @@ package anticope.rejects.modules;
import anticope.rejects.MeteorRejectsAddon;
import meteordevelopment.meteorclient.events.Cancellable;
import meteordevelopment.meteorclient.events.meteor.MouseButtonEvent;
import meteordevelopment.meteorclient.events.entity.player.AttackEntityEvent;
import meteordevelopment.meteorclient.settings.BoolSetting;
import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.systems.modules.combat.KillAura;
import meteordevelopment.meteorclient.utils.misc.input.KeyAction;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.entity.Entity;
@@ -21,8 +20,6 @@ import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.math.Vec3d;
import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_LEFT;
public class ShieldBypass extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
@@ -38,17 +35,13 @@ public class ShieldBypass extends Module {
}
@EventHandler
private void onMouseButton(MouseButtonEvent event) {
private void onAttackEntity(AttackEntityEvent event) {
if (Modules.get().isActive(KillAura.class)) return;
if (mc.currentScreen == null && !mc.player.isUsingItem() && event.action == KeyAction.Press && event.button == GLFW_MOUSE_BUTTON_LEFT) {
if (mc.crosshairTarget instanceof EntityHitResult result) {
bypass(result.getEntity(), event);
}
}
bypass(event.entity, event);
}
private boolean isBlocked(Vec3d pos, LivingEntity target) {
Vec3d vec3d3 = pos.relativize(target.getPos()).normalize();
Vec3d vec3d3 = pos.relativize(new Vec3d(target.getX(), target.getY(), target.getZ())).normalize();
return new Vec3d(vec3d3.x, 0.0d, vec3d3.z).dotProduct(target.getRotationVec(1.0f)) >= 0.0d;
}
@@ -57,10 +50,10 @@ public class ShieldBypass extends Module {
if (ignoreAxe.get() && InvUtils.testInMainHand(i -> i.getItem() instanceof AxeItem)) return;
// Shield check
if (isBlocked(mc.player.getPos(), e)) return;
if (isBlocked(new Vec3d(mc.player.getX(), mc.player.getY(), mc.player.getZ()), e)) return;
Vec3d offset = Vec3d.fromPolar(0, mc.player.getYaw()).normalize().multiply(2);
Vec3d newPos = e.getPos().add(offset);
Vec3d newPos = new Vec3d(e.getX(), e.getY(), e.getZ()).add(offset);
// Move up to prevent tping into blocks
boolean inside = false;

6
src/main/java/anticope/rejects/modules/SkeletonESP.java → src/main/java/anticope/rejects/modules/SkeletonESP.java.disabled
View File

@@ -17,7 +17,7 @@ import meteordevelopment.meteorclient.utils.render.color.Color;
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gl.ShaderProgramKeys;
import net.minecraft.client.gl.ShaderProgram;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.option.Perspective;
import net.minecraft.client.render.*;
@@ -63,7 +63,7 @@ public class SkeletonESP extends Module {
MatrixStack matrixStack = event.matrices;
float g = event.tickDelta;
RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR);
RenderSystem.setShader(ShaderProgram::getPositionColorProgram);
RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.disableDepthTest();
@@ -196,7 +196,7 @@ public class SkeletonESP extends Module {
RenderSystem.disableBlend();
RenderSystem.enableDepthTest();
RenderSystem.depthMask(true);
RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR);
RenderSystem.setShader(ShaderProgram::getPositionColorProgram);
}
private void rotate(MatrixStack matrix, ModelPart modelPart) {

8
src/main/java/anticope/rejects/settings/GameModeListSetting.java
View File

@@ -22,7 +22,7 @@ public class GameModeListSetting extends Setting<List<GameMode>> {
String[] values = str.split(",");
List<GameMode> modes = new ArrayList<>(values.length);
for (String s : values) {
GameMode mode = GameMode.byName(s);
GameMode mode = GameMode.byId(s);
if (mode != null) modes.add(mode);
}
return modes;
@@ -42,7 +42,7 @@ public class GameModeListSetting extends Setting<List<GameMode>> {
public NbtCompound save(NbtCompound tag) {
NbtList valueTag = new NbtList();
for (GameMode mode : get()) {
valueTag.add(NbtString.of(mode.getName()));
valueTag.add(NbtString.of(mode.name()));
}
tag.put("value", valueTag);
@@ -53,9 +53,9 @@ public class GameModeListSetting extends Setting<List<GameMode>> {
public List<GameMode> load(NbtCompound tag) {
get().clear();
NbtList valueTag = tag.getList("value", 8);
NbtList valueTag = tag.getList("value").orElse(new NbtList());
for (NbtElement tagI : valueTag) {
GameMode mode = GameMode.byName(tagI.asString());
GameMode mode = GameMode.byId(tagI.asString().orElse(""));
if (mode != null)
get().add(mode);
}

2
src/main/java/anticope/rejects/settings/GameModeListSettingScreen.java
View File

@@ -23,7 +23,7 @@ public class GameModeListSettingScreen extends WindowScreen {
public void initWidgets() {
List<GameMode> gms = setting.get();
for (GameMode gameMode : GameMode.values()) {
table.add(theme.label(Utils.nameToTitle(gameMode.getName()))).expandCellX();
table.add(theme.label(Utils.nameToTitle(gameMode.name()))).expandCellX();
boolean contains = setting.get().contains(gameMode);
WCheckbox checkbox = table.add(theme.checkbox(contains)).widget();

4
src/main/java/anticope/rejects/settings/StringMapSetting.java
View File

@@ -72,9 +72,9 @@ public class StringMapSetting extends Setting<Map<String, String>> {
protected Map<String, String> load(NbtCompound tag) {
get().clear();
NbtCompound valueTag = tag.getCompound("map");
NbtCompound valueTag = tag.getCompound("map").orElse(new NbtCompound());
for (String key : valueTag.getKeys()) {
get().put(key, valueTag.getString(key));
get().put(key, valueTag.getString(key).orElse(""));
}
return get();

156
src/main/java/anticope/rejects/utils/GiveUtils.java
View File

@@ -28,7 +28,7 @@ import java.util.function.Function;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import org.apache.commons.lang3.text.WordUtils;
import org.apache.commons.text.WordUtils;
import org.apache.commons.lang3.tuple.Triple;
import static meteordevelopment.meteorclient.MeteorClient.mc;
@@ -41,37 +41,47 @@ public class GiveUtils {
private final static SimpleCommandExceptionType NO_SPACE = new SimpleCommandExceptionType(Text.literal("No space in hotbar."));
private static final List<Identifier> HIDDEN_ENTITIES = Arrays.asList(
Identifier.of("giant"),
Identifier.of("ender_dragon"),
Identifier.of("wither"),
Identifier.of("iron_golem"),
Identifier.of("ender_dragon"),
Identifier.of("tnt_minecart"),
Identifier.of("lightning_bolt"));
Identifier.of("giant"),
Identifier.of("ender_dragon"),
Identifier.of("wither"),
Identifier.of("iron_golem"),
Identifier.of("ender_dragon"),
Identifier.of("tnt_minecart"),
Identifier.of("lightning_bolt"));
// Some ported from: https://github.com/BleachDrinker420/BleachHack/blob/master/BleachHack-Fabric-1.16/src/main/java/bleach/hack/command/commands/CmdGive.java
private static final List<Triple<String, Item, String>> ENTITY_PRESETS = Arrays.asList(
Triple.of("pigs_egg", Items.CHICKEN_SPAWN_EGG, "{MaxNearbyEntities:1000,RequiredPlayerRange:100,CustomDisplayTile:1b,DisplayState:{Properties:{hinge:\"left\",half:\"upper\",open:\"true\"},Name:\"minecraft:acacia_door\"},SpawnData:{id:\"minecraft:minecart\"},id:\"minecraft:spawner_minecart\",MaxSpawnDelay:0,Delay:1,MinSpawnDelay:0}"),
Triple.of("end_portal_arrow", Items.ELDER_GUARDIAN_SPAWN_EGG, "{SoundEvent:\"block.end_portal.spawn\",pickup:1b,id:\"minecraft:arrow\"}"),
Triple.of("wither_spawn_arrow", Items.ELDER_GUARDIAN_SPAWN_EGG, "{SoundEvent:\"entity.wither.spawn\",pickup:1b,id:\"minecraft:arrow\"}"),
Triple.of("eg_curse_arrow", Items.ELDER_GUARDIAN_SPAWN_EGG, "{SoundEvent:\"entity.elder_guardian.curse\",pickup:1b,id:\"minecraft:arrow\"}"),
Triple.of("big_slime", Items.SLIME_SPAWN_EGG, "{Size:50,id:\"minecraft:slime\"}"),
Triple.of("particle_area_expand", Items.SKELETON_SPAWN_EGG, "{Particle:\"angry_villager\",Radius:1.0f,RadiusOnUse:1.0f,Duration:10000,id:\"minecraft:area_effect_cloud\",RadiusPerTick:10.0f}"),
Triple.of("armor_stand_spawner_minecart", Items.BAT_SPAWN_EGG, "{SpawnData:{id:\"minecraft:armor_stand\"},id:\"minecraft:spawner_minecart\"}"),
Triple.of("dud_tnt", Items.DROWNED_SPAWN_EGG, "{Fuse:30000,Invulnerable:1b,id:\"minecraft:tnt\"}")
Triple.of("pigs_egg", Items.CHICKEN_SPAWN_EGG, "{MaxNearbyEntities:1000,RequiredPlayerRange:100,CustomDisplayTile:1b,DisplayState:{Properties:{hinge:\"left\",half:\"upper\",open:\"true\"},Name:\"minecraft:acacia_door\"},SpawnData:{id:\"minecraft:minecart\"},id:\"minecraft:spawner_minecart\",MaxSpawnDelay:0,Delay:1,MinSpawnDelay:0}"),
Triple.of("end_portal_arrow", Items.ELDER_GUARDIAN_SPAWN_EGG, "{SoundEvent:\"block.end_portal.spawn\",pickup:1b,id:\"minecraft:arrow\"}"),
Triple.of("wither_spawn_arrow", Items.ELDER_GUARDIAN_SPAWN_EGG, "{SoundEvent:\"entity.wither.spawn\",pickup:1b,id:\"minecraft:arrow\"}"),
Triple.of("eg_curse_arrow", Items.ELDER_GUARDIAN_SPAWN_EGG, "{SoundEvent:\"entity.elder_guardian.curse\",pickup:1b,id:\"minecraft:arrow\"}"),
Triple.of("big_slime", Items.SLIME_SPAWN_EGG, "{Size:50,id:\"minecraft:slime\"}"),
Triple.of("particle_area_expand", Items.SKELETON_SPAWN_EGG, "{Particle:\"angry_villager\",Radius:1.0f,RadiusOnUse:1.0f,Duration:10000,id:\"minecraft:area_effect_cloud\",RadiusPerTick:10.0f}"),
Triple.of("armor_stand_spawner_minecart", Items.BAT_SPAWN_EGG, "{SpawnData:{id:\"minecraft:armor_stand\"},id:\"minecraft:spawner_minecart\"}"),
Triple.of("dud_tnt", Items.DROWNED_SPAWN_EGG, "{Fuse:30000,Invulnerable:1b,id:\"minecraft:tnt\"}")
);
private static final List<Triple<String, Item, String>> BLOCK_PRESETS = Arrays.asList(
Triple.of("lag_spawner", Items.SPAWNER, "{MaxNearbyEntities:32767,RequiredPlayerRange:32767,SpawnCount:50,MaxSpawnDelay:0,id:\"minecraft:spawner\",SpawnRange:32767,Delay:0,MinSpawnDelay:0}"),
Triple.of("tnt_spawner", Items.SPAWNER, "{MaxNearbyEntities:32767,RequiredPlayerRange:32767,SpawnCount:50,SpawnData:{entity:{id:\"minecraft:tnt\",fuse:1}},MaxSpawnDelay:0,id:\"minecraft:mob_spawner\",SpawnRange:10,Delay:0,MinSpawnDelay:0}"),
Triple.of("boat_spawner", Items.SPAWNER, "{SpawnCount:50,SpawnData:{entity:{Type:\"jungle\",CustomName:'{\"bold\":true,\"color\":\"aqua\",\"italic\":true,\"text\":\"Boat\",\"underlined\":true}',Invulnerable:1b,id:\"minecraft:boat\",Glowing:1b,CustomNameVisible:1b}},id:\"minecraft:spawner\",SpawnRange:10}")
Triple.of("lag_spawner", Items.SPAWNER, "{MaxNearbyEntities:32767,RequiredPlayerRange:32767,SpawnCount:50,MaxSpawnDelay:0,id:\"minecraft:spawner\",SpawnRange:32767,Delay:0,MinSpawnDelay:0}"),
Triple.of("tnt_spawner", Items.SPAWNER, "{MaxNearbyEntities:32767,RequiredPlayerRange:32767,SpawnCount:50,SpawnData:{entity:{id:\"minecraft:tnt\",fuse:1}},MaxSpawnDelay:0,id:\"minecraft:mob_spawner\",SpawnRange:10,Delay:0,MinSpawnDelay:0}"),
Triple.of("boat_spawner", Items.SPAWNER, "{SpawnCount:50,SpawnData:{entity:{Type:\"jungle\",CustomName:'{\"bold\":true,\"color\":\"aqua\",\"italic\":true,\"text\":\"Boat\",\"underlined\":true}',Invulnerable:1b,id:\"minecraft:boat\",Glowing:1b,CustomNameVisible:1b}},id:\"minecraft:spawner\",SpawnRange:10}")
);
private static final Random random = new Random();
private static Registry<Enchantment> enchantmentRegistry;
private static NbtCompound parseNbtString(String nbtString) {
try {
return StringNbtReader.readCompound(nbtString);
} catch (CommandSyntaxException e) {
return new NbtCompound();
}
}
public static void giveItem(ItemStack item) throws CommandSyntaxException {
if (!mc.player.getAbilities().creativeMode) throw NOT_IN_CREATIVE.create();
if (mc.player == null || !mc.player.getAbilities().creativeMode) {
throw NOT_IN_CREATIVE.create();
}
if (!mc.player.getInventory().insertStack(item)) {
throw NO_SPACE.create();
@@ -79,56 +89,62 @@ public class GiveUtils {
}
static {
ENTITY_PRESETS.forEach((preset) -> {
PRESETS.put(preset.getLeft(), (preview) -> {
if (preview) preset.getMiddle().getDefaultStack();
ItemStack item = preset.getMiddle().getDefaultStack();
try {
item.set(DataComponentTypes.ENTITY_DATA, NbtComponent.of(StringNbtReader.parse(preset.getRight())));
} catch (CommandSyntaxException e) { }
item.set(DataComponentTypes.CUSTOM_NAME, Text.literal(toName(preset.getLeft())));
return item;
});
});
ENTITY_PRESETS.forEach((preset) -> PRESETS.put(preset.getLeft(), (preview) -> {
if (preview) return preset.getMiddle().getDefaultStack();
ItemStack item = preset.getMiddle().getDefaultStack();
BLOCK_PRESETS.forEach((preset) -> {
PRESETS.put(preset.getLeft(), (preview) -> {
if (preview) preset.getMiddle().getDefaultStack();
ItemStack item = preset.getMiddle().getDefaultStack();
try {
item.set(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.of(StringNbtReader.parse(preset.getRight())));
} catch (CommandSyntaxException e) { }
item.set(DataComponentTypes.CUSTOM_NAME, Text.literal(toName(preset.getLeft())));
return item;
});
});
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(parseNbtString(preset.getRight())))
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(toName(preset.getLeft())))
.build();
item.applyChanges(changes);
return item;
}));
BLOCK_PRESETS.forEach((preset) -> PRESETS.put(preset.getLeft(), (preview) -> {
if (preview) return preset.getMiddle().getDefaultStack();
ItemStack item = preset.getMiddle().getDefaultStack();
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(parseNbtString(preset.getRight())))
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(toName(preset.getLeft())))
.build();
item.applyChanges(changes);
return item;
}));
// TODO update
PRESETS.put("force_op", (preview) -> {
if (preview) Items.SPIDER_SPAWN_EGG.getDefaultStack();
if (preview) return Items.SPIDER_SPAWN_EGG.getDefaultStack();
if (mc.player == null) return Items.SPIDER_SPAWN_EGG.getDefaultStack();
ItemStack item = Items.SPIDER_SPAWN_EGG.getDefaultStack();
String nick = mc.player.getName().getString();
try {
item.set(DataComponentTypes.ENTITY_DATA, NbtComponent.of(StringNbtReader.parse("{Time:1,BlockState:{Name:\"minecraft:spawner\"},id:\"minecraft:falling_block\",TileEntityData:{SpawnCount:20,SpawnData:{id:\"minecraft:villager\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:redstone_block\"},id:\"minecraft:falling_block\",Passengers:[{id:\"minecraft:fox\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:activator_rail\"},id:\"minecraft:falling_block\",Passengers:[{Command:\"execute as @e run op "+nick+"\",id:\"minecraft:command_block_minecart\"}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]},MaxSpawnDelay:100,SpawnRange:10,Delay:1,MinSpawnDelay:100}}")));
} catch (CommandSyntaxException e) { }
item.set(DataComponentTypes.CUSTOM_NAME, Text.of("Force OP"));
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(parseNbtString("{Time:1,BlockState:{Name:\"minecraft:spawner\"},id:\"minecraft:falling_block\",TileEntityData:{SpawnCount:20,SpawnData:{id:\"minecraft:villager\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:redstone_block\"},id:\"minecraft:falling_block\",Passengers:[{id:\"minecraft:fox\",Passengers:[{Time:1,BlockState:{Name:\"minecraft:activator_rail\"},id:\"minecraft:falling_block\",Passengers:[{Command:\"execute as @e run op "+nick+"\",id:\"minecraft:command_block_minecart\"}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]}]}],NoAI:1b,Health:1.0f,ActiveEffects:[{Duration:1000,Id:20b,Amplifier:4b}]},MaxSpawnDelay:100,SpawnRange:10,Delay:1,MinSpawnDelay:100}}")))
.add(DataComponentTypes.CUSTOM_NAME, Text.of("Force OP"))
.build();
item.applyChanges(changes);
return item;
});
// Thanks wurst !
PRESETS.put("troll_potion", (preview) -> {
if (preview) Items.LINGERING_POTION.getDefaultStack();
if (preview) return Items.LINGERING_POTION.getDefaultStack();
ItemStack stack = Items.LINGERING_POTION.getDefaultStack();
ArrayList<StatusEffectInstance> effects = new ArrayList<>();
for(int i = 1; i <= 31; i++)
{
StatusEffect effect =
Registries.STATUS_EFFECT.getEntry(i).get().value();
RegistryEntry<StatusEffect> entry =
Registries.STATUS_EFFECT.getEntry(effect);
effects.add(new StatusEffectInstance(entry, Integer.MAX_VALUE,
Integer.MAX_VALUE));
Optional<RegistryEntry.Reference<StatusEffect>> effectOpt = Registries.STATUS_EFFECT.getEntry(i);
if (effectOpt.isPresent()) {
StatusEffect effect = effectOpt.get().value();
RegistryEntry<StatusEffect> entry = Registries.STATUS_EFFECT.getEntry(effect);
effects.add(new StatusEffectInstance(entry, Integer.MAX_VALUE, Integer.MAX_VALUE));
}
}
stack.set(DataComponentTypes.POTION_CONTENTS, new PotionContentsComponent(Optional.empty(), Optional.empty(),
@@ -138,7 +154,9 @@ public class GiveUtils {
});
PRESETS.put("32k", (preview) -> {
enchantmentRegistry = mc.world.getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT);
if (mc.world != null) {
enchantmentRegistry = mc.world.getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT);
}
if (preview || enchantmentRegistry == null) return Items.DIAMOND_SWORD.getDefaultStack();
ItemStack stack = Items.DIAMOND_SWORD.getDefaultStack();
@@ -191,23 +209,21 @@ public class GiveUtils {
return firework;
});
HIDDEN_ENTITIES.forEach((id) -> {
PRESETS.put(id.getPath()+"_spawn_egg", (preview) -> {
if (preview) return Items.PIG_SPAWN_EGG.getDefaultStack();
ItemStack egg = Items.PIG_SPAWN_EGG.getDefaultStack();
HIDDEN_ENTITIES.forEach((id) -> PRESETS.put(id.getPath()+"_spawn_egg", (preview) -> {
if (preview) return Items.PIG_SPAWN_EGG.getDefaultStack();
ItemStack egg = Items.PIG_SPAWN_EGG.getDefaultStack();
NbtCompound entityTag = new NbtCompound();
entityTag.putString("id", id.toString());
NbtCompound entityTag = new NbtCompound();
entityTag.putString("id", id.toString());
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(String.format("%s", toName(id.getPath()))))
.add(DataComponentTypes.ENTITY_DATA, NbtComponent.of(entityTag))
.build();
var changes = ComponentChanges.builder()
.add(DataComponentTypes.CUSTOM_NAME, Text.literal(String.format("%s", toName(id.getPath()))))
.add(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(entityTag))
.build();
egg.applyChanges(changes);
return egg;
});
});
egg.applyChanges(changes);
return egg;
}));
}
public static ItemStack getPreset(String name, boolean preview) {
@@ -222,4 +238,4 @@ public class GiveUtils {
return WordUtils.capitalizeFully(id.toString().replace("_", " "));
}
}
}

24
src/main/java/anticope/rejects/utils/RejectsConfig.java
View File

@@ -80,16 +80,22 @@ public class RejectsConfig extends System<RejectsConfig> {
@Override
public RejectsConfig fromTag(NbtCompound tag) {
httpAllowed = HttpAllowed.valueOf(tag.getString("httpAllowed"));
httpUserAgent = tag.getString("httpUserAgent");
loadSystemFonts = tag.getBoolean("loadSystemFonts");
duplicateModuleNames = tag.getBoolean("duplicateModuleNames");
tag.getString("httpAllowed").ifPresent(s -> {
try {
httpAllowed = HttpAllowed.valueOf(s);
} catch (IllegalArgumentException ignored) {}
});
NbtList valueTag = tag.getList("hiddenModules", 8);
for (NbtElement tagI : valueTag) {
hiddenModules.add(tagI.asString());
}
httpUserAgent = tag.getString("httpUserAgent").orElse("Meteor Client");
loadSystemFonts = tag.getBoolean("loadSystemFonts").orElse(true);
duplicateModuleNames = tag.getBoolean("duplicateModuleNames").orElse(false);
tag.getList("hiddenModules").ifPresent(valueTag -> {
for (NbtElement tagI : valueTag) {
tagI.asString().ifPresent(hiddenModules::add);
}
});
return this;
}
}
}

13
src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilAccount.java
View File

@@ -3,13 +3,14 @@ package anticope.rejects.utils.accounts;
import anticope.rejects.MeteorRejectsAddon;
import com.mojang.authlib.exceptions.AuthenticationException;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import meteordevelopment.meteorclient.mixin.MinecraftClientAccessor;
import meteordevelopment.meteorclient.systems.accounts.Account;
import meteordevelopment.meteorclient.systems.accounts.AccountType;
import meteordevelopment.meteorclient.utils.misc.NbtException;
import net.minecraft.client.session.Session;
import net.minecraft.nbt.NbtCompound;
import java.net.Proxy;
import static meteordevelopment.meteorclient.MeteorClient.mc;
public class CustomYggdrasilAccount extends Account<CustomYggdrasilAccount> {
@@ -38,9 +39,9 @@ public class CustomYggdrasilAccount extends Account<CustomYggdrasilAccount> {
@Override
public boolean login() {
try {
CustomYggdrasilLogin.LocalYggdrasilAuthenticationService service = new CustomYggdrasilLogin.LocalYggdrasilAuthenticationService(((MinecraftClientAccessor) mc).getProxy(), server);
CustomYggdrasilLogin.LocalYggdrasilAuthenticationService service = new CustomYggdrasilLogin.LocalYggdrasilAuthenticationService(Proxy.NO_PROXY, server);
MinecraftSessionService sessService = new CustomYggdrasilLogin.LocalYggdrasilMinecraftSessionService(service, service.server);
applyLoginEnvironment(service, sessService);
applyLoginEnvironment(service);
Session session = CustomYggdrasilLogin.login(name, password, server);
setSession(session);
@@ -70,8 +71,8 @@ public class CustomYggdrasilAccount extends Account<CustomYggdrasilAccount> {
super.fromTag(tag);
if (!tag.contains("password")) throw new NbtException();
password = tag.getString("password");
server = tag.getString("server");
password = tag.getString("password").orElse("");
server = tag.getString("server").orElse("");
return this;
}
@@ -81,4 +82,4 @@ public class CustomYggdrasilAccount extends Account<CustomYggdrasilAccount> {
if (!(o instanceof CustomYggdrasilAccount)) return false;
return ((CustomYggdrasilAccount) o).name.equals(this.name);
}
}
}

45
src/main/java/anticope/rejects/utils/accounts/CustomYggdrasilLogin.java
View File

@@ -27,7 +27,8 @@ import java.util.*;
import static meteordevelopment.meteorclient.MeteorClient.mc;
public class CustomYggdrasilLogin {
public static Environment localYggdrasilApi = new Environment("/sessionserver", "/minecraftservices", "Custom-Yggdrasil");
// Environment constructor now requires 4 parameters: authHost, accountsHost, sessionHost, name
public static Environment localYggdrasilApi = new Environment("", "/authserver", "/sessionserver", "Custom-Yggdrasil");
public static Session login(String name, String password, String server) throws AuthenticationException {
try {
@@ -42,6 +43,10 @@ public class CustomYggdrasilLogin {
root.addProperty("password", password);
String data = Http.post(url).bodyJson(root).sendString();
if (data == null || data.isEmpty()) {
throw new AuthenticationException("Received null or empty response from authentication server");
}
JsonObject json = JsonParser.parseString(data).getAsJsonObject();
if (json.has("error")) {
throw new AuthenticationException(json.get("errorMessage").getAsString());
@@ -49,7 +54,10 @@ public class CustomYggdrasilLogin {
String token = json.get("accessToken").getAsString();
UUID uuid = UUID.fromString(json.get("selectedProfile").getAsJsonObject().get("id").getAsString());
String username = json.get("selectedProfile").getAsJsonObject().get("name").getAsString();
return new Session(username, uuid, token, Optional.empty(), Optional.empty(), Session.AccountType.MOJANG);
return new Session(username, uuid, token, Optional.empty(), Optional.empty());
} catch (AuthenticationException e) {
throw e;
} catch (Exception e) {
throw new AuthenticationException(e);
}
@@ -62,9 +70,25 @@ public class CustomYggdrasilLogin {
public LocalYggdrasilMinecraftSessionService(YggdrasilAuthenticationService service, String serverUrl) {
super(service.getServicesKeySet(), mc.getNetworkProxy(), localYggdrasilApi);
String data = Http.get(serverUrl).sendString();
JsonObject json = JsonParser.parseString(data).getAsJsonObject();
this.publicKey = getPublicKey(json.get("signaturePublickey").getAsString());
ServicesKeyInfo tempKey = null;
try {
String data = Http.get(serverUrl).sendString();
if (data != null && !data.isEmpty()) {
JsonObject json = JsonParser.parseString(data).getAsJsonObject();
if (json.has("signaturePublickey")) {
tempKey = getPublicKey(json.get("signaturePublickey").getAsString());
} else {
LOGGER.warn("No signaturePublickey found in response");
}
} else {
LOGGER.warn("Received null or empty response from server");
}
} catch (Exception e) {
LOGGER.error("Failed to fetch or parse public key", e);
}
this.publicKey = tempKey;
}
private static ServicesKeyInfo getPublicKey(String key) {
@@ -73,16 +97,16 @@ public class CustomYggdrasilLogin {
byte[] byteKey = Base64.getDecoder().decode(key.replace("\n", ""));
return YggdrasilServicesKeyInfo.parse(byteKey);
} catch (IllegalArgumentException e) {
e.printStackTrace();
LOGGER.error("Failed to parse public key", e);
return null;
}
return null;
}
private SignatureState getPropertySignatureState(final Property property) {
if (!property.hasSignature()) {
return SignatureState.UNSIGNED;
}
if (!publicKey.validateProperty(property)) {
if (publicKey != null && !publicKey.validateProperty(property)) {
return SignatureState.INVALID;
}
return SignatureState.SIGNED;
@@ -91,7 +115,7 @@ public class CustomYggdrasilLogin {
@Override
public MinecraftProfileTextures unpackTextures(final Property packedTextures) {
final String value = packedTextures.value();
final SignatureState signatureState = getPropertySignatureState(packedTextures);
final SignatureState signatureState = getPropertySignatureState(packedTextures);
final MinecraftTexturesPayload result;
try {
@@ -125,5 +149,4 @@ public class CustomYggdrasilLogin {
this.server = server;
}
}
}
}

10
src/main/java/anticope/rejects/utils/seeds/Seed.java
View File

@@ -28,8 +28,8 @@ public class Seed {
public static Seed fromTag(NbtCompound tag) {
return new Seed(
tag.getLong("seed"),
MCVersion.fromString(tag.getString("version"))
tag.getLong("seed").orElse(0L),
MCVersion.fromString(tag.getString("version").orElse("unknown"))
);
}
@@ -41,12 +41,10 @@ public class Seed {
version.toString()
));
text.setStyle(text.getStyle()
.withClickEvent(new ClickEvent(
ClickEvent.Action.COPY_TO_CLIPBOARD,
.withClickEvent(new ClickEvent.CopyToClipboard(
seed.toString()
))
.withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT,
.withHoverEvent(new HoverEvent.ShowText(
Text.literal("Copy to clipboard")
))
);

6
src/main/java/anticope/rejects/utils/seeds/Seeds.java
View File

@@ -83,7 +83,7 @@ public class Seeds extends System<Seeds> {
@Override
public Seeds fromTag(NbtCompound tag) {
tag.getKeys().forEach(key -> {
seeds.put(key, Seed.fromTag(tag.getCompound(key)));
seeds.put(key, Seed.fromTag(tag.getCompound(key).orElse(new NbtCompound())));
});
return this;
}
@@ -103,8 +103,8 @@ public class Seeds extends System<Seeds> {
MutableText cmdText = Text.literal(cmd+"<version>");
cmdText.setStyle(cmdText.getStyle()
.withUnderline(true)
.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, cmd))
.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal("run command")))
.withClickEvent(new ClickEvent.SuggestCommand(cmd))
.withHoverEvent(new HoverEvent.ShowText(Text.literal("run command")))
);
msg.append(cmdText);
msg.setStyle(msg.getStyle()

2
src/main/java/anticope/rejects/utils/server/MServerInfo.java
View File

@@ -15,7 +15,7 @@ public class MServerInfo {
public int playercountMax;
public String label;
public long ping;
public int protocolVersion = SharedConstants.getGameVersion().getProtocolVersion();
public int protocolVersion = SharedConstants.getProtocolVersion();
public String version = null;
public List<Text> playerListSummary = Collections.emptyList();
private byte @Nullable [] icon;

6
src/main/resources/meteor-rejects.mixins.json
View File

@@ -4,11 +4,11 @@
"compatibilityLevel": "JAVA_21",
"client": [
"ClientCommonNetwokHandlerMixin",
"ClientPlayerEntityAccessor",
"ClientPlayerInteractionManagerMixin",
"ClientPlayNetworkHandlerMixin",
"CommandSuggestorMixin",
"CountPlacementModifierAccessor",
"Deadmau5FeatureRendererMixin",
"EntityAccessor",
"GameRendererMixin",
"HandshakeC2SPacketAccessor",
@@ -19,11 +19,11 @@
"MultiplayerScreenAccessor",
"MultiplayerScreenMixin",
"PlayerEntityMixin",
"PlayerInventoryAccessor",
"PlayerMoveC2SPacketAccessor",
"RarityFilterPlacementModifierAccessor",
"ServerListAccessor",
"StructureVoidBlockMixin",
"TexturedRenderLayersMixin",
"ToastManagerMixin",
"VehicleMoveC2SPacketAccessor",
"baritone.MineProcessMixin"
@@ -31,4 +31,4 @@
"injectors": {
"defaultRequire": 1
}
}
}