From 07c27610f25743ecd9a3ec5e23a4a61044c13640 Mon Sep 17 00:00:00 2001
From: Qboi123 <qboiwastaken@gmail.com>
Date: Sat, 31 Dec 2022 20:47:42 +0100
Subject: [PATCH] Tweaks and fixes

---
 .github/workflows/build.yml                   |   6 ----
 .github/workflows/update.yml                  |  33 ------------------
 .run/Build Project.run.xml                    |   3 +-
 ...enerate Runs.run.xml => Idea Sync.run.xml} |   6 ++--
 build.gradle                                  |  12 ++-----
 fabric/build.gradle                           |   4 +--
 fabric/src/main/resources/advanced_debug.png  | Bin 2284 -> 0 bytes
 .../assets/advanced_debug/advanced_debug.png  | Bin 0 -> 407 bytes
 fabric/src/main/resources/fabric.mod.json     |   2 +-
 forge/build.gradle                            |   4 +--
 forge/src/main/resources/advanced_debug.png   | Bin 2284 -> 407 bytes
 gradle.properties                             |   2 +-
 merge-fabric/build.gradle                     |   4 +--
 .../src/main/resources/fabric.mod.json        |   7 +++-
 merge-forge/build.gradle                      |   4 +--
 .../src/main/resources/META-INF/mods.toml     |   1 +
 16 files changed, 23 insertions(+), 65 deletions(-)
 delete mode 100644 .github/workflows/update.yml
 rename .run/{Generate Runs.run.xml => Idea Sync.run.xml} (76%)
 delete mode 100644 fabric/src/main/resources/advanced_debug.png
 create mode 100644 fabric/src/main/resources/assets/advanced_debug/advanced_debug.png

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ed8b22a..bad968b 100644
--- a/.github/workflows/build.yml
+++ b/.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 }}
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
deleted file mode 100644
index 3f03aa2..0000000
--- a/.github/workflows/update.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Automatically build the project and run any configured tests for every push
-# and submitted pull request. This can help catch issues that only occur on
-# certain platforms or Java versions, and provides a first line of defence
-# against bad commits.
-
-name: Update Version Checker
-on: [push, workflow_dispatch]
-
-jobs:
-  update:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-            17    # Minimum supported by Minecraft
-        ]
-        # and run on both Linux and not Windows
-        os: [ubuntu-20.04]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v3
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          cache: 'gradle'
-      - name: Update Version Numbers
-        run: java -jar updater/updater.jar
-        env:
-          STORER_TYPE: update
-          JAB125_COM_API_KEY: ${{ secrets.JAB125_COM_API_KEY }}
\ No newline at end of file
diff --git a/.run/Build Project.run.xml b/.run/Build Project.run.xml
index f691856..c8e37b3 100644
--- a/.run/Build Project.run.xml	
+++ b/.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" />
diff --git a/.run/Generate Runs.run.xml b/.run/Idea Sync.run.xml
similarity index 76%
rename from .run/Generate Runs.run.xml
rename to .run/Idea Sync.run.xml
index ac7c88e..ac79b01 100644
--- a/.run/Generate Runs.run.xml	
+++ b/.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" />
diff --git a/build.gradle b/build.gradle
index ebfa33f..654cbc0 100644
--- a/build.gradle
+++ b/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"
     }
 }
 
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 408661c..d849155 100644
--- a/fabric/build.gradle
+++ b/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)
diff --git a/fabric/src/main/resources/advanced_debug.png b/fabric/src/main/resources/advanced_debug.png
deleted file mode 100644
index 6624851fdb6758ed912bf078df84530a3ea3ff51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2284
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4YzZe)eHha1_hE&XXd&4$QHdLbF
zq4f_d^L-jjf=w)}UR@5t9@iQo7;h)=i@a&%>RcMIfk|N{N2{o}2+M>C!v7O(bP}w(
zERX)Sd3t@0W$}}p>(7Hs9>O5Z<m_jgFSYxBA6&eV-{6LI`TMEc`CI;eeSZ4OzyCkp
z-rORw?nUp!Zf1sL4q(^`F)#?IFfb^1FfcewU|?uaU}Ru$1O{;v3j+fSC+!s6{<X0F
z>*LKw*F0Ii`O7zReLZnyC%Zda{eOR~GxYlT>*V4u|L)S+N$9@bvR3}r<?!ynQzuia
z|6fkpwC;I&vwXsa_TL*{&!403rg_=7`hRKO0E8W~LvQun`}F$qeeunvdo84Q{V52p
z{yqD7^ZEV%{?*&Y_Jn;curK?2(eKgy{TKJ!FW$*WzX(QlBrK6-MB9I1Z|}ais_*>q
zb@RXb|7G3cd;P1q!L`4OH@^PAVaApn1MNWTs?*`(%e!yRn)jw%Z~x47;)_FN=l93f
zZ|N^jmVYq)Ixsc3=kwir`(Xe6i|^!nYa5O?@85r)@84fb3z=$$0Z$Cq`2XH}n6zcp
z`S*RX|9?;K7Sx{gFL(c2_T5K2L~G4{{5~8p&`zB7tWs{*>&4dZfnm2}b@%08+6`->
zx4*ae)3{F0Z~4U6y9YW2%zAEF`|keRvX|l?p03?4X1w6x?A7}(tN;D>@hPa}?Edb)
z?j5j(m_+095nJ|wmC*}cJ}9v7zw=FfcUiN|-aV0Lu9=)qzW)Eqw=%=#uKD`w+TWGT
zI#yR-`~P@d{XiF@CbBZ`(%J3L+1wA=&UeIj@_$G7Pv02nUfm!CC!wnS6Cni@%Kw;e
aHv4S-zy4%}On-enkYS##elF{r5}E+iShHvV

