Fix meteor crash

Author: Meesterbouwer123

src/main/java/com/nxyi/addon/Addon.java

@@ -1,13 +1,11 @@
 package com.nxyi.addon;
 
-import com.nxyi.addon.commands.*;
-import com.nxyi.addon.hud.HudExample;
-import com.nxyi.addon.modules.*;
 import com.mojang.logging.LogUtils;
 import com.nxyi.addon.commands.*;
+import com.nxyi.addon.hud.HudExample;
 import com.nxyi.addon.modules.*;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
-import meteordevelopment.meteorclient.systems.commands.Commands;
+import meteordevelopment.meteorclient.commands.Commands;
 import meteordevelopment.meteorclient.systems.hud.Hud;
 import meteordevelopment.meteorclient.systems.hud.HudGroup;
 import meteordevelopment.meteorclient.systems.modules.Category;
@@ -61,18 +59,18 @@ public void onInitialize() {
 
 
         // Commands
-        Commands.get().add(new CheckCMD());
-        Commands.get().add(new ClearInventoryCommand());
-        Commands.get().add(new CrashItemCommand());
-        Commands.get().add(new CreativeBanCommand());
-        Commands.get().add(new CreativeKickAllCommand());
-        Commands.get().add(new DesyncCommand());
-        Commands.get().add(new DisableVehicleGrav());
-        Commands.get().add(new HologramCommand());
-        Commands.get().add(new ImageBookCommand());
-        Commands.get().add(new ImageLoreCommand());
-        Commands.get().add(new TrashCommand());
-        Commands.get().add(new ReloadCapes());
+        Commands.add(new CheckCMD());
+        Commands.add(new ClearInventoryCommand());
+        Commands.add(new CrashItemCommand());
+        Commands.add(new CreativeBanCommand());
+        Commands.add(new CreativeKickAllCommand());
+        Commands.add(new DesyncCommand());
+        Commands.add(new DisableVehicleGrav());
+        Commands.add(new HologramCommand());
+        Commands.add(new ImageBookCommand());
+        Commands.add(new ImageLoreCommand());
+        Commands.add(new TrashCommand());
+        Commands.add(new ReloadCapes());
 
         // HUD
         Hud.get().register(HudExample.INFO);

src/main/java/com/nxyi/addon/commands/CheckCMD.java

@@ -5,42 +5,43 @@
 
 package com.nxyi.addon.commands;
 
-import com.mojang.brigadier.Message;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import meteordevelopment.meteorclient.MeteorClient;
+import meteordevelopment.meteorclient.commands.Command;
 import meteordevelopment.meteorclient.events.packets.PacketEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
-import meteordevelopment.meteorclient.systems.commands.Command;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.block.entity.CommandBlockBlockEntity;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
-import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.UpdateCommandBlockC2SPacket;
 import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableTextContent;
 
 public class CheckCMD extends Command {
-    private static final SimpleCommandExceptionType ALWAYS_CHECKING = new SimpleCommandExceptionType((Message) Text.of("Already executing Command Check!"));
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
+    private static final SimpleCommandExceptionType ALWAYS_CHECKING = new SimpleCommandExceptionType(Text.of("Already executing Command Check!"));
 
     private int checking = 0;
 
     public CheckCMD() {
-        super("checkcmd", "Checks if commandblocks are active.", new String[0]);
+        super("checkcmd", "Checks if commandblocks are active.");
     }
 
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.executes(context -> {
+            assert mc.player != null;   // impossible, but still
             if (this.checking > 0)
                 throw ALWAYS_CHECKING.create();
             this.checking = 200;
             MeteorClient.EVENT_BUS.subscribe(this);
-            mc.player.networkHandler.sendPacket((Packet<?>) new UpdateCommandBlockC2SPacket(mc.player.getBlockPos(), "", CommandBlockBlockEntity.Type.AUTO, false, false, false));
-            ChatUtils.info("Checking..", new Object[0]);
+            mc.player.networkHandler.sendPacket(new UpdateCommandBlockC2SPacket(mc.player.getBlockPos(), "", CommandBlockBlockEntity.Type.AUTO, false, false, false));
+            ChatUtils.info("Checking..");
             return 1;
         });
     }
@@ -53,11 +54,11 @@ private void onReceivePacket(PacketEvent.Receive event) {
         if (message.getContent() instanceof TranslatableTextContent) {
             String key = ((TranslatableTextContent)message.getContent()).getKey();
             if (key.equals("advMode.notEnabled")) {
-                ChatUtils.info("Command blocks are deactivated", new Object[0]);
+                ChatUtils.info("Command blocks are deactivated");
                 event.cancel();
                 this.checking = 0;
             } else if (key.equals("advMode.notAllowed") || key.equals("advMode.setCommand.success")) {
-                ChatUtils.info("Command blocks are activated", new Object[0]);
+                ChatUtils.info("Command blocks are activated");
                 event.cancel();
                 this.checking = 0;
             }
@@ -67,7 +68,7 @@ private void onReceivePacket(PacketEvent.Receive event) {
     @EventHandler
     private void onTick(TickEvent.Pre event) {
         if (this.checking == 1)
-            ChatUtils.error("Server didnt send a response!", new Object[0]);
+            ChatUtils.error("Server didnt send a response!");
         if (this.checking < 1) {
             this.checking = 0;
             MeteorClient.EVENT_BUS.unsubscribe(this);

src/main/java/com/nxyi/addon/commands/ClearInventoryCommand.java

@@ -6,14 +6,17 @@
 package com.nxyi.addon.commands;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import meteordevelopment.meteorclient.systems.commands.Command;
-import meteordevelopment.meteorclient.systems.config.Config;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.screen.slot.SlotActionType;
 
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class ClearInventoryCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     boolean confirm = false;
     public ClearInventoryCommand() {
         super("clear-inventory", "clear your inventory.");
@@ -22,6 +25,7 @@ public ClearInventoryCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.executes(ctx -> {
+            assert mc.interactionManager != null && mc.player != null;  // impossible, but still
             if(!confirm) {
                 warning("Are you sure that you want to clear your inventory? if yes, use the command again.");
                 confirm = true;

src/main/java/com/nxyi/addon/commands/CrashItemCommand.java

@@ -6,7 +6,8 @@
 package com.nxyi.addon.commands;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import meteordevelopment.meteorclient.systems.commands.Command;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -18,6 +19,9 @@
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class CrashItemCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
 
     public CrashItemCommand() {
         super("crashitem", "Gives you crash items.");
@@ -26,6 +30,7 @@ public CrashItemCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.then(literal("CrashFireball").executes(ctx -> {
+            assert mc.player != null && mc.getNetworkHandler() != null; // impossible, but still
             ItemStack CrashFireball = new ItemStack(Items.CAVE_SPIDER_SPAWN_EGG);
             NbtCompound tag1 = new NbtCompound();
             NbtList power = new NbtList();
@@ -41,6 +46,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
         }));
 
         builder.then(literal("OOBEgg").executes(ctx -> {
+            assert mc.player != null && mc.getNetworkHandler() != null; // impossible, but still
             ItemStack gato = new ItemStack(Items.CAT_SPAWN_EGG);
             NbtCompound tag2 = new NbtCompound();
             NbtList pos = new NbtList();

src/main/java/com/nxyi/addon/commands/CreativeBanCommand.java

@@ -7,8 +7,9 @@
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import meteordevelopment.meteorclient.systems.commands.Command;
-import meteordevelopment.meteorclient.systems.commands.arguments.PlayerListEntryArgumentType;
+import meteordevelopment.meteorclient.commands.Command;
+import meteordevelopment.meteorclient.commands.arguments.PlayerListEntryArgumentType;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.command.CommandSource;
 import net.minecraft.item.ItemStack;
@@ -21,6 +22,9 @@
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class CreativeBanCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     private static final SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(Text.literal("You must be in creative mode to use this."));
 
     public CreativeBanCommand() {
@@ -30,6 +34,7 @@ public CreativeBanCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.then(argument("player", PlayerListEntryArgumentType.create()).executes(ctx -> {
+            assert mc.player != null && mc.interactionManager != null;  // impossible, but still
             ItemStack stack = new ItemStack(Items.ARMOR_STAND);
             PlayerListEntry player = PlayerListEntryArgumentType.get(ctx);
             int[] uuid = decodeUUID(player.getProfile().getId());

src/main/java/com/nxyi/addon/commands/CreativeKickAllCommand.java

@@ -8,7 +8,8 @@
 import com.nxyi.addon.Utils.JinxUtils;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import meteordevelopment.meteorclient.systems.commands.Command;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -19,6 +20,9 @@
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class CreativeKickAllCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     private static final SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(Text.literal("You must be in creative mode to use this."));
 
     public CreativeKickAllCommand() {
@@ -28,6 +32,7 @@ public CreativeKickAllCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.executes(ctx -> {
+            assert mc.player != null && mc.interactionManager != null;  // impossible, but still
             ItemStack stack = JinxUtils.generateItemWithNbt("{title:\"bomb\",author:\"shadowe\",pages:['[{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"},{\"selector\":\"@e\",\"separator\":\"￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿￿\"}]']}", Items.WRITTEN_BOOK);
             if (!mc.player.getAbilities().creativeMode) throw NOT_IN_CREATIVE.create();
             mc.interactionManager.clickCreativeStack(stack, 36 + mc.player.getInventory().selectedSlot);

src/main/java/com/nxyi/addon/commands/DesyncCommand.java

@@ -6,13 +6,17 @@
 package com.nxyi.addon.commands;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import meteordevelopment.meteorclient.systems.commands.Command;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.entity.Entity;
 
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class DesyncCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     private Entity entity = null;
 
     public DesyncCommand() {
@@ -22,6 +26,7 @@ public DesyncCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.executes(context -> {
+            assert mc.player != null && mc.world != null;   // impossible, but still
             if (this.entity == null) {
                 if (mc.player.hasVehicle()) {
                     this.entity = mc.player.getVehicle();

src/main/java/com/nxyi/addon/commands/DisableVehicleGrav.java

@@ -6,23 +6,28 @@
 package com.nxyi.addon.commands;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import meteordevelopment.meteorclient.systems.commands.Command;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
-import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
-import net.minecraft.text.Text;
+
+import java.util.Objects;
 
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class DisableVehicleGrav extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     public DisableVehicleGrav() {
         super("antigrav", "Disables Vehicle Gravity");
     }
 
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.executes(context -> {
+            assert mc.player != null;   // impossible, but still
             if (mc.player.hasVehicle()){
-                mc.player.getVehicle().setNoGravity(true);
+                Objects.requireNonNull(mc.player.getVehicle()).setNoGravity(true);
             } else info("You need to have a vehicle");
             return SINGLE_SUCCESS;
         });

src/main/java/com/nxyi/addon/commands/HologramCommand.java

@@ -8,19 +8,22 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import meteordevelopment.meteorclient.systems.commands.Command;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtDouble;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.text.Text;
-import net.minecraft.util.math.Vec3d;
 
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class HologramCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     private static final SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(Text.literal("You must be in creative mode to use this."));
 
     public HologramCommand() {
@@ -30,6 +33,7 @@ public HologramCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.then(argument("message", StringArgumentType.greedyString()).executes(ctx -> {
+            assert mc.player != null && mc.interactionManager != null;  // impossible, but still
             String message = ctx.getArgument("message", String.class).replace("&", "\247");
             ItemStack stack = new ItemStack(Items.ARMOR_STAND);
             NbtCompound tag = new NbtCompound();
@@ -45,6 +49,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
             return SINGLE_SUCCESS;
         }));
         builder.then(literal("currentPos").then(argument("message", StringArgumentType.greedyString()).executes(ctx -> {
+            assert mc.player != null && mc.interactionManager != null;  // impossible, but still
             String message = ctx.getArgument("message", String.class).replace("&", "\247");
             ItemStack stack = new ItemStack(Items.ARMOR_STAND);
             NbtCompound tag = new NbtCompound();

src/main/java/com/nxyi/addon/commands/ImageBookCommand.java

@@ -8,7 +8,8 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import meteordevelopment.meteorclient.systems.commands.Command;
+import meteordevelopment.meteorclient.commands.Command;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -25,6 +26,9 @@
 import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
 
 public class ImageBookCommand extends Command {
+    // crappy hack to make it compile
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
     private static final SimpleCommandExceptionType NOT_IN_CREATIVE = new SimpleCommandExceptionType(Text.literal("You must be in creative mode to use this."));
     private final String block = "█";
     private BufferedImage imageToBuild;
@@ -36,6 +40,7 @@ public ImageBookCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.then(argument("url", StringArgumentType.greedyString()).executes(ctx -> {
+            assert mc.player != null && mc.interactionManager != null;  // impossible, but still
             ItemStack stack = new ItemStack(Items.WRITTEN_BOOK);
             StringBuilder page = new StringBuilder();
             loadImage(ctx.getArgument("url", String.class));