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

1.19-pre1

Browse Source
This commit is contained in:
gnembon committed 2022-05-18 21:08:32 +02:00
1 parent bbe770184e
commit 2af763d029
3 files changed
+9 -13
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=22w19a minecraft_version=1.19-pre1
loader_version=0.13.3 loader_version=0.13.3
fabric_version=0.49.4+1.19 fabric_version=0.49.4+1.19
src/main/java/carpet/mixins/ServerGamePacketListenerImpl_scarpetEventsMixin.java
+5 -10
View File
@@ -1,10 +1,7 @@
package carpet.mixins; package carpet.mixins;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MessageSignature;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.network.protocol.game.ServerboundChatPacket; import net.minecraft.network.protocol.game.ServerboundChatPacket;
import net.minecraft.server.network.TextFilter; import net.minecraft.server.network.FilteredText;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@@ -48,7 +45,6 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
@Mixin(ServerGamePacketListenerImpl.class) @Mixin(ServerGamePacketListenerImpl.class)
@@ -286,14 +282,13 @@ public class ServerGamePacketListenerImpl_scarpetEventsMixin
} }
} }
@Inject(method = "handleChat(Lnet/minecraft/network/protocol/game/ServerboundChatPacket;Lnet/minecraft/server/network/TextFilter$FilteredText;)V", @Inject(method = "handleChat(Lnet/minecraft/network/protocol/game/ServerboundChatPacket;Lnet/minecraft/server/network/FilteredText;)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;broadcastChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/server/network/TextFilter$FilteredText;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/resources/ResourceKey;)V"), at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/game/ServerboundChatPacket;signedPreview()Z")
locals = LocalCapture.CAPTURE_FAILHARD
) )
private void onChatMessage(ServerboundChatPacket serverboundChatPacket, TextFilter.FilteredText filteredText, CallbackInfo ci, Component component, MessageSignature messageSignature, PlayerChatMessage playerChatMessage) { private void onChatMessage(ServerboundChatPacket serverboundChatPacket, FilteredText<String> filteredText, CallbackInfo ci) {
if (PLAYER_MESSAGE.isNeeded()) if (PLAYER_MESSAGE.isNeeded())
{ {
PLAYER_MESSAGE.onPlayerMessage(player, filteredText.getRaw()); PLAYER_MESSAGE.onPlayerMessage(player, filteredText.raw());
} }
} }
} }
src/main/java/carpet/patches/EntityPlayerMPFake.java
+3 -2
View File
@@ -16,6 +16,7 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.players.GameProfileCache; import net.minecraft.server.players.GameProfileCache;
import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.player.ProfilePublicKey; import net.minecraft.world.entity.player.ProfilePublicKey;
import net.minecraft.world.food.FoodData; import net.minecraft.world.food.FoodData;
@@ -108,9 +109,9 @@ public class EntityPlayerMPFake extends ServerPlayer
} }
@Override @Override
protected void equipEventAndSound(ItemStack stack, boolean sendGameEvent) public void onEquipItem(final EquipmentSlot slot, final ItemStack stack)
{ {
if (!isUsingItem()) super.equipEventAndSound(stack, sendGameEvent); if (!isUsingItem()) super.onEquipItem(slot, stack);
} }
@Override @Override