diff --git a/fabric/src/main/resources/assets/advanced_debug/advanced_debug.png b/fabric/src/main/resources/assets/advanced_debug/advanced_debug.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ce208341dde2bf94b410ca53d5826d5b20a9ace
GIT binary patch
literal 407
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7?_xWRHv9tCXiw*4sv&5Sa(k5C6L3C?&#~t
zz_78O`%fY(kk1+56XMFSwe-N7I|&z7D0SXc1PK;+L>4nJ@ErzW#^d=bQh=t2d%8G=
zRNQ)dXCvnU10GjL{g<k?sjEU1ZwN677UeS(e$_Wo@tg!lX`5E<1{#G7{x)pQl-V|k
z5m}6Z;S2LBw$9y>JgA}z<R{39O|pH5D$1~h`B1adrt8&c!fzX1F+O@%@d8aagFS>_
z=;1+7SRjD~vKyLQ9dBcp!GPp?h&PtJV&_282x8u6_CWY?$$ax;tohqpA`f~u><7tu
My85}Sb4q9e0P)jad;kCd

literal 0
HcmV?d00001

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index baf50ba..13f56ea 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/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": [
diff --git a/forge/build.gradle b/forge/build.gradle
index 1105bb2..81b50cb 100644
--- a/forge/build.gradle
+++ b/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)
diff --git a/forge/src/main/resources/advanced_debug.png b/forge/src/main/resources/advanced_debug.png
index 6624851fdb6758ed912bf078df84530a3ea3ff51..4ce208341dde2bf94b410ca53d5826d5b20a9ace 100644
GIT binary patch
literal 407
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7?_xWRHv9tCXiw*4sv&5Sa(k5C6L3C?&#~t
zz_78O`%fY(kk1+56XMFSwe-N7I|&z7D0SXc1PK;+L>4nJ@ErzW#^d=bQh=t2d%8G=
zRNQ)dXCvnU10GjL{g<k?sjEU1ZwN677UeS(e$_Wo@tg!lX`5E<1{#G7{x)pQl-V|k
z5m}6Z;S2LBw$9y>JgA}z<R{39O|pH5D$1~h`B1adrt8&c!fzX1F+O@%@d8aagFS>_
z=;1+7SRjD~vKyLQ9dBcp!GPp?h&PtJV&_282x8u6_CWY?$$ax;tohqpA`f~u><7tu
My85}Sb4q9e0P)jad;kCd

literal 2284
zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4YzZe)eHha1_hE&XXd&4$QHdLbF
zq4f_d^L-jjf=w)}UR@5t9@iQo7;h)=i@a&%>RcMIfk|N{N2{o}2+M>C!v7O(bP}w(
zERX)Sd3t@0W$}}p>(7Hs9>O5Z<m_jgFSYxBA6&eV-{6LI`TMEc`CI;eeSZ4OzyCkp
z-rORw?nUp!Zf1sL4q(^`F)#?IFfb^1FfcewU|?uaU}Ru$1O{;v3j+fSC+!s6{<X0F
z>*LKw*F0Ii`O7zReLZnyC%Zda{eOR~GxYlT>*V4u|L)S+N$9@bvR3}r<?!ynQzuia
z|6fkpwC;I&vwXsa_TL*{&!403rg_=7`hRKO0E8W~LvQun`}F$qeeunvdo84Q{V52p
z{yqD7^ZEV%{?*&Y_Jn;curK?2(eKgy{TKJ!FW$*WzX(QlBrK6-MB9I1Z|}ais_*>q
zb@RXb|7G3cd;P1q!L`4OH@^PAVaApn1MNWTs?*`(%e!yRn)jw%Z~x47;)_FN=l93f
zZ|N^jmVYq)Ixsc3=kwir`(Xe6i|^!nYa5O?@85r)@84fb3z=$$0Z$Cq`2XH}n6zcp
z`S*RX|9?;K7Sx{gFL(c2_T5K2L~G4{{5~8p&`zB7tWs{*>&4dZfnm2}b@%08+6`->
zx4*ae)3{F0Z~4U6y9YW2%zAEF`|keRvX|l?p03?4X1w6x?A7}(tN;D>@hPa}?Edb)
z?j5j(m_+095nJ|wmC*}cJ}9v7zw=FfcUiN|-aV0Lu9=)qzW)Eqw=%=#uKD`w+TWGT
zI#yR-`~P@d{XiF@CbBZ`(%J3L+1wA=&UeIj@_$G7Pv02nUfm!CC!wnS6Cni@%Kw;e
aHv4S-zy4%}On-enkYS##elF{r5}E+iShHvV

diff --git a/gradle.properties b/gradle.properties
index afb8847..164a0bf 100644
--- a/gradle.properties
+++ b/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
diff --git a/merge-fabric/build.gradle b/merge-fabric/build.gradle
index 82526cf..c71730f 100644
--- a/merge-fabric/build.gradle
+++ b/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
 //    }
 }
 
diff --git a/merge-fabric/src/main/resources/fabric.mod.json b/merge-fabric/src/main/resources/fabric.mod.json
index f6fa6dc..f545ab6 100644
--- a/merge-fabric/src/main/resources/fabric.mod.json
+++ b/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": [
diff --git a/merge-forge/build.gradle b/merge-forge/build.gradle
index 7898b27..4fda440 100644
--- a/merge-forge/build.gradle
+++ b/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
 //    }
 }
 
diff --git a/merge-forge/src/main/resources/META-INF/mods.toml b/merge-forge/src/main/resources/META-INF/mods.toml
index a12e54b..380b111 100644
--- a/merge-forge/src/main/resources/META-INF/mods.toml
+++ b/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