Version 1.3.3 [1.20.2] (Fixed #12)

mt1006 · mt1006 · commit 192cc375d27a · 2023-10-01T13:23:05.000+02:00
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+===Version 1.3.3===
+-Fixed a compatibility issue with JourneyMap (issue reported by seriousfreezing).
+
 ===Version 1.3.2===
 -Placing fire with flint and steel is now recorded on Fabric (issue reported by Libreh).
 -Fixed issue with skin top layers when playing multiple players on version 1.19.2 and older (reported by fogartyfox_gamer).
diff --git a/README.md b/README.md
@@ -13,6 +13,8 @@ After you save recording, you can create a scene, to which you can add multiple
 
 CurseForge page: https://www.curseforge.com/minecraft/mc-mods/motion-capture-mod-mocap
 
+Modrinth page: https://modrinth.com/mod/motion-capture
+
 # How to use
 
 - First, you need to start recording using ```/mocap recording start```. It will record all your movements or movements of a player given as an argument. 
diff --git a/gradle.properties b/gradle.properties
@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.20.1
-forge_version=47.1.0
+minecraft_version=1.20.2
+forge_version=48.0.13
 
-minecraft_version_range=[1.20,1.20.2)
-forge_version_range=[46,)
-loader_version_range=[46,)
+minecraft_version_range=[1.20.2,1.20.3)
+forge_version_range=[48,)
+loader_version_range=[48,)
 
 mapping_channel=official
-mapping_version=1.20.1
+mapping_version=1.20.2
 
 
 ## Mod Properties
 mod_id=mocap
-mod_version=1.3.2
+mod_version=1.3.3
 
 mod_group_id=com.mt1006.mocap
 mod_jar_name=Mocap
diff --git a/src/main/java/com/mt1006/mocap/MocapMod.java b/src/main/java/com/mt1006/mocap/MocapMod.java
@@ -15,9 +15,10 @@
 @Mod.EventBusSubscriber(modid = MocapMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class MocapMod
 {
+	//TODO: add translation key for copying scene
 	public static final String MOD_ID = "mocap";
-	public static final String VERSION = "1.3.2";
-	public static final String FOR_VERSION = "1.20.1";
+	public static final String VERSION = "1.3.3";
+	public static final String FOR_VERSION = "1.20.2";
 	public static final String FOR_LOADER = "Forge";
 	public static final Logger LOGGER = LogManager.getLogger();
 	public static final boolean isDedicatedServer = FMLEnvironment.dist.isDedicatedServer();
diff --git a/src/main/java/com/mt1006/mocap/mixin/AbstractClientPlayerMixin.java b/src/main/java/com/mt1006/mocap/mixin/AbstractClientPlayerMixin.java
@@ -1,11 +1,11 @@
 package com.mt1006.mocap.mixin;
 
 import com.mojang.authlib.properties.Property;
-import com.mt1006.mocap.mixin.fields.PlayerInfoMixin;
 import com.mt1006.mocap.mocap.playing.CustomClientSkinManager;
 import com.mt1006.mocap.mocap.playing.CustomSkinManager;
 import net.minecraft.client.multiplayer.PlayerInfo;
 import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.resources.PlayerSkin;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -21,20 +21,24 @@ abstract public class AbstractClientPlayerMixin
 {
 	@Shadow protected abstract @Nullable PlayerInfo getPlayerInfo();
 
-	@Inject(method = "getSkinTextureLocation", at = @At(value = "HEAD"), cancellable = true)
-	private void atGetSkinTextureLocation(CallbackInfoReturnable<ResourceLocation> cir)
+	@Inject(method = "getSkin", at = @At(value = "HEAD"), cancellable = true)
+	private void atGetSkinTextureLocation(CallbackInfoReturnable<PlayerSkin> cir)
 	{
 		PlayerInfo playerInfo = getPlayerInfo();
 		if (playerInfo == null) { return; }
 
 		Collection<Property> properties = playerInfo.getProfile().getProperties().get(CustomSkinManager.PROPERTY_ID);
-		if (properties.size() < 1) { return; }
+		if (properties.isEmpty()) { return; }
 
-		ResourceLocation res = CustomClientSkinManager.get(properties.iterator().next().getValue());
+		ResourceLocation res = CustomClientSkinManager.get(properties.iterator().next().value());
 		if (res == null) { return; }
 
-		((PlayerInfoMixin)playerInfo).setSkinModel(CustomClientSkinManager.isSlimSkin(res) ? "slim" : "default");
-		cir.setReturnValue(res);
+		PlayerSkin playerSkin = playerInfo.getSkin();
+
+		cir.setReturnValue(new PlayerSkin(res,
+				playerSkin.textureUrl(), playerSkin.capeTexture(), playerSkin.elytraTexture(),
+				CustomClientSkinManager.isSlimSkin(res) ? PlayerSkin.Model.SLIM : PlayerSkin.Model.WIDE,
+				playerSkin.secure()));
 		cir.cancel();
 	}
 }
diff --git a/src/main/java/com/mt1006/mocap/mixin/SkinManagerMixin.java b/src/main/java/com/mt1006/mocap/mixin/SkinManagerMixin.java
diff --git a/src/main/java/com/mt1006/mocap/mixin/fields/PlayerInfoMixin.java b/src/main/java/com/mt1006/mocap/mixin/fields/PlayerInfoMixin.java
diff --git a/src/main/java/com/mt1006/mocap/mocap/playing/PlayedScene.java b/src/main/java/com/mt1006/mocap/mocap/playing/PlayedScene.java
@@ -14,7 +14,7 @@
 import com.mt1006.mocap.utils.Fields;
 import com.mt1006.mocap.utils.ProfileUtils;
 import net.minecraft.core.Vec3i;
-import net.minecraft.network.protocol.game.ClientboundAddPlayerPacket;
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
@@ -162,7 +162,7 @@ private boolean startPlayingRecording(CommandInfo commandInfo, DataManager data)
 			recording.preExecute(fakePlayer, blockOffset);
 
 			packetTargets.broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, fakePlayer));
-			packetTargets.broadcastAll(new ClientboundAddPlayerPacket(fakePlayer));
+			packetTargets.broadcastAll(new ClientboundAddEntityPacket(fakePlayer));
 
 			level.addNewPlayer(fakePlayer);
 
diff --git a/src/main/java/com/mt1006/mocap/network/MocapPacketC2S.java b/src/main/java/com/mt1006/mocap/network/MocapPacketC2S.java
@@ -5,7 +5,7 @@
 import com.mt1006.mocap.mocap.playing.CustomSkinManager;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.event.network.CustomPayloadEvent;
 import net.minecraftforge.network.PacketDistributor;
 
 import java.util.function.Supplier;
@@ -53,10 +53,10 @@ public void encode(FriendlyByteBuf buf)
 		}
 	}
 
