Version 1.3.4

Author: mt1006

CHANGELOG.txt

@@ -1,3 +1,7 @@
+===Version 1.3.4===
+-Fixed an issue causing recording corruption when recording item or entity with NBT data containing non-ASCII characters (thanks to INV-PLA for reporting).
+-Fixed missing translation key for copying and renaming a scene.
+
 ===Version 1.3.3===
 -Fixed a compatibility issue with JourneyMap (issue reported by seriousfreezing).
 

build.gradle

@@ -1,9 +1,9 @@
 plugins
 {
-    id 'eclipse'
-    id 'idea'
-    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+	id 'eclipse'
+	id 'idea'
+	id 'maven-publish'
+	id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
 	id 'org.spongepowered.mixin' version '0.7.+'
 }
 
@@ -20,47 +20,29 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft
 {
-    mappings channel: mapping_channel, version: mapping_version
-    copyIdeResources = true
+	mappings channel: mapping_channel, version: mapping_version
+	copyIdeResources = true
 
-    runs
+	runs
 	{
-        client
+		configureEach
 		{
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', mod_id
-
-            mods
-			{
-                "${mod_id}" { source sourceSets.main }
-            }
-        }
-
-        server
-		{
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', mod_id
-
-            mods
-			{
-                "${mod_id}" { source sourceSets.main }
-            }
-        }
-    }
+			workingDirectory project.file('run')
+			property 'forge.logging.markers', 'REGISTRIES'
+			property 'forge.logging.console.level', 'debug'
+		}
+
+		client { property 'forge.enabledGameTestNamespaces', mod_id }
+		server { property 'forge.enabledGameTestNamespaces', mod_id }
+	}
 }
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies
 {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+	minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+	annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 
 mixin
@@ -69,41 +51,46 @@ mixin
 	config "mixins.${mod_id}.json"
 }
 
-def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta']
-def replaceProperties =
-[
-        minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
-        forge_version: forge_version, forge_version_range: forge_version_range,
-        loader_version_range: loader_version_range,
-        mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-        mod_authors: mod_authors, mod_description: mod_description,
-		mod_url: mod_url, mod_issues: mod_issues, mod_credits: mod_credits
-]
-
-processResources
+tasks.named('processResources', ProcessResources).configure
 {
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
+	var replaceProperties =
+	[
+		minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
+		forge_version: forge_version, forge_version_range: forge_version_range,
+		loader_version_range: loader_version_range,
+		mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
+		mod_authors: mod_authors, mod_description: mod_description,
+		mod_url: mod_url, mod_issues: mod_issues, mod_credits: mod_credits
+	]
+	inputs.properties replaceProperties
 
-    filesMatching(resourceTargets) { expand replaceProperties }
+	filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { expand replaceProperties + [project: project] }
 }
 
-jar
+tasks.named('jar', Jar).configure
 {
-    manifest
+	manifest
 	{
-        attributes([
-                "Specification-Title"     : mod_id,
-                "Specification-Vendor"    : mod_authors,
-                "Specification-Version"   : "1",
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : mod_authors,
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+		attributes([
+				'Specification-Title'     : mod_id,
+				'Specification-Vendor'    : mod_authors,
+				'Specification-Version'   : '1',
+				'Implementation-Title'    : project.name,
+				'Implementation-Version'  : project.jar.archiveVersion,
+				'Implementation-Vendor'   : mod_authors
+		])
+	}
+
+	finalizedBy 'reobfJar'
 }
 
-jar.finalizedBy('reobfJar')
-
 tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' }
+
+eclipse { synchronizationTasks 'genEclipseRuns' }
+
+sourceSets.each
+{
+	def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+	it.output.resourcesDir = dir
+	it.java.destinationDirectory = dir
+}

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.20.2
-forge_version=48.0.13
+forge_version=48.1.0
 
 minecraft_version_range=[1.20.2,1.20.3)
 forge_version_range=[48,)
@@ -14,7 +14,7 @@ mapping_version=1.20.2
 
 ## Mod Properties
 mod_id=mocap
-mod_version=1.3.3
+mod_version=1.3.4
 
 mod_group_id=com.mt1006.mocap
 mod_jar_name=Mocap

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -13,5 +13,5 @@ pluginManagement
 
 plugins
 {
-	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }

settings.gradle

@@ -15,9 +15,8 @@
 @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.3";
+	public static final String VERSION = "1.3.4";
 	public static final String FOR_VERSION = "1.20.2";
 	public static final String FOR_LOADER = "Forge";
 	public static final Logger LOGGER = LogManager.getLogger();

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

@@ -61,12 +61,12 @@ public static boolean copy(CommandInfo commandInfo, String srcName, String destN
 		try { FileUtils.copyFile(srcFile, destFile); }
 		catch (IOException exception)
 		{
-			commandInfo.sendException(exception, "mocap.scene.copy.failed");
+			commandInfo.sendException(exception, "mocap.scenes.copy.failed");
 			return false;
 		}
 
 		InputArgument.addServerInput(nameWithDot(destName));
-		commandInfo.sendSuccess("mocap.scene.copy.success");
+		commandInfo.sendSuccess("mocap.scenes.copy.success");
 		return true;
 	}
 
@@ -80,13 +80,13 @@ public static boolean rename(CommandInfo commandInfo, String oldName, String new
 
 		if (!oldFile.renameTo(newFile))
 		{
-			commandInfo.sendFailure("mocap.scene.rename.failed");
+			commandInfo.sendFailure("mocap.scenes.rename.failed");
 			return false;
 		}
 
 		InputArgument.removeServerInput(nameWithDot(oldName));
 		InputArgument.addServerInput(nameWithDot(newName));
-		commandInfo.sendSuccess("mocap.scene.rename.success");
+		commandInfo.sendSuccess("mocap.scenes.rename.success");
 		return true;
 	}
 

src/main/java/com/mt1006/mocap/mocap/files/SceneFiles.java

@@ -8,8 +8,6 @@
 import net.minecraftforge.event.network.CustomPayloadEvent;
 import net.minecraftforge.network.PacketDistributor;
 
-import java.util.function.Supplier;
-
 public class MocapPacketC2S
 {
 	public static final int ACCEPT_SERVER = 0;