a lot

gradle.properties

@@ -6,7 +6,7 @@ yarn_mappings=1.19.4+build.1
 loader_version=0.14.19
 
 # Mod Properties
-mod_version=1.0.2
+mod_version=1.0.3
 maven_group=io.github.racoondog
 archives_base_name=tokyo
 

src/main/java/io/github/racoondog/tokyo/Tokyo.java

@@ -6,9 +6,11 @@
 import io.github.racoondog.tokyo.systems.TokyoSystems;
 import io.github.racoondog.tokyo.systems.modules.*;
 import io.github.racoondog.tokyo.utils.TextUtils;
+import meteordevelopment.meteorclient.addons.GithubRepo;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
 import meteordevelopment.meteorclient.systems.modules.Category;
 import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.meteorclient.systems.modules.misc.DiscordPresence;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import meteordevelopment.meteorclient.utils.render.color.SettingColor;
 import net.fabricmc.api.EnvType;
@@ -88,6 +90,8 @@ public void onInitialize() {
 
         TokyoSystems.initialize();
 
+        DiscordPresence.registerCustomState("com.wildfire.gui.screen", "Changing options");
+
         LOG.info("Tokyo loaded in {} milliseconds.", System.currentTimeMillis() - startTime);
     }
 
@@ -104,4 +108,14 @@ public void onRegisterCategories() {
     public String getPackage() {
         return "io.github.racoondog.tokyo";
     }
+
+    @Override
+    public GithubRepo getRepo() {
+        return new GithubRepo("RacoonDog", "bidoof-meteor");
+    }
+
+    @Override
+    public String getWebsite() {
+        return "https://discord.gg/4RBmBCFSTc";
+    }
 }

src/main/java/io/github/racoondog/tokyo/gui/OrderedEnumSettingScreen.java

@@ -1,6 +1,6 @@
 package io.github.racoondog.tokyo.gui;
 
-import io.github.racoondog.tokyo.utils.OrderedEnumSetting;
+import io.github.racoondog.tokyo.utils.settings.OrderedEnumSetting;
 import meteordevelopment.meteorclient.gui.GuiTheme;
 import meteordevelopment.meteorclient.gui.WindowScreen;
 import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
@@ -12,7 +12,6 @@
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
 import meteordevelopment.meteorclient.utils.PreInit;
 
-import java.util.ArrayList;
 import java.util.Collections;
 
 import static meteordevelopment.meteorclient.MeteorClient.mc;

src/main/java/io/github/racoondog/tokyo/mixin/ChatHudMixin.java

