diff --git a/gradle.properties b/gradle.properties index c61c880e..02081947 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=22w24a + minecraft_version=1.19.1-pre2 loader_version=0.14.8 fabric_version=0.56.0+1.19 diff --git a/src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java b/src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java index 16d7fa43..446fb81e 100644 --- a/src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java +++ b/src/main/java/carpet/mixins/LocalPlayer_clientCommandMixin.java @@ -4,6 +4,7 @@ import carpet.CarpetServer; import carpet.network.CarpetClient; import carpet.api.settings.SettingsManager; import net.minecraft.client.player.LocalPlayer; +import net.minecraft.network.chat.Component; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -12,21 +13,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(LocalPlayer.class) public class LocalPlayer_clientCommandMixin { - @Inject(method = "chat", at = @At("HEAD")) - private void inspectMessage(String string, CallbackInfo ci) + @Inject(method = "commandSigned", at = @At("HEAD")) + private void inspectMessage(String string, Component component, CallbackInfo ci) { - if (string.startsWith("/call ")) + if (string.startsWith("call ")) { - String command = string.substring(6); + String command = string.substring(5); CarpetClient.sendClientCommand(command); } if (CarpetServer.minecraft_server == null && !CarpetClient.isCarpet()) { LocalPlayer playerSource = (LocalPlayer)(Object) this; - CarpetServer.settingsManager.inspectClientsideCommand(playerSource.createCommandSourceStack(), string); + CarpetServer.settingsManager.inspectClientsideCommand(playerSource.createCommandSourceStack(), "/"+string); CarpetServer.extensions.forEach(e -> { SettingsManager sm = e.extensionSettingsManager(); - if (sm != null) sm.inspectClientsideCommand(playerSource.createCommandSourceStack(), string); + if (sm != null) sm.inspectClientsideCommand(playerSource.createCommandSourceStack(), "/"+string); }); } }