-	public void handle(Supplier<NetworkEvent.Context> ctx)
+	public void handle(CustomPayloadEvent.Context ctx)
 	{
 		if (version != MocapPackets.CURRENT_VERSION) { return; }
-		ServerPlayer sender = ctx.get().getSender();
+		ServerPlayer sender = ctx.getSender();
 
 		switch (op)
 		{
@@ -84,13 +84,13 @@ public static void sendRequestCustomSkin(String name)
 	private static void send(int op, Object object)
 	{
 		MocapPacketC2S packet = new MocapPacketC2S(MocapPackets.CURRENT_VERSION, op, object);
-		MocapPackets.INSTANCE.send(PacketDistributor.SERVER.with(() -> null), packet);
+		MocapPackets.INSTANCE.send(packet, PacketDistributor.SERVER.with(null));
 	}
 
 	private static void respond(int op, Object object)
 	{
 		// same as "send", used to prevent bugs when porting to Fabric
 		MocapPacketC2S packet = new MocapPacketC2S(MocapPackets.CURRENT_VERSION, op, object);
-		MocapPackets.INSTANCE.send(PacketDistributor.SERVER.with(() -> null), packet);
+		MocapPackets.INSTANCE.send(packet, PacketDistributor.SERVER.with(null));
 	}
 }
diff --git a/src/main/java/com/mt1006/mocap/network/MocapPacketS2C.java b/src/main/java/com/mt1006/mocap/network/MocapPacketS2C.java
@@ -6,7 +6,7 @@
 import com.mt1006.mocap.mocap.playing.CustomClientSkinManager;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.event.network.CustomPayloadEvent;
 import net.minecraftforge.network.PacketDistributor;
 
 import java.util.ArrayList;
@@ -99,7 +99,7 @@ public void encode(FriendlyByteBuf buf)
 		}
 	}
 
