1.18.2

forge is temp. disabled

Author: triphora

.github/workflows/build.yml

@@ -10,6 +10,14 @@ jobs:
         with:
           distribution: adopt
           java-version: 17
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/loom-cache
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle
       - working-directory: fabric/
-        run: curl -o voxelmap-1.18.1-1.10.20.jar https://cdn.discordapp.com/attachments/931521967385878559/932560873543835689/voxelmap-1.18.1-1.10.20.jar
+        run: curl -o voxelmap-1.18.2-1.11.1.jar https://cdn.discordapp.com/attachments/931521967385878559/947927139330715668/voxelmap-1.18.2-1.11.1.jar
       - run: ./gradlew build --no-daemon

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
           distribution: adopt
           java-version: 17
       - working-directory: fabric/
-        run: curl -o voxelmap-1.18.1-1.10.20.jar https://cdn.discordapp.com/attachments/931521967385878559/932560873543835689/voxelmap-1.18.1-1.10.20.jar
+        run: curl -o voxelmap-1.18.2-1.11.1.jar https://cdn.discordapp.com/attachments/931521967385878559/947927139330715668/voxelmap-1.18.2-1.11.1.jar
       - run: "./gradlew build :forge:modrinth :fabric:modrinth publish --no-daemon"
         env:
           MAVEN_URL: "https://maven.frydae.dev/releases"

.gitignore

@@ -18,4 +18,5 @@ detonatedmods/
 generated/
 .architectury-transformer/
 credentials.properties
-*.jar
+*.jar
+!gradle/wrapper/gradle-wrapper.jar

build.gradle

@@ -1,7 +1,7 @@
 plugins {
   id "architectury-plugin" version "3.4.+"
   id "dev.architectury.loom" version "0.11.0.+" apply false
-  id "com.modrinth.minotaur" version "1.2.+" apply false
+  id "com.modrinth.minotaur" version "2.+" apply false
   id "io.github.juuxel.loom-quiltflower" version "1.+" apply false
 }
 

common/build.gradle

@@ -3,5 +3,5 @@ dependencies {
 }
 
 architectury {
-  common()
+  common(false)
 }

common/src/main/java/dev/frydae/emcutils/features/VaultScreen.java

@@ -171,8 +171,8 @@ private void handleClick(int buttonX, double mouseX, double mouseY, String comma
   }
 
   @Override
-  public void onClose() {
-    if (shouldCallClose) super.onClose();
+  public void close() {
+    if (shouldCallClose) super.close();
     else shouldCallClose = true;
   }
 }

fabric/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     exclude group: "net.fabricmc"
   }
 
-  modImplementation files("voxelmap-1.18.1-1.10.20.jar")
+  modImplementation files("voxelmap-1.18.2-1.11.1.jar")
   modCompileOnly "curse.maven:xmm-263420:${rootProject.xmm_version}"
   modCompileOnly "curse.maven:xwm-317780:${rootProject.xwm_version}"
 
@@ -89,18 +89,14 @@ components.java {
   }
 }
 
-//noinspection UnnecessaryQualifiedReference
-task modrinth(type: com.modrinth.minotaur.TaskModrinthUpload) {
-  onlyIf { System.getenv().MODRINTH_TOKEN }
-  token = System.getenv().MODRINTH_TOKEN
+modrinth {
   projectId = "QYTT62S0"
-  versionNumber = mod_version + "+fabric"
+  versionNumber = rootProject.mod_version + "+fabric"
   versionName = rootProject.release_title + " (Fabric)"
   changelog = rootProject.changeLog
   uploadFile = remapJar
-  versionType = "beta"
-  addGameVersion(mc_version)
-  addLoader("fabric")
+  gameVersions = ["1.18.2"]
+  loaders = ["fabric"]
 }
 
 publishing {

forge/build.gradle

@@ -76,18 +76,14 @@ components.java {
   }
 }
 
-//noinspection UnnecessaryQualifiedReference
-task modrinth(type: com.modrinth.minotaur.TaskModrinthUpload) {
-  onlyIf { System.getenv().MODRINTH_TOKEN }
-  token = System.getenv().MODRINTH_TOKEN
+modrinth {
   projectId = "QYTT62S0"
-  versionNumber = mod_version + "+forge"
+  versionNumber = rootProject.mod_version + "+forge"
   versionName = rootProject.release_title + " (Forge)"
   changelog = rootProject.changeLog
   uploadFile = remapJar
-  versionType = "beta"
-  addGameVersion(mc_version)
-  addLoader("forge")
+  gameVersions = ["1.18.2"]
+  loaders = ["forge"]
 }
 
 publishing {

gradle.properties

@@ -2,28 +2,28 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-mc_version=1.18.1
-mod_version=3.0.0-beta.2
+mc_version=1.18.2
+mod_version=3.0.0
 
 release_title=
 changeLog=
 
 # https://fabricmc.net/develop
-yarn_mappings=22
+yarn_mappings=1
 loader_version=0.13.3
-fabric_version=0.46.4+1.18
+fabric_version=0.47.8+1.18.2
 
 # https://files.minecraftforge.net/
-forge_version=39.0.88
+forge_version=40.0.1
 
 # https://maven.shedaniel.me/dev/architectury/architectury/
-architectury_version=3.7.20
+architectury_version=4.0.25
 
 # https://modrinth.com/mod/midnightlib/versions
 midnightlib_version=0.4.0
 
 # https://modrinth.com/mod/modmenu/versions
-modmenu_version=3.0.1
+modmenu_version=3.1.0
 
 # https://www.curseforge.com/minecraft/mc-mods/config-menus-forge/files/all
 config_menus_version=3570070
@@ -32,9 +32,9 @@ config_menus_version=3570070
 # voxel_version=3345206
 
 # https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap/files/all
-xmm_version=3647008
+xmm_version=3667603
 # https://www.curseforge.com/minecraft/mc-mods/xaeros-world-map/files/all
-xwm_version=3646988
+xwm_version=3667607
 
 # https://mvnrepository.com/artifact/org.projectlombok/lombok
 lombok_version=1.18.22

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.5-20220218231220+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.5-20220301231428+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -22,4 +22,4 @@ pluginManagement {
 
 include 'common'
 include 'fabric'
-include 'forge'
+//include 'forge'