Rewrote everything basically

 - `common` now uses mojang mappings
 - `fabric` now uses parchment mappings
 - `neoforge` was set up (not tested)

Author: VLTNOgithub

.gitignore

@@ -41,4 +41,5 @@ replay_*.log
 
 # misc
 /code_changes.json
-/git_diff_monitor.py
+/git_diff_monitor.py
+/neoforge/run/

build.gradle

@@ -1,9 +1,3 @@
-plugins {
-    id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false
-    id 'architectury-plugin' version '3.4-SNAPSHOT'
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
-}
-
 task openBuildDir {
     doLast {
         def buildDir = file("${layout.buildDirectory.get().asFile.absolutePath}/libs").absolutePath
@@ -16,18 +10,8 @@ task openBuildDir {
     }
 }
 
-architectury {
-    minecraft = project.minecraft_version
-}
-
-allprojects {
-    group = rootProject.maven_group
-    version = rootProject.mod_version
-}
-
 subprojects {
-    apply plugin: 'dev.architectury.loom'
-    apply plugin: 'architectury-plugin'
+    apply plugin: 'java'
 
     base {
         archivesName = "${archives_name}-${project.name.toUpperCase()}-${minecraft_version}"
@@ -57,7 +41,6 @@ subprojects {
                         "fabric_loader_version"                 : fabric_loader_version,
                         "fabric_api_version"                    : fabric_api_version,
                         "neoforge_version"                      : neoforge_version,
-                        "yarn_mappings_patch_neoforge_version"  : yarn_mappings_patch_neoforge_version,
                 ]
 
         filesMatching(["pack.mcmeta", "fabric.mod.json", "META-INF/neoforge.mods.toml", "*.mixins.json"]) {
@@ -69,18 +52,10 @@ subprojects {
     jar {
         exclude "assets/time-loop/icon.psd"
     }
-    
-    if (project.name != "common") {
-        jar {
-            finalizedBy openBuildDir
-        }
-    }
 
-    dependencies {
-        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
-        mappings loom.layered {
-            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
+    if (project.name in ["fabric", "neoforge"]) {
+        tasks.named("jar") {
+            finalizedBy rootProject.tasks.named("openBuildDir")
         }
     }
 

common/build.gradle

@@ -1,10 +1,26 @@
-architectury {
-    common rootProject.enabled_platforms.split(',')
+plugins {
+    id "java-library"
+    id "fabric-loom" version "${fabric_loom_version}"
 }
 
+repositories {
+    mavenCentral()
+    maven { url = "https://maven.parchmentmc.org/" }
+    maven { url = "https://repo.spongepowered.org/repository/maven-public" }
+}
+
+group = project.maven_group // Set group from root project
+version = project.mod_version // Set version from root project
+
 dependencies {
-    // We depend on Fabric Loader here to use the Fabric @Environment annotations,
-    // which get remapped to the correct annotations on each platform.
-    // Do NOT use other classes from Fabric Loader.
-    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+    minecraft "com.mojang:minecraft:${minecraft_version}"
+//  mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    mappings loom.officialMojangMappings()
+
+    compileOnly "org.spongepowered:mixin:0.8.5:processor"
+}
+
+loom {
+    mixin.useLegacyMixinAp = false
+    officialMojangMappings()
 }

common/src/main/java/com/vltno/timeloop/Commands.java

@@ -1,41 +1,44 @@
 package com.vltno.timeloop;
 
-import net.minecraft.entity.boss.ServerBossBar;
-import net.minecraft.entity.boss.BossBar.Color;
-import net.minecraft.entity.boss.BossBar.Style;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import net.minecraft.server.level.ServerBossEvent;
+import net.minecraft.world.BossEvent.BossBarColor;
+import net.minecraft.world.BossEvent.BossBarOverlay;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.network.chat.Component;
 
 public class LoopBossBar {
-    private static final Logger LOGGER = LoggerFactory.getLogger("LoopCommands");
-    private final ServerBossBar bossBar;
-
+    private final ServerBossEvent bossBar;
 
     public LoopBossBar() {
-        bossBar = new ServerBossBar(Text.literal("TimeLoop"), Color.YELLOW, Style.PROGRESS);
+        bossBar = new ServerBossEvent(Component.literal("TimeLoop"), BossBarColor.YELLOW, BossBarOverlay.PROGRESS);
     }
 
     public void visible(boolean bool) {
         bossBar.setVisible(bool);
     }
 
     public void setBossBarName(String bossBarName) {
-        bossBar.setName(Text.literal(bossBarName));
+        bossBar.setName(Component.literal(bossBarName));
     }
 
     public void setBossBarPercentage(int whole, int part) {
-        bossBar.setPercent(1.0f - ((float) part / whole));
+        if (whole <= 0) {
+            bossBar.setProgress(1.0f);
+            return;
+        }
+        // Calculate progress (fraction remaining)
+        float progress = 1.0f - ((float) part / whole);
+        // Clamp progress between 0.0 and 1.0
+        bossBar.setProgress(Math.max(0.0f, Math.min(1.0f, progress)));
     }
 
-    public void addPlayer(ServerPlayerEntity player) {
-        LOGGER.info("Adding player: {}", player.getName().getString());
+    public void addPlayer(ServerPlayer player) {
+        TimeLoop.LOOP_LOGGER.info("Adding player to boss bar: {}", player.getName().getString());
         bossBar.addPlayer(player);
     }
 
-    public void removePlayer(ServerPlayerEntity player) {
-        LOGGER.info("Removing player: {}", player.getName().getString());
+    public void removePlayer(ServerPlayer player) {
+        TimeLoop.LOOP_LOGGER.info("Removing player from boss bar: {}", player.getName().getString());
         bossBar.removePlayer(player);
     }
-}
+}

common/src/main/java/com/vltno/timeloop/LoopBossBar.java

@@ -0,0 +1,25 @@
+package com.vltno.timeloop;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.vltno.timeloop.commands.BaseCommands;
+import com.vltno.timeloop.commands.SettingsCommands;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LoopCommands {
+    public static final Logger LOOP_COMMANDS_LOGGER = LoggerFactory.getLogger("LoopCommands");
+
+    public static void register(CommandDispatcher<CommandSourceStack> dispatcher)
+    {
+        LiteralArgumentBuilder<CommandSourceStack> commandBuilder = Commands.literal("loop");
+
+        BaseCommands.register(commandBuilder);
+        SettingsCommands.register(commandBuilder);
+        // TogglesCommands.register is called within SettingsCommands.register
+
+        dispatcher.register(commandBuilder);
+    }
+}

common/src/main/java/com/vltno/timeloop/LoopCommands.java

@@ -1,15 +1,16 @@
 package com.vltno.timeloop;
 
-import net.minecraft.util.StringIdentifiable;
+import net.minecraft.util.StringRepresentable;
+import org.jetbrains.annotations.NotNull;
 
-public enum LoopTypes implements StringIdentifiable {
+public enum LoopTypes implements StringRepresentable {
     TICKS,
     TIME_OF_DAY,
     SLEEP,
     DEATH;
 
     @Override
-    public String asString() {
+    public @NotNull String getSerializedName() {
         return name();
     }
-}
+}

common/src/main/java/com/vltno/timeloop/LoopTypes.java

@@ -3,8 +3,11 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.level.ServerLevel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,8 +20,8 @@
 public class TimeLoop {
 	public static final Logger LOOP_LOGGER = LoggerFactory.getLogger("TimeLoop");
 	public static MinecraftServer server;
-	public static ServerWorld serverWorld;
-
+	public static ServerLevel serverLevel;
+	
 	public static LoopBossBar loopBossBar;
 
 	// These fields will be initialized from the configuration file.
@@ -62,16 +65,27 @@ public static void init(boolean isDedicatedServer) {
 	 * Executes a minecraft chat command.
 	 */
 	public static void executeCommand(String command) {
-		if (server != null) {
-			LOOP_LOGGER.info("Executing command: {}", command);
-			// Execute the command without expecting a return value.
-			server.getCommandManager().executeWithPrefix(server.getCommandSource(), command);
-			LOOP_LOGGER.info("Command executed successfully: {}", command);
-			// For commands like "mocap recording save" you might need an alternative method
-			// to verify success (for example, by checking for expected side effects).
-		} else {
+		if (server == null) {
 			LOOP_LOGGER.error("Attempted to execute command while server is null: {}", command);
 		}
+		
+		server.execute(() -> {
+			try {
+				Commands commands = server.getCommands();
+
+				CommandSourceStack commandSource = server.createCommandSourceStack();
+
+				LOOP_LOGGER.info("Executing command: {}", command);
+
+				commands.getDispatcher().execute(command, commandSource);
+
+				LOOP_LOGGER.info("Command executed successfully: {}", command);
+			} catch (CommandSyntaxException e) {
+				LOOP_LOGGER.error("Failed to execute command '{}' due to syntax error: {}", command, e.getMessage());
+			} catch (Exception e) {
+				LOOP_LOGGER.error("An unexpected error occurred while executing command '{}': {}", command, e.getMessage(), e);
+			}
+		});
 	}
 
 
@@ -83,7 +97,7 @@ public static void runLoopIteration() {
 		saveRecordings();
 		removeOldSceneEntries();
 		startRecordings();
-		if (trackTimeOfDay) { serverWorld.setTimeOfDay(startTimeOfDay); }
+		if (trackTimeOfDay) { serverLevel.setDayTime(startTimeOfDay); }
 		TimeLoop.executeCommand("mocap playback stop_all including_others");
 
 		loopSceneManager.forEachRecordingPlayer(playerData -> {