-	public void handle(Supplier<NetworkEvent.Context> ctx)
+	public void handle(CustomPayloadEvent.Context ctx)
 	{
 		if (version != MocapPackets.CURRENT_VERSION) { return; }
 
@@ -152,13 +152,13 @@ public static void sendCustomSkinData(ServerPlayer serverPlayer, String name, by
 	private static void send(ServerPlayer serverPlayer, int op, Object object)
 	{
 		MocapPacketS2C packet = new MocapPacketS2C(MocapPackets.CURRENT_VERSION, op, object);
-		MocapPackets.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), packet);
+		MocapPackets.INSTANCE.send(packet, PacketDistributor.PLAYER.with(serverPlayer));
 	}
 
 	private static void respond(ServerPlayer serverPlayer, int op, Object object)
 	{
 		// same as "send", used to prevent bugs when porting to Fabric
 		MocapPacketS2C packet = new MocapPacketS2C(MocapPackets.CURRENT_VERSION, op, object);
-		MocapPackets.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), packet);
+		MocapPackets.INSTANCE.send(packet, PacketDistributor.PLAYER.with(serverPlayer));
 	}
 }
diff --git a/src/main/java/com/mt1006/mocap/network/MocapPackets.java b/src/main/java/com/mt1006/mocap/network/MocapPackets.java
@@ -2,15 +2,13 @@
 
 import com.mt1006.mocap.MocapMod;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.network.ChannelBuilder;
 import net.minecraftforge.network.NetworkDirection;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.network.SimpleChannel;
 
 public class MocapPackets
 {
-	private static final String PROTOCOL_VERSION = "1";
-	public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(
-			new ResourceLocation(MocapMod.MOD_ID, "forge"), () -> PROTOCOL_VERSION, (str) -> true, (str) -> true);
+	public static final SimpleChannel INSTANCE = ChannelBuilder.named(new ResourceLocation(MocapMod.MOD_ID, "forge")).simpleChannel();
 	public static final int CURRENT_VERSION = 3;
 
 	public static void register()
diff --git a/src/main/java/com/mt1006/mocap/utils/FakePlayer.java b/src/main/java/com/mt1006/mocap/utils/FakePlayer.java
@@ -1,7 +1,9 @@
 package com.mt1006.mocap.utils;
 
 import com.mojang.authlib.GameProfile;
+import io.netty.channel.*;
 import net.minecraft.network.Connection;
+import net.minecraft.network.PacketListener;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
@@ -10,8 +12,10 @@
 import net.minecraft.network.protocol.PacketFlow;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.stats.Stat;
 import net.minecraft.world.damagesource.DamageSource;
@@ -22,15 +26,18 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.ParametersAreNonnullByDefault;
+import java.net.SocketAddress;
 import java.util.Set;
 
 // FakePlayer class from Forge
 public class FakePlayer extends ServerPlayer
 {
-	public FakePlayer(ServerLevel level, GameProfile name)
+	private static final ClientInformation DEFAULT_CLIENT_INFO = ClientInformation.createDefault();
+
+	public FakePlayer(ServerLevel level, GameProfile profile)
 	{
-		super(level.getServer(), level, name);
-		this.connection = new FakePlayerNetHandler(level.getServer(), this);
+		super(level.getServer(), level, profile, DEFAULT_CLIENT_INFO);
+		this.connection = new FakePlayerNetHandler(level.getServer(), this, profile);
 		setInvulnerable(true);
 	}
 
@@ -40,16 +47,16 @@ public FakePlayer(ServerLevel level, GameProfile name)
 	@Override public void awardStat(@NotNull Stat stat, int amount) { }
 	@Override public void die(@NotNull DamageSource source) { }
 	@Override public void tick() { }
-	@Override public void updateOptions(@NotNull ServerboundClientInformationPacket packet) { }
 	@Override public @Nullable MinecraftServer getServer() { return ServerLifecycleHooks.getCurrentServer(); }
 
 	@ParametersAreNonnullByDefault
 	private static class FakePlayerNetHandler extends ServerGamePacketListenerImpl
 	{
-		private static final Connection DUMMY_CONNECTION = new Connection(PacketFlow.CLIENTBOUND);
+		private static final Connection DUMMY_CONNECTION = new DummyConnection(PacketFlow.CLIENTBOUND);
 
-		public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player) {
-			super(server, DUMMY_CONNECTION, player);
+		public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player, GameProfile profile)
+		{
+			super(server, DUMMY_CONNECTION, player, new CommonListenerCookie(profile, 0, DEFAULT_CLIENT_INFO));
 		}
 
 		@Override public void tick() { }
@@ -80,7 +87,6 @@ public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player) {
 		@Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { }
 		@Override public void handleUseItem(ServerboundUseItemPacket packet) { }
 		@Override public void handleTeleportToEntityPacket(ServerboundTeleportToEntityPacket packet) { }
-		@Override public void handleResourcePackResponse(ServerboundResourcePackPacket packet) { }
 		@Override public void handlePaddleBoat(ServerboundPaddleBoatPacket packet) { }
 		@Override public void onDisconnect(Component message) { }
 		@Override public void send(Packet<?> packet) { }
@@ -97,10 +103,7 @@ public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player) {
 		@Override public void handleContainerButtonClick(ServerboundContainerButtonClickPacket packet) { }
 		@Override public void handleSetCreativeModeSlot(ServerboundSetCreativeModeSlotPacket packet) { }
 		@Override public void handleSignUpdate(ServerboundSignUpdatePacket packet) { }
-		@Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { }
 		@Override public void handlePlayerAbilities(ServerboundPlayerAbilitiesPacket packet) { }
-		@Override public void handleClientInformation(ServerboundClientInformationPacket packet) { }
-		@Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { }
 		@Override public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) { }
 		@Override public void handleLockDifficulty(ServerboundLockDifficultyPacket packet) { }
 		@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<RelativeMovement> relativeSet) { }
