Version 1.3.1

Author: mt1006

CHANGELOG.txt

@@ -1,3 +1,14 @@
+===Version 1.3.1===
+-Added settings "fluentMovements" controlling distance to played entity for player to receive additional packets for more fluent movements (32 by default).
+-Fixed entity data synchronization issues.
+-Fixed packets being sent to players far away from played entities.
+-Fixed issue with horse armor not being set properly (reported by M7MEDpro).
+-Fixed issues with players position being offset during playback on versions 1.19.4 and 1.20.1.
+-Fixed horse variant resetting to default or chest disappearing on horse-like entities when their mouth "is open" on versions 1.19.2 and lower.
+-Fixed llama variants not being recorded on versions 1.19.2 and lower, on Fabric.
+-Fixed setting "preventSavingEntities" not preventing saving entities on version 1.16.5.
+-Fixes for loading skin from a file.
+
 ===Version 1.3===
 -Changes to command structure - split "/mocap recording" into "recording" and "recordings".
 -Added commands to rename, copy and get information about recordings and scenes.

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.20.1
-forge_version=47.0.45
+forge_version=47.1.0
 
 minecraft_version_range=[1.20,1.20.2)
 forge_version_range=[46,)
@@ -14,7 +14,7 @@ mapping_version=1.20.1
 
 ## Mod Properties
 mod_id=mocap
-mod_version=1.3
+mod_version=1.3.1
 
 mod_group_id=com.mt1006.mocap
 mod_jar_name=Mocap

settings.gradle