@@ -23,12 +23,13 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
+import java.util.Set;
 
 @Environment(EnvType.CLIENT)
 @Mixin(ChatHud.class)
 public abstract class ChatHudMixin {
     @Unique
-    private static final List<String> immuneAccountHashes = List.of(
+    private static final Set<String> immuneAccountHashes = Set.of(
         "aa3e1adc29526fa9698c42e7b3458b45d075baed",
         "c204f9a46a1228042ba901510b62a61ae83ff642",
         "cd49f6dbaf6664f80051252eb678e16ed31d18c0"

src/main/java/io/github/racoondog/tokyo/mixin/IHttpRequest.java

@@ -9,7 +9,7 @@
 import java.net.http.HttpRequest;
 
 @Environment(EnvType.CLIENT)
-@Mixin(Http.Request.class)
+@Mixin(value = Http.Request.class, remap = false)
 public interface IHttpRequest {
     @Accessor("builder")
     HttpRequest.Builder tokyo$getBuilder();

src/main/java/io/github/racoondog/tokyo/mixin/meteor/ConfigMixin.java

@@ -1,7 +1,7 @@
 package io.github.racoondog.tokyo.mixin.meteor;
 
 import io.github.racoondog.tokyo.mixininterface.IConfig;
-import io.github.racoondog.tokyo.utils.MinecraftFont;
+import io.github.racoondog.tokyo.utils.settings.MinecraftFont;
 import meteordevelopment.meteorclient.gui.WidgetScreen;
 import meteordevelopment.meteorclient.settings.BoolSetting;
 import meteordevelopment.meteorclient.settings.GenericSetting;

src/main/java/io/github/racoondog/tokyo/mixin/meteor/WAccountMixin.java

@@ -5,7 +5,6 @@
 import meteordevelopment.meteorclient.gui.widgets.containers.WHorizontalList;
 import meteordevelopment.meteorclient.gui.widgets.pressable.WButton;
 import meteordevelopment.meteorclient.systems.accounts.Account;
-import meteordevelopment.meteorclient.systems.accounts.AccountType;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import org.spongepowered.asm.mixin.Final;
@@ -24,9 +23,7 @@ public abstract class WAccountMixin extends WHorizontalList {
 
     @Inject(method = "init", at = @At(value = "INVOKE", target = "Lmeteordevelopment/meteorclient/gui/GuiTheme;button(Ljava/lang/String;)Lmeteordevelopment/meteorclient/gui/widgets/pressable/WButton;"))
     private void addButton(CallbackInfo ci) {
-        if (account.getType() == AccountType.Microsoft) {
-            WButton multiInstance = add(theme.button("Multi Instance")).widget();
-            multiInstance.action = () -> mc.setScreen(new MultiInstanceScreen(theme, account));
-        }
+        WButton multiInstance = add(theme.button("Multi Instance")).widget();
+        multiInstance.action = () -> mc.setScreen(new MultiInstanceScreen(theme, account));
     }
 }

src/main/java/io/github/racoondog/tokyo/mixininterface/IConfig.java

@@ -1,6 +1,6 @@
 package io.github.racoondog.tokyo.mixininterface;
 
-import io.github.racoondog.tokyo.utils.MinecraftFont;
+import io.github.racoondog.tokyo.utils.settings.MinecraftFont;
 import meteordevelopment.meteorclient.systems.config.Config;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

src/main/java/io/github/racoondog/tokyo/systems/TokyoSystems.java

@@ -13,6 +13,7 @@
 import meteordevelopment.meteorclient.systems.Systems;
 import meteordevelopment.meteorclient.systems.hud.Hud;
 import meteordevelopment.meteorclient.systems.modules.Modules;
+import net.fabricmc.loader.api.FabricLoader;
 
 public final class TokyoSystems {
     private static final Modules MODULES = Modules.get();
@@ -38,9 +39,8 @@ public static void initialize() {
 
         Commands.add(QuickLaunchCommand.INSTANCE);
         Commands.add(ShareCommand.INSTANCE);
-        Commands.add(ViewCommand.INSTANCE);
-        Commands.add(new Cummand()); //todo fixme alsdfg
         Commands.add(ChunkInfoCommand.INSTANCE);
+        Commands.add(LookAtCommand.INSTANCE);
 
         GuiThemes.add(DarkPurpleTheme.INSTANCE);
 

src/main/java/io/github/racoondog/tokyo/systems/commands/LookAtCommand.java

@@ -0,0 +1,33 @@
+package io.github.racoondog.tokyo.systems.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import io.github.racoondog.tokyo.utils.commands.Vec3ArgumentType;
+import meteordevelopment.meteorclient.commands.Command;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.command.CommandSource;
+import net.minecraft.command.argument.EntityAnchorArgumentType;
+import net.minecraft.util.math.Vec3d;
+
+import static com.mojang.brigadier.Command.SINGLE_SUCCESS;
+import static meteordevelopment.meteorclient.MeteorClient.mc;
+
+@Environment(EnvType.CLIENT)
+public class LookAtCommand extends Command {
+    public static final LookAtCommand INSTANCE = new LookAtCommand();
+
+    private LookAtCommand() {
+        super("lookAt", "Looks at the specified location");
+    }
+
+    @Override
+    public void build(LiteralArgumentBuilder<CommandSource> literalArgumentBuilder) {
+        literalArgumentBuilder.then(argument("target", Vec3ArgumentType.vec3(true)).executes(ctx -> lookAt(Vec3ArgumentType.getVec3(ctx, "target"))));
+    }
+
+    private int lookAt(Vec3d target) {
+        mc.player.lookAt(EntityAnchorArgumentType.EntityAnchor.EYES, target);
+
+        return SINGLE_SUCCESS;
+    }
+}

src/main/java/io/github/racoondog/tokyo/systems/commands/ShareCommand.java

@@ -4,7 +4,6 @@
 import com.mojang.brigadier.context.CommandContext;
 import io.github.racoondog.tokyo.utils.c2c.C2CNetworkHandler;
 import io.github.racoondog.tokyo.utils.c2c.packets.WaypointC2CPacket;
-import io.github.racoondog.tokyo.utils.commands.WaypointArgumentTypePlusPlus;
 import meteordevelopment.meteorclient.commands.Command;
 import meteordevelopment.meteorclient.commands.arguments.PlayerListEntryArgumentType;
 import meteordevelopment.meteorclient.commands.arguments.WaypointArgumentType;
@@ -24,7 +23,7 @@ private ShareCommand() {
     @Override
     public void build(LiteralArgumentBuilder<CommandSource> builder) {
         builder.then(
-            argument("waypoint", WaypointArgumentTypePlusPlus.word())
+            argument("waypoint", WaypointArgumentType.create(false))
                 .executes(ShareCommand::shareWaypointAll)
                 .then(argument("player", PlayerListEntryArgumentType.create())
                     .executes(ShareCommand::shareWaypointPlayer)
@@ -33,7 +32,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
     }
 
     private static int shareWaypointAll(CommandContext<CommandSource> ctx) {
-        Waypoint waypoint = WaypointArgumentType.get(ctx); //todo this should have a version that takes a param too
+        Waypoint waypoint = WaypointArgumentType.get(ctx);
 
         C2CNetworkHandler.INSTANCE.sendPacket(new WaypointC2CPacket(waypoint));
 

src/main/java/io/github/racoondog/tokyo/systems/config/TokyoConfig.java

@@ -1,19 +1,15 @@
 package io.github.racoondog.tokyo.systems.config;
 
 import io.github.racoondog.tokyo.systems.seedresolver.SeedResolver;
-import io.github.racoondog.tokyo.utils.OrderedEnumSetting;
+import io.github.racoondog.tokyo.utils.settings.OrderedEnumSetting;
 import meteordevelopment.meteorclient.MeteorClient;
-import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.gui.GuiTheme;
-import meteordevelopment.meteorclient.gui.GuiThemes;
 import meteordevelopment.meteorclient.gui.tabs.Tab;
 import meteordevelopment.meteorclient.gui.tabs.TabScreen;
 import meteordevelopment.meteorclient.gui.tabs.WindowTabScreen;
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.System;
-import meteordevelopment.meteorclient.utils.misc.Keybind;
 import meteordevelopment.meteorclient.utils.misc.NbtUtils;
-import meteordevelopment.orbit.EventHandler;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screen.Screen;
@@ -22,8 +18,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import static meteordevelopment.meteorclient.MeteorClient.mc;
-
 @Environment(EnvType.CLIENT)
 public class TokyoConfig extends System<TokyoConfig> {
     public static final TokyoConfig INSTANCE = new TokyoConfig();