@@ -112,4 +115,45 @@ public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player) {
 		@Override public void sendDisguisedChatMessage(Component content, ChatType.Bound boundChatType) { }
 		@Override public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) { }
 	}
+
+	@ParametersAreNonnullByDefault
+	private static class DummyConnection extends Connection
+	{
+		private static final Channel DUMMY_CHANNEL = new DummyChannel();
+
+		public DummyConnection(PacketFlow packetFlow)
+		{
+			super(packetFlow);
+		}
+		@Override public void setListener(PacketListener packetListener) {}
+		@Override public @NotNull Channel channel() { return DUMMY_CHANNEL; }
+	}
+
+	// based on FailedChannel code
+	private static class DummyChannel extends AbstractChannel
+	{
+		private static final ChannelMetadata METADATA = new ChannelMetadata(false);
+		private final ChannelConfig config = new DefaultChannelConfig(this);
+
+		DummyChannel() { super(null); }
+
+		@Override protected AbstractUnsafe newUnsafe() { return new FailedChannelUnsafe(); }
+		@Override protected boolean isCompatible(EventLoop loop) { return false; }
+		@Override protected SocketAddress localAddress0() { return null; }
+		@Override protected SocketAddress remoteAddress0() { return null; }
+		@Override protected void doBind(SocketAddress localAddress) {}
+		@Override protected void doDisconnect() {}
+		@Override protected void doClose() {}
+		@Override protected void doBeginRead() {}
+		@Override protected void doWrite(ChannelOutboundBuffer in) {}
+		@Override public ChannelConfig config() { return config; }
+		@Override public boolean isOpen() { return false; }
+		@Override public boolean isActive() { return false; }
+		@Override public ChannelMetadata metadata() { return METADATA; }
+
+		private final class FailedChannelUnsafe extends AbstractUnsafe
+		{
+			@Override public void connect(SocketAddress remoteAddress, SocketAddress localAddress, ChannelPromise promise) {}
+		}
+	}
 }
