From 77827c30c18f11f9ffbb521b2af6042e3f830958 Mon Sep 17 00:00:00 2001 From: astatin3 Date: Thu, 25 Jul 2024 15:39:00 -0600 Subject: [PATCH] Some updates I forgot to push --- .gradle/8.8/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/8.8/checksums/md5-checksums.bin | Bin 25797 -> 25797 bytes .gradle/8.8/checksums/sha1-checksums.bin | Bin 44201 -> 44201 bytes .../8.8/executionHistory/executionHistory.bin | Bin 836711 -> 836711 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.8/fileHashes/fileHashes.bin | Bin 28847 -> 29147 bytes .gradle/8.8/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.8/fileHashes/resourceHashesCache.bin | Bin 24209 -> 24311 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 20477 -> 20549 bytes .gradle/file-system.probe | Bin 8 -> 8 bytes .idea/runConfigurations/Minecraft_Server.xml | 2 +- README.md | 2 ++ build.gradle | 3 ++- gradle.properties | 2 +- .../client/BaritoneCommandsAccessor.java | 12 ++++++++++++ .../mixin/client/HeadlessMinecraftClient.java | 18 ++++++++++++++++-- 17 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 src/client/java/com/astatin3/nomorerender/mixin/client/BaritoneCommandsAccessor.java diff --git a/.gradle/8.8/checksums/checksums.lock b/.gradle/8.8/checksums/checksums.lock index f26bc97196d7fd0b30eacac70d1e123693ef41d1..67456e737875b969e775f42279847e059617f3eb 100644 GIT binary patch literal 17 VcmZR+a;!=`ZUc`Y0~jz10st>H1C9Uy literal 17 VcmZR+a;!=`ZUc`Y0~jzf0{|~41AqVk diff --git a/.gradle/8.8/checksums/md5-checksums.bin b/.gradle/8.8/checksums/md5-checksums.bin index 92c1a3d832c284ab7267f33054ac2d1106b5f014..0c096f03b34072915d45b6e0af5e6b8f08ab5fc3 100644 GIT binary patch delta 55 zcmX?llJV$C#tq3HEc1^()tH>_p$BBVE}A?O%y^r%`LsuyG|OH2gPSLZrsx3~N4`vM HPq704<}w;i delta 55 zcmX?llJV$C#tq3HEQ|8KrcX}y&;v4lpPxJv%=o*0^J$MZX_nhpK0KWqnxY3}eCeCq Ho?-_8`=T54 diff --git a/.gradle/8.8/checksums/sha1-checksums.bin b/.gradle/8.8/checksums/sha1-checksums.bin index 507c4711c71da83dec7aaf77f725eb86d8787abb..fb840055591e4b0c36c6113d33c920dd2da7a329 100644 GIT binary patch delta 57 zcmZ2^lWFBmrVW=pCeQVdoBYwEWwO1e+~kv<5|dYZngOxg=Kr1wi7a>J4{n~UyxIuJ MIPzt43_xZ_{o*6*K-}RH%drEEo@2QZ;a{J1M Tr<0Xe8vz+#`Zh+ z+%0^#TbPoD6ro=#XDBp28{<_3~QCBFxAiY1dV2U;!teDW~nMpw?U?jk|!vY>J8r7#6+1i&Ra^RWAoHxZULhm z&MUFEsm!CBARsjy+X_oM(OMjt2r6ZmJ1G1UwTFE&6v1KDE3}`E)BwO|U?!Rm7=PkqgyIrBoH66U*h1I-Od}lgCJPI*bG==bHIj>#d%R3F`|KP4GwR zz&#IQisR^Ypt29mu)+*;Ez4B8$Lp4szG$zONU1lVYG(nF2SLJv{b&ttIcYsRLK5=m z<6oDob&&Yo%ef5rn@}&H3Pa7{DIDuTrU_?8MCy6bQZ0?NbGTk`ttT(-$B7(6>6`%b z#=f3&xq^cY2#!z;UIdo;s1&Y<$Haj!a5*{+g?b5gjV@xljK*!sGTR?CLPgG)Ib{Fr zJy$2=p{5k-^)j|R4>KIRwSHL;#3sT z*SagPsw%!=h>9t;?<)gac|@w!X^lAl?3v%5U(b$o@!n}zkJJnkm94YO zOlR|#y3x(@>{kSb6oa7UC=Yaop-fm4jU7dJ!kIetW-X=a5Q)C8R)vbseVf$RPwSFY zi@x5s<0VBRSUJEU+hZ1}^gwLE-A&kdkQswIWfUthDsU?3RG3j=4vUqHB0@CEycWdY z)Zgg*uGjU_iQa7qULm(|awJ4M1H_LI4!EyI-9e@rZ3IjwRuU8>Gde#ZS3gZIZ$;%z zcYe2S{w(Q=59D8E+(oUxLV3{Tvvy?Y41fnifQ%M~R@HUzB`nc?=s6Ni~h99Zti^k)ty4Bk!{zBNfdz-7ulU^~cjV)~+7 z;gFCVxN&i?-}LOnxmUBB*;ihl+c_ZQ@fMin!W6z9O`hVzp7Mr(#v7$6hvt`@uQ5Q3 z90}1b4#^YFWjW>>7L(AA%d!YCPN+wmfYZ?a3S%;6Yz4M_Dw0^iiK z*ssNL1*0t}e(mfiWB)$GSdL%&nzYQlKhepNP<}-N_d;W>KMpU{Sr|f0=lb1$0kCw( zPeE%ZBF~)M|Ffk0(&^B`CP{+IcM>Rvdp+>UW+?ssJGR|;pyUxYz?VlX{BPT^thv}_ z>LO82{i<}Ev@r#r|GRD2JGPnef?bxv&aqpjpn1#w-iDB}lQx7Lxd_1uJ!1-3$tSe* zhi@pK0QG!gY0$HQOF;!jOIIoq6e?PVJVp_zibIaPZxIjqAkD-Fy9OJ*M1iq_aGo&I z>Ao6trnE%lFmO^}9FQy^IEesVl*-+ zBu4#w+MZn4ddIFiNpD3#;eOEA{ZY}DtimNNZT1UXDd=QgvfSRO+ovf+7HSP6xD@m# z-I$cTT6of@E8$k7*^D*{3KMt9{umcx?718(xGna)O+ka6Yw-`$1;$E(13ncJdRu{L zet>3HhNq2}o}qUQ?HHs^(2N597Gx^4@FcVdH}ip!xmOgJ*I}8uC-t#QW98t--u%L1 Tz(V4V0p|{8HB|Z#y;*+&a7@iz delta 2021 zcmcgtYfw{16wZBwBsW*MiL}HAL8^#`N5TydwG3djg+hh;iWC)01c5vVCK6Clp!Es( z09scDZLPLrrzl0mEJ3yo>}1R zcMVy(ICnO*>QQ;_e3v>F%cZV#!y1JyJu`5%!k8GS)@7;^leL<4CLL`|p>8i}@2&W0 zWm#Oe$48tw)j=XV1mwnHo8Xx~)QTgMfklmZffX4XBd)#2~bMnm?PwyssrX9HXZYRsHuUgv{(n? zL;IKv>BiNGreVU05{d7G=&&2AZ_$~qZQ}AH=k7CvOQQz)IxYvDdMpO%02Uu45HxqA zTwvf}0wA*yPGZl!+WOXehVq!t`V-`Sv)p%EtUu?|#Sw!ion*jIhed6#(ql~EOt6`7 zV1fgy^xR4^^d(OesW(?P?aD4%zKFhj>1p4=S_f(@#3~1K?;$Rr%Yb@Ol41@3;hWC)p0veVR%nl^7fm5%BJQe`F6-d4ail1w6j+L zN=&YWJq_IED7%wjm5#6p>|pr)1!5{njV%bSyYk{DjWiQx*GwQ<%nRdWo5;$NboSw}!<-N>pmBs3;*s`|_J?9Dwi(*#t``FZ2sQBV{Zl@ZpVK_Wx z<2Nm{@9Y2m1wi15e+|b^A@_2q<84Q`bzSjXCz>>Htzu#l4;D&s4+j+Q8f{*VK<`Vw z210zvc|a*8vxGPCsFl9-nLAIVR;l1DdfLv*0OMsF;Sm`biP#w$c;C#O0jATWk=RoZ|_ zVDI+`%}Wn1nL$NeH~*Dgz$kF<*p-HvF5z1tq6H5(PnG}3#Glf1QeSRGF;sB<=2|5I zc7eqBOOcm;C!K*BAiTL%Q;CU5gma_f5Alr#0xX*yJ&v)le3LrIJ(=5I56C$CYVtyV zsmbB~ZeY&lh5ijPAbFw5wi!~B?Q=v}zR7O*GnpI6=}#B21Ia+lX1orh^^AdpCJ-xv zu)x{^$I0v0J^Fm1H&w~3`FsKc1LFjQ4wHYAZ)d0h&D-~G^4lCK1?KZsg8TA{U&VXv z{rco^L?T$V?0y-bQ9xkRGI=FTbzm;gsUU6nKxfEjiqr!+&mqd#wg71~XBauy`W6_p zn~0j0ag-@XzJ(YJ)4>>wsiXVZ1I~#KeiPmbHg+|>QaT59iX+$#rjsFPIwl+BiGu=3 zbn?SIP#^*swJ^qd2!j&#uz8Q zQ(;TWziX|2hYpnkBNZH+qF`4sF#4mp3K#*?^AwNR)}9o4#~by}&q2x^>hq6K9p#uh zBxNqlIQ?xx%SKu8^LvFYec7R2_k(CjlbY-pAuRtRG}3XyqN;!Y89qiFc9;iIb5I1L zMpJz9#~9(z?HL}yF5117RwsHd^B?~MRkH!2CTkg{)vG=+_ealHTed}JVeii4mf{c{ Nht5NE=wyR*006G?57+#tkMCjORC-N~~nw%qOGHwAoi~2IJTESnuYj_vnbX1v6)ORvYep`I{8#e<3bal>hfeNImQqOkxRzI= z=Dm%giYlM6qW?jtq>uNr4$4 jDIgStyDE@J diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index bcd735e21c64e0d95dc492f6ad2bf30a7604e8d2..32c2d0b45cbd73dbb91c4183e310a810181b6a68 100644 GIT binary patch literal 17 VcmZQxx?g0E*Oubx3}C<-1^_k61e*W= literal 17 VcmZQxx?g0E*Oubx3}C=21pqaU1YZCE diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index 605006a0c58117b9d35242f79f2fee5f33798958..43d94153da73a346b6666119af2161a0616d4c0d 100644 GIT binary patch delta 198 zcmbQZm+|{v#tkMCjH?%$N^lBD=N`#femHL$0~o|j+^nm}!7SjqqLAgeiop}8=+()( zDi#7>|5^EW94rul3U1yUtFnlhNkDR=;t%nK1{|9mJp#nijDfO}Kr9Ht0{brSP||dB z=sOwOCfdR~qZ247hpOTi-(`-k{QDaC`y_ob8O)L}Rh+oL=SYxYS)CKpJLbN*Tb6@V F004kfG++P# delta 44 zcmV+{0Mq~Xy#bNE0kAX}0jQ%j7zv|IAp?_TBrvnBB$@*P57Dt9_!qG-NC>k*NKh7Z C$q%{! diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d3eeba171320e2f46d5b8cb57d80d8c0e48bc8cf..b9be2202d93d6524524d39602de883b5b4158c07 100644 GIT binary patch literal 17 VcmZSnn-VR4AVS delta 49 zcmV-10M7r#paK1#0kAX}0dBK382JH{Mj98BbsCVf9UFKCv#lXR0RdsLA@~=uFt`n~ HK}fs@(<%}> diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index c8183455565e0a897cbcfbc6bd47149cee7ef9a0..fa3a55dd164cc7884651f56a6c1c714698425a9a 100644 GIT binary patch literal 8 PcmZQzV4Uzxwxj_72z3IP literal 8 PcmZQzV4QG=@zW&$2?ql+ 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();