icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.19.1-pre2

Browse Source
This commit is contained in:
gnembon committed 2022-07-05 10:21:26 +02:00
1 parent 6019f812d3
commit 0a00734f65
2 files changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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