diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock index f26bc97..67456e7 100644 Binary files a/.gradle/8.8/checksums/checksums.lock and b/.gradle/8.8/checksums/checksums.lock differ diff --git a/.gradle/8.8/checksums/md5-checksums.bin b/.gradle/8.8/checksums/md5-checksums.bin index 92c1a3d..0c096f0 100644 Binary files a/.gradle/8.8/checksums/md5-checksums.bin and b/.gradle/8.8/checksums/md5-checksums.bin differ diff --git a/.gradle/8.8/checksums/sha1-checksums.bin b/.gradle/8.8/checksums/sha1-checksums.bin index 507c471..fb84005 100644 Binary files a/.gradle/8.8/checksums/sha1-checksums.bin and b/.gradle/8.8/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index 15f4474..75a9e28 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.bin and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock index c36b336..5afbd49 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.lock and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin index 32b4198..f4b2a8a 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.bin and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index bcd735e..32c2d0b 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.lock and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index 605006a..43d9415 100644 Binary files a/.gradle/8.8/fileHashes/resourceHashesCache.bin and b/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d3eeba1..b9be220 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 8ce8d70..c3866bd 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index c818345..fa3a55d 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/runConfigurations/Minecraft_Server.xml b/.idea/runConfigurations/Minecraft_Server.xml index e305f57..5444414 100644 --- a/.idea/runConfigurations/Minecraft_Server.xml +++ b/.idea/runConfigurations/Minecraft_Server.xml @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index f417bd2..da95fda 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ keydown - Press a key keyup - Release a key connect :[Port] - Forcibly connect to a server +chat - Send chat message (Can run meteor and baritone chat commands) +cmd - Send command (Don't include first "/") quit/exit - Close the game ``` diff --git a/build.gradle b/build.gradle index 6718cdc..a6c3373 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,8 @@ repositories { // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. +// mavenCentral() +// maven { url 'https://jitpack.io' } } loom { @@ -38,7 +40,6 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. // modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - } processResources { diff --git a/gradle.properties b/gradle.properties index bd037a6..f1446c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21+build.2 loader_version=0.15.11 # Mod Properties -mod_version=1.0.2 +mod_version=1.0.3 maven_group=com.astatin3 archives_base_name=nomorerender diff --git a/src/client/java/com/astatin3/nomorerender/mixin/client/BaritoneCommandsAccessor.java b/src/client/java/com/astatin3/nomorerender/mixin/client/BaritoneCommandsAccessor.java new file mode 100644 index 0000000..8cb177e --- /dev/null +++ b/src/client/java/com/astatin3/nomorerender/mixin/client/BaritoneCommandsAccessor.java @@ -0,0 +1,12 @@ +package com.astatin3.nomorerender.mixin.client; + +import org.spongepowered.asm.mixin.Mixin; +//import baritone +//import bar.Baritone; +//import com.jcraft.jogg. +import org.spongepowered.asm.mixin.gen.Accessor; + +//@Mixin(.command.class) +public class BaritoneCommandsAccessor { +// @Accessor("manager") ICommandManager getCmdManager(); +} diff --git a/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java index 980fa49..25b8d65 100644 --- a/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java +++ b/src/client/java/com/astatin3/nomorerender/mixin/client/HeadlessMinecraftClient.java @@ -4,7 +4,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.RunArgs; import net.minecraft.client.gl.WindowFramebuffer; -import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.gui.screen.ChatScreen; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.multiplayer.ConnectScreen; @@ -47,6 +48,9 @@ public class HeadlessMinecraftClient { @Shadow private Thread thread; + @Shadow + @Final + public InGameHud inGameHud; @Unique final MinecraftClient self = (MinecraftClient)(Object)this; @Inject(method = "", at = @At("TAIL")) @@ -81,6 +85,8 @@ public class HeadlessMinecraftClient { } } + System.out.println("(no-more-render) Started!"); + while (true) { Socket socket = serverSocket.accept(); @@ -167,8 +173,16 @@ public class HeadlessMinecraftClient { connect_to_serv(new ServerAddress(split[1], port)); } break; + case "chat": + assert self.player != null; + self.player.networkHandler.sendChatMessage(command.substring(5)); + break; + case "cmd": + assert self.player != null; + self.player.networkHandler.sendCommand(command.substring(4)); + break; default: - writer.println("Unknown command: " + command); + writer.println("Unknown command: " + split[0]); } }catch(Exception e){ e.printStackTrace();