Merge novalattasya's Baritone only fork

.github/workflows/auto_build.yml

@@ -0,0 +1,47 @@
+name: Auto Build on Push
+on:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', 'gradle/wrapper/**', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+          cache: 'gradle'
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build -Pcommit=${{ github.sha }}
+        env:
+          CI: true
+
+      - name: Upload Build Archive
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-archive
+          path: build/libs/*.jar

.github/workflows/release.yml

@@ -29,12 +29,12 @@ jobs:
               run: |
                   mod_version=$(grep "^mod_version=" gradle.properties | cut -d'=' -f2)
                   echo "mod_version=$mod_version" >> $GITHUB_OUTPUT
-                  echo "mc_version=1.21.4" >> $GITHUB_OUTPUT
+                  echo "mc_version=1.21.5" >> $GITHUB_OUTPUT
 
             - name: Create GitHub Release Draft
               uses: softprops/action-gh-release@v2
               with:
-                  tag_name: v${{ steps.get_versions.outputs.mod_version }}
+                  tag_name: v${{ steps.get_versions.outputs.mod_version }}-mc${{ steps.get_versions.outputs.mc_version }}
                   name: Release v${{ steps.get_versions.outputs.mod_version }} (MC ${{ steps.get_versions.outputs.mc_version }})
                   body: |
                     Release for mod version ${{ steps.get_versions.outputs.mod_version }} and Minecraft ${{ steps.get_versions.outputs.mc_version }}.

build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
-    id("fabric-loom") version "1.10-SNAPSHOT"
+    id("fabric-loom") version "1.11-SNAPSHOT"
 }
 
-val targetVersion = findProperty("target_version") as String? ?: "1_21_4"
+val targetVersion = findProperty("target_version") as String? ?: "1_21_10"
 val minecraftVersion = properties["minecraft_version_$targetVersion"] as String
 val yarnMappings = properties["yarn_mappings_$targetVersion"] as String
 val loaderVersion = properties["loader_version_$targetVersion"] as String

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.configuration-cache=true
 
 # Mod Global Properties
-mod_version=1.1.2
+mod_version=1.1.6
 maven_group=xyz.omegaware
 archives_base_name=OmegaWare Addons
 
@@ -20,3 +20,8 @@ loader_version_1_21_4=0.16.14
 minecraft_version_1_21_5=1.21.5
 yarn_mappings_1_21_5=1.21.5+build.1
 loader_version_1_21_5=0.16.14
+
+# 1.21.10 Fabric Properties
+minecraft_version_1_21_10=1.21.10
+yarn_mappings_1_21_10=1.21.10+build.2
+loader_version_1_21_10=0.17.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/xyz/omegaware/addon/OmegawareAddons.java

@@ -1,62 +1,42 @@
 package xyz.omegaware.addon;
 
 import meteordevelopment.meteorclient.MeteorClient;
-import meteordevelopment.meteorclient.commands.Commands;
 import meteordevelopment.meteorclient.pathing.BaritoneUtils;
-import meteordevelopment.meteorclient.systems.hud.Hud;
 import meteordevelopment.meteorclient.utils.Utils;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.metadata.ModMetadata;
-import xyz.omegaware.addon.commands.LinkCommand;
-import xyz.omegaware.addon.commands.ShulkerQueueCommand;
-import xyz.omegaware.addon.hud.OnlineTSRMembersHUD;
-import xyz.omegaware.addon.modules.*;
 import com.mojang.logging.LogUtils;
 import meteordevelopment.meteorclient.addons.GithubRepo;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
-import meteordevelopment.meteorclient.systems.hud.HudGroup;
 import meteordevelopment.meteorclient.systems.modules.Category;
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import org.slf4j.Logger;
 
 import java.io.File;
 
+/**
+ * Slimmed-down addon entrypoint: only registers BetterBaritoneBuild.
+ */
 public class OmegawareAddons extends MeteorAddon {
     public static final String MOD_ID = "omegaware-addons";
     public static ModMetadata MOD_META;
     public static final Logger LOG = LogUtils.getLogger();
     public static final Category CATEGORY = new Category("OmegaWare");
-    public static final HudGroup HUD_GROUP = new HudGroup("OmegaWare");
 
     public static File GetConfigFile(String key, String filename) {
         return new File(new File(new File(new File(MeteorClient.FOLDER, "omegaware"), key), Utils.getFileWorldName()), filename);
     }
 
     @Override
     public void onInitialize() {
-        LOG.info("Initializing OmegaWare Addons");
+        LOG.info("Initializing OmegaWare Addons (pruned, BetterBaritoneBuild only)");
 
         MOD_META = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow().getMetadata();
 
-        // Modules
-        Modules.get().add(new TPAAutomationModule());
-        Modules.get().add(new BeaconRangeModule());
-        Modules.get().add(new ChatFilterModule());
-        Modules.get().add(new ItemFrameDupeModule());
-        Modules.get().add(new BetterStashFinderModule());
-
-        if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
-            Modules.get().add(new TSRKitBotModule()); // Is not ready yet
-        }
-
+        // Only register the BetterBaritoneBuild module if Baritone is available.
         if (BaritoneUtils.IS_AVAILABLE) {
-            Modules.get().add(new BetterBaritoneBuild());
+            Modules.get().add(new xyz.omegaware.addon.modules.BetterBaritoneBuild());
         }
-
-        Commands.add(new LinkCommand());
-        Commands.add(new ShulkerQueueCommand());
-
-        Hud.get().register(OnlineTSRMembersHUD.INFO);
     }
 
     @Override
@@ -74,9 +54,10 @@ public String getWebsite() {
         return "https://github.com/Omega172/OmegaWare-Addons";
     }
 
+    // Update repo version tag to reflect Minecraft target (kept simple).
     @Override
     public GithubRepo getRepo() {
-        return new GithubRepo("Omega172", "OmegaWare-Addons", "1.21.4", null);
+        return new GithubRepo("Omega172", "OmegaWare-Addons", "1.21.10", null);
     }
 
     @Override