diff --git a/src/main/java/com/mt1006/mocap/utils/ProfileUtils.java b/src/main/java/com/mt1006/mocap/utils/ProfileUtils.java
diff --git a/src/main/resources/mixins.mocap.json b/src/main/resources/mixins.mocap.json

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import com.mt1006.mocap.mocap.playing.CustomSkinManager;`
`6`	`6`	`import net.minecraft.network.FriendlyByteBuf;`
`7`	`7`	`import net.minecraft.server.level.ServerPlayer;`
`8`		`-import net.minecraftforge.network.NetworkEvent;`
	`8`	`+import net.minecraftforge.event.network.CustomPayloadEvent;`
`9`	`9`	`import net.minecraftforge.network.PacketDistributor;`
`10`	`10`
`11`	`11`	`import java.util.function.Supplier;`
`@@ -53,10 +53,10 @@ public void encode(FriendlyByteBuf buf)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- public void handle(Supplier<NetworkEvent.Context> ctx)`
	`56`	`+ public void handle(CustomPayloadEvent.Context ctx)`
`57`	`57`	`{`
`58`	`58`	`if (version != MocapPackets.CURRENT_VERSION) { return; }`
`59`		`- ServerPlayer sender = ctx.get().getSender();`
	`59`	`+ ServerPlayer sender = ctx.getSender();`
`60`	`60`
`61`	`61`	`switch (op)`
`62`	`62`	`{`
`@@ -84,13 +84,13 @@ public static void sendRequestCustomSkin(String name)`
`84`	`84`	`private static void send(int op, Object object)`
`85`	`85`	`{`
`86`	`86`	`MocapPacketC2S packet = new MocapPacketC2S(MocapPackets.CURRENT_VERSION, op, object);`
`87`		`- MocapPackets.INSTANCE.send(PacketDistributor.SERVER.with(() -> null), packet);`
	`87`	`+ MocapPackets.INSTANCE.send(packet, PacketDistributor.SERVER.with(null));`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`private static void respond(int op, Object object)`
`91`	`91`	`{`
`92`	`92`	`// same as "send", used to prevent bugs when porting to Fabric`
`93`	`93`	`MocapPacketC2S packet = new MocapPacketC2S(MocapPackets.CURRENT_VERSION, op, object);`
`94`		`- MocapPackets.INSTANCE.send(PacketDistributor.SERVER.with(() -> null), packet);`
	`94`	`+ MocapPackets.INSTANCE.send(packet, PacketDistributor.SERVER.with(null));`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`import com.mt1006.mocap.mocap.playing.CustomClientSkinManager;`
`7`	`7`	`import net.minecraft.network.FriendlyByteBuf;`
`8`	`8`	`import net.minecraft.server.level.ServerPlayer;`
`9`		`-import net.minecraftforge.network.NetworkEvent;`
	`9`	`+import net.minecraftforge.event.network.CustomPayloadEvent;`
`10`	`10`	`import net.minecraftforge.network.PacketDistributor;`
`11`	`11`
`12`	`12`	`import java.util.ArrayList;`
`@@ -99,7 +99,7 @@ public void encode(FriendlyByteBuf buf)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- public void handle(Supplier<NetworkEvent.Context> ctx)`
	`102`	`+ public void handle(CustomPayloadEvent.Context ctx)`
`103`	`103`	`{`
`104`	`104`	`if (version != MocapPackets.CURRENT_VERSION) { return; }`
`105`	`105`
`@@ -152,13 +152,13 @@ public static void sendCustomSkinData(ServerPlayer serverPlayer, String name, by`
`152`	`152`	`private static void send(ServerPlayer serverPlayer, int op, Object object)`
`153`	`153`	`{`
`154`	`154`	`MocapPacketS2C packet = new MocapPacketS2C(MocapPackets.CURRENT_VERSION, op, object);`
`155`		`- MocapPackets.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), packet);`
	`155`	`+ MocapPackets.INSTANCE.send(packet, PacketDistributor.PLAYER.with(serverPlayer));`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`private static void respond(ServerPlayer serverPlayer, int op, Object object)`
`159`	`159`	`{`
`160`	`160`	`// same as "send", used to prevent bugs when porting to Fabric`
`161`	`161`	`MocapPacketS2C packet = new MocapPacketS2C(MocapPackets.CURRENT_VERSION, op, object);`
`162`		`- MocapPackets.INSTANCE.send(PacketDistributor.PLAYER.with(() -> serverPlayer), packet);`
	`162`	`+ MocapPackets.INSTANCE.send(packet, PacketDistributor.PLAYER.with(serverPlayer));`
`163`	`163`	`}`
`164`	`164`	`}`