Merge branch '1.21.4' into 1.21.1

Author: VLTNOgithub

build.gradle

@@ -48,7 +48,7 @@ subprojects {
                         "archives_name"                         : archives_name,
 
                         "minecraft_version"                     : minecraft_version,
-
+                        
                         "fabric_loader_version"                 : fabric_loader_version,
                         "fabric_api_version"                    : fabric_api_version,
                         "neoforge_version"                      : neoforge_version,

common/src/main/java/com/vltno/timeloop/commands/BaseCommands.java

@@ -26,6 +26,10 @@ public static void register(LiteralArgumentBuilder<CommandSourceStack> parentBui
                 .executes(BaseCommands::skip)
                 .requires(source -> source.hasPermission(2)));
 
+        parentBuilder.then(Commands.literal("skip")
+                .executes(BaseCommands::skip)
+                .requires(source -> source.hasPermission(2)));
+        
         parentBuilder.then(Commands.literal("stop")
                 .executes(BaseCommands::stop)
                 .requires(source -> source.hasPermission(2)));
@@ -67,7 +71,7 @@ private static int skip(CommandContext<CommandSourceStack> context) {
             }
 
             TimeLoop.runLoopIteration();
-            
+          
             source.sendSuccess(() -> Component.literal("Loop skipped!"), true);
             LoopCommands.LOOP_COMMANDS_LOGGER.info("Loop skipped");
             return 1;

common/src/main/java/com/vltno/timeloop/commands/SettingsCommands.java

@@ -84,7 +84,7 @@ private static int setLoopType(CommandContext<CommandSourceStack> context) {
             if (TimeLoop.showLoopInfo && TimeLoop.loopBossBar != null) {
                 TimeLoop.loopBossBar.visible(newLoopType.equals(LoopTypes.TICKS) || newLoopType.equals(LoopTypes.TIME_OF_DAY));
             }
-            
+          
             String extra = (newLoopType == LoopTypes.MANUAL) ? ". Use '/loop skip' to advance to the next iteration." : "";
             source.sendSuccess(() -> Component.literal("Loop type is set to: " + newLoopType + extra), true);
             LoopCommands.LOOP_COMMANDS_LOGGER.info("Loop type set to {}", newLoopType);

fabric/build.gradle

@@ -25,7 +25,6 @@ dependencies {
         parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
     }
 
-
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
 

gradle.properties

@@ -17,20 +17,25 @@ archives_name = timeloop
 enabled_platforms = fabric,neoforge
 
 # Minecraft properties
-minecraft_version = 1.21.1
+minecraft_version = 1.21.4
 
 # Loaders
 # https://github.com/FabricMC/fabric-loader/releases
 # https://modrinth.com/mod/fabric-api/versions?c=release
 # https://projects.neoforged.net/neoforged/neoforge
 fabric_loader_version = 0.16.14
-fabric_api_version = 0.115.6+1.21.1
-neoforge_version = 21.1.145
+fabric_api_version = 0.119.2+1.21.4
+neoforge_version = 21.4.135
 
 # Mappings
 # https://parchmentmc.org/docs/getting-started
-parchment_minecraft=1.21.1
-parchment_version=2024.11.17
+parchment_version=2025.03.23
+
+# Gradle dependencies
+# https://github.com/FabricMC/fabric-loom/releases
+# https://projects.neoforged.net/neoforged/ModDevGradle
+fabric_loom_version=1.10-SNAPSHOT
+neoforge_moddev_version=2.0.81
 
 # Gradle dependencies
 # https://github.com/FabricMC/fabric-loom/releases

neoforge/build.gradle

@@ -13,7 +13,7 @@ version = project.mod_version
 neoForge {
     version = neoforge_version
     parchment {
-        minecraftVersion = parchment_minecraft
+        minecraftVersion = minecraft_version
         mappingsVersion = parchment_version
     }