Tweaks and fixes

.github/workflows/build.yml

@@ -59,9 +59,3 @@ jobs:
         with:
           name: Forge
           path: forge/build/libs/
-      - name: Update Storer
-        run: java -jar updater/updater.jar
-        env:
-          STORER_TYPE: build
-          JAB125_COM_API_KEY: ${{ secrets.JAB125_COM_API_KEY }}
-          GITHUB_BUILD_NUMBER: ${{ github.run_number }}

.run/Build Project.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Build Project" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" value="advanced-debug build" />
-      <option name="externalProjectPath" value="C:\Users\quint\IdeaProjects\advanced-debug" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
       <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
@@ -11,6 +11,7 @@
       <option name="taskNames">
         <list>
           <option value="build" />
+          <option value="mergeJars" />
         </list>
       </option>
       <option name="vmOptions" />

.run/Generate Runs.run.xml → .run/Idea Sync.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate Runs" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Idea Sync" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -10,9 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="genIntellijRuns" />
-          <option value="genEclipseRuns" />
-          <option value="genVSCodeRuns" />
+          <option value="ideaSyncTask" />
         </list>
       </option>
       <option name="vmOptions" />

build.gradle

@@ -12,17 +12,13 @@ repositories {
 architectury {
     minecraft = rootProject.minecraft_version
 }
-version = "${mod_version}-${System.getenv("GITHUB_BUILD_NUMBER") == null ? "local" : System.getenv("GITHUB_BUILD_NUMBER")}"
-
-@SuppressWarnings('unused')
-Object getViewVersion() {
-    return "${mod_version}+${System.getenv("GITHUB_BUILD_NUMBER") == null ? "local" : System.getenv("GITHUB_BUILD_NUMBER")}"
-}
+version = mod_version
 
 @SuppressWarnings('unused')
 Object getModDescription() {
     return "${mod_description}"
 }
+
 forgix {
     group = "com.ultreon.mods"
     mergedJarName = "advanced-debug-${version}.jar"
@@ -55,10 +51,6 @@ subprojects {
             officialMojangMappings()
             parchment("org.parchmentmc.data:parchment-1.19.2:2022.08.10@zip")
         }
-
-//        layered
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:@YARN_MAPPINGS@:v2"
     }
 }
 

fabric/build.gradle

@@ -61,11 +61,11 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", rootProject.getViewVersion()
+    inputs.property "version", rootProject.version
 
     filesMatching("fabric.mod.json") {
         HashMap<String, ?> p = new HashMap<>()
-        p.put("version", rootProject.getViewVersion())
+        p.put("version", rootProject.version)
         p.put("description", rootProject.getModDescription())
         p.put("loaderVersion", rootProject.fabric_loader_version)
         p.put("minecraftVersion", rootProject.architectury.minecraft)

fabric/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "issues": "https://github.com/Ultreon/advanced-debug/issues"
   },
   "license": "LGPL-3.0",
-  "icon": "advanced_debug.png",
+  "icon": "assets/advanced_debug/advanced_debug.png",
   "environment": "*",
   "entrypoints": {
     "client": [

forge/build.gradle

@@ -38,13 +38,13 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", rootProject.getViewVersion()
+    inputs.property "version", rootProject.version
     inputs.property "description", rootProject.getModDescription()
     System.out.println(inputs.getProperties())
 
     filesMatching("META-INF/mods.toml") {
         HashMap<String, ?> p = new HashMap<>()
-        p.put("version", rootProject.getViewVersion())
+        p.put("version", rootProject.version)
         p.put("description", rootProject.getModDescription())
         p.put("loaderVersion", rootProject.forge_version.split("\\.")[0])
         p.put("forgeVersion", rootProject.forge_version)

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx5G
 minecraft_version=1.19.2
-archives_base_name=advanced_debug
+archives_base_name=advanced-debug
 mod_version=2.0.0
 maven_group=com.ultreon.mods
 architectury_version=6.2.43

merge-fabric/build.gradle

@@ -31,10 +31,10 @@ dependencies {
 }
 
 processResources {
-//    inputs.property "version", rootProject.getViewVersion()
+//    inputs.property "version", rootProject.version
 //
 //    filesMatching("fabric.mod.json") {
-//        expand "version": rootProject.getViewVersion()
+//        expand "version": rootProject.version
 //    }
 }
 

merge-fabric/src/main/resources/fabric.mod.json

@@ -2,7 +2,12 @@
   "schemaVersion": 1,
   "id": "advanced-debug-fabric",
   "name": "Advanced Debug Wrapper",
-  "version": "1.0.0",
+  "version": "1",
+  "license": "GPL-v3.0",
+  "authors": [
+    "Qboi123",
+    "Jab125"
+  ],
   "custom": {
     "modmenu": {
       "badges": [

merge-forge/build.gradle

@@ -37,10 +37,10 @@ dependencies {
 }
 
 processResources {
-//    inputs.property "version", rootProject.getViewVersion()
+//    inputs.property "version", rootProject.version
 //
 //    filesMatching("META-INF/mods.toml") {
-//        expand "version": rootProject.getViewVersion()
+//        expand "version": rootProject.version
 //    }
 }
 

merge-forge/src/main/resources/META-INF/mods.toml

@@ -5,6 +5,7 @@ license = "GPL-3.0"
 # The main mod, and all sub-mods.
 [[mods]]
 modId = "advanced_debug_forge"
+version = "1"
 displayName = "Advanced Debug Wrapper"
 description = '''
 Forge wrapper for advanced debug