@@ -1,17 +1,17 @@
 pluginManagement
 {
-    repositories
-    {
-        gradlePluginPortal()
-        maven
-        {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
-    }
+	repositories
+	{
+		gradlePluginPortal()
+		maven
+		{
+			name = 'MinecraftForge'
+			url = 'https://maven.minecraftforge.net/'
+		}
+	}
 }
 
 plugins
 {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }

src/main/java/com/mt1006/mocap/MocapMod.java

@@ -16,7 +16,7 @@
 public class MocapMod
 {
 	public static final String MOD_ID = "mocap";
-	public static final String VERSION = "1.3";
+	public static final String VERSION = "1.3.1";
 	public static final String FOR_VERSION = "1.20.1";
 	public static final String FOR_LOADER = "Forge";
 	public static final Logger LOGGER = LogManager.getLogger();

src/main/java/com/mt1006/mocap/command/CommandInfo.java

@@ -0,0 +1,121 @@
+package com.mt1006.mocap.command;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.brigadier.arguments.BoolArgumentType;
+import com.mojang.brigadier.arguments.DoubleArgumentType;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mt1006.mocap.mocap.playing.PlayerData;
+import com.mt1006.mocap.utils.Utils;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.GameProfileArgument;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+
+public class CommandInfo extends CommandOutput
+{
+	public final CommandContext<CommandSourceStack> ctx;
+	public final CommandSourceStack source;
+
+	public CommandInfo(CommandContext<CommandSourceStack> ctx)
+	{
+		this.ctx = ctx;
+		this.source = ctx.getSource();
+	}
+
+	@Override public void sendSuccess(String component, Object... args)
+	{
+		source.sendSuccess(() -> Utils.getTranslatableComponent(source.getEntity(), component, args), false);
+	}
+
+	@Override public void sendSuccessLiteral(String format, Object... args)
+	{
+		source.sendSuccess(() -> Component.literal(String.format(format, args)), false);
+	}
+
+	@Override public void sendSuccessComponent(Component component)
+	{
+		source.sendSuccess(() -> component, false);
+	}
+
+	@Override public void sendFailure(String component, Object... args)
+	{
+		source.sendFailure(Utils.getTranslatableComponent(source.getEntity(), component, args));
+	}
+
+	@Override public void sendException(Exception exception, String component, Object... args)
+	{
+		sendFailure(component, args);
+		Utils.exception(exception, Utils.stringFromComponent(component, args));
+	}
+
+	public @Nullable CommandInfo getFinalCommandInfo()
+	{
+		CommandContext<CommandSourceStack> tempCtx = ctx;
+		while (true)
+		{
+			String command = CommandUtils.getNode(tempCtx.getNodes(), 0);
+			if (command != null && (command.equals("mocap") || command.equals("mocap:mocap"))) { return new CommandInfo(tempCtx); }
+
+			tempCtx = ctx.getChild();
+			if (tempCtx == null) { return null; }
+		}
+	}
+
+	public @Nullable String getNode(int pos)
+	{
+		return CommandUtils.getNode(ctx.getNodes(), pos);
+	}
+
+	public int getInteger(String name)
+	{
+		return IntegerArgumentType.getInteger(ctx, name);
+	}
+
+	public double getDouble(String name)
+	{
+		return DoubleArgumentType.getDouble(ctx, name);
+	}
+
+	public boolean getBool(String name)
+	{
+		return BoolArgumentType.getBool(ctx, name);
+	}
+
+	public String getString(String name)
+	{
+		return StringArgumentType.getString(ctx, name);
+	}
+
+	public Collection<GameProfile> getGameProfiles(String name) throws CommandSyntaxException
+	{
+		return GameProfileArgument.getGameProfiles(ctx, name);
+	}
+
+	public @Nullable String getNullableString(String name)
+	{
+		try { return StringArgumentType.getString(ctx, name); }
+		catch (Exception exception) { return null; }
+	}
+
+	public PlayerData getPlayerData()
+	{
+		String playerName = getNullableString("playerName");
+		if (playerName == null) { return new PlayerData((String)null); }
+
+		String fromPlayer = getNullableString("skinPlayerName");
+		if (fromPlayer != null) { return new PlayerData(playerName, PlayerData.SkinSource.FROM_PLAYER, fromPlayer); }
+
+		String fromFile = getNullableString("skinFilename");
+		if (fromFile != null) { return new PlayerData(playerName, PlayerData.SkinSource.FROM_FILE, fromFile); }
+
+		String fromMineskin = getNullableString("mineskinURL");
+		if (fromMineskin != null) { return new PlayerData(playerName, PlayerData.SkinSource.FROM_MINESKIN, fromMineskin); }
+
+		return new PlayerData(playerName);
+	}
+}

src/main/java/com/mt1006/mocap/command/CommandOutput.java

@@ -0,0 +1,18 @@
+package com.mt1006.mocap.command;
+
+import net.minecraft.network.chat.Component;
+
+public class CommandOutput
+{
+	public static final CommandOutput DUMMY = new CommandOutput();
+
+	public void sendSuccess(String component, Object... args) {}
+
+	public void sendSuccessLiteral(String format, Object... args) {}
+
+	public void sendSuccessComponent(Component component) {}
+
+	public void sendFailure(String component, Object... args) {}
+
+	public void sendException(Exception exception, String component, Object... args) {}
+}

src/main/java/com/mt1006/mocap/command/CommandUtils.java

@@ -6,11 +6,8 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.context.CommandContextBuilder;
 import com.mojang.brigadier.context.ParsedCommandNode;
-import com.mt1006.mocap.mocap.playing.PlayerData;
-import com.mt1006.mocap.utils.Utils;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-import org.apache.commons.lang3.function.TriFunction;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
@@ -27,114 +24,81 @@ public static RequiredArgumentBuilder<CommandSourceStack, String> withPlayerArgu
 			.then(Commands.literal("from_mineskin").then(Commands.argument("mineskinURL", StringArgumentType.greedyString()).executes(command)));
 	}
 
-	public static @Nullable String getString(CommandContext<?> ctx, String name)
+	public static Command<CommandSourceStack> command(Function<CommandInfo, Boolean> function)
 	{
-		try { return StringArgumentType.getString(ctx, name); }
-		catch (Exception exception) { return null; }
+		return (ctx) -> (function.apply(new CommandInfo(ctx)) ? 1 : 0);
 	}
 
-	public static PlayerData getPlayerData(CommandContext<?> ctx)
-	{
-		String playerName = getString(ctx, "playerName");
-		if (playerName == null) { return new PlayerData((String)null); }
-
-		String fromPlayer = getString(ctx, "skinPlayerName");
-		if (fromPlayer != null) { return new PlayerData(playerName, PlayerData.SkinSource.FROM_PLAYER, fromPlayer); }
-
-		String fromFile = getString(ctx, "skinFilename");
-		if (fromFile != null) { return new PlayerData(playerName, PlayerData.SkinSource.FROM_FILE, fromFile); }
-
-		String fromMineskin = getString(ctx, "mineskinURL");
-		if (fromMineskin != null) { return new PlayerData(playerName, PlayerData.SkinSource.FROM_MINESKIN, fromMineskin); }
-
-		return new PlayerData(playerName);
-	}
-
-	public static Command<CommandSourceStack> simpleCommand(Function<CommandSourceStack, Boolean> function)
-	{
-		return (ctx) -> (function.apply(ctx.getSource()) ? 1 : 0);
-	}
-
-	public static RequiredArgumentBuilder<CommandSourceStack, String> withStringArgument(BiFunction<CommandSourceStack, String, Boolean> function, String arg)
+	public static RequiredArgumentBuilder<CommandSourceStack, String> withStringArgument(BiFunction<CommandInfo, String, Boolean> function, String arg)
 	{
 		return Commands.argument(arg, StringArgumentType.string()).executes((ctx) -> stringCommand(function, ctx, arg));
 	}
 
-	public static RequiredArgumentBuilder<CommandSourceStack, String> withTwoStringArguments(TriFunction<CommandSourceStack, String, String, Boolean> function, String arg1, String arg2)
+	public static RequiredArgumentBuilder<CommandSourceStack, String> withTwoStringArguments(TriFunction<CommandInfo, String, String, Boolean> function, String arg1, String arg2)
 	{
 		return Commands.argument(arg1, StringArgumentType.string())
 				.then(Commands.argument(arg2, StringArgumentType.string())
 				.executes((ctx) -> twoStringCommand(function, ctx, arg1, arg2)));
 	}
 
-	private static int stringCommand(BiFunction<CommandSourceStack, String, Boolean> function, CommandContext<CommandSourceStack> ctx, String arg)
+	private static int stringCommand(BiFunction<CommandInfo, String, Boolean> function, CommandContext<CommandSourceStack> ctx, String arg)
 	{
+		CommandInfo commandInfo = new CommandInfo(ctx);
 		try
 		{
 			String name = StringArgumentType.getString(ctx, arg);
-			return function.apply(ctx.getSource(), name) ? 1 : 0;
+			return function.apply(commandInfo, name) ? 1 : 0;
 		}
 		catch (Exception exception)
 		{
-			Utils.sendException(exception, ctx.getSource(), "mocap.error.unable_to_get_argument");
+			commandInfo.sendException(exception, "mocap.error.unable_to_get_argument");
 			return 0;
 		}
 	}
 
-	private static int twoStringCommand(TriFunction<CommandSourceStack, String, String, Boolean> function, CommandContext<CommandSourceStack> ctx, String arg1, String arg2)
+	private static int twoStringCommand(TriFunction<CommandInfo, String, String, Boolean> function, CommandContext<CommandSourceStack> ctx, String arg1, String arg2)
 	{
+		CommandInfo commandInfo = new CommandInfo(ctx);
 		try
 		{
 			String name1 = StringArgumentType.getString(ctx, arg1);
 			String name2 = StringArgumentType.getString(ctx, arg2);
-			return function.apply(ctx.getSource(), name1, name2) ? 1 : 0;
+			return function.apply(commandInfo, name1, name2) ? 1 : 0;
 		}
 		catch (Exception exception)
 		{
-			Utils.sendException(exception, ctx.getSource(), "mocap.error.unable_to_get_argument");
+			commandInfo.sendException(exception, "mocap.error.unable_to_get_argument");
 			return 0;
 		}
 	}
 
-	public static <T> @Nullable CommandContext<T> getFinalCommandContext(CommandContext<T> ctx)
-	{
-		while (true)
-		{
-			String command = getCommandNode(ctx, 0);
-			if (command != null && (command.equals("mocap") || command.equals("mocap:mocap"))) { return ctx; }
-
-			ctx = ctx.getChild();
-			if (ctx == null) { return null; }
-		}
-	}
-
 	public static <T> @Nullable CommandContextBuilder<T> getFinalCommandContext(CommandContextBuilder<T> ctx)
 	{
 		while (true)
 		{
-			String command = getCommandNode(ctx, 0);
+			String command = getNode(ctx, 0);
 			if (command != null && (command.equals("mocap") || command.equals("mocap:mocap"))) { return ctx; }
 
 			ctx = ctx.getChild();
 			if (ctx == null) { return null; }
 		}
 	}
 
-	public static @Nullable String getCommandNode(CommandContext<?> ctx, int pos)
+	public static @Nullable String getNode(CommandContextBuilder<?> ctx, int pos)
 	{
-		return getCommandNode(ctx.getNodes(), pos);
+		return getNode(ctx.getNodes(), pos);
 	}
 
-	public static @Nullable String getCommandNode(CommandContextBuilder<?> ctx, int pos)
-	{
-		return getCommandNode(ctx.getNodes(), pos);
-	}
-
-	private static @Nullable String getCommandNode(List<? extends ParsedCommandNode<?>> nodes, int pos)
+	public static @Nullable String getNode(List<? extends ParsedCommandNode<?>> nodes, int pos)
 	{
 		int size = nodes.size();
 		if (pos < 0) { pos += size; }
 		if (pos >= size || pos < 0) { return null; }
 		return nodes.get(pos).getNode().getName();
 	}
+
+	public interface TriFunction<T, U, V, R>
+	{
+		R apply(T t, U u, V v);
+	}
 }