update ae2 and clean up buildscript

Mari023 · Jun 24, 2024 · 7e96238 · 7e96238
1 parent 21252cb
commit 7e96238
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 48 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
     idea
 }
 
-val minecraftVersion: String by project
 val clothVersion: String by project
 val ae2Version: String by project
 val architecturyVersion: String by project
@@ -39,7 +38,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 dependencies {
     //implementation("top.theillusivec4.curios:curios-neoforge:${curiosVersion}")
-    implementation("appeng:appliedenergistics2-neoforge:${ae2Version}")
+    implementation("appeng:appliedenergistics2:${ae2Version}")
 
     compileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:${reiVersion}")
     compileOnly("mezz.jei:jei-${jeiMinecraftVersion}-neoforge:${jeiVersion}")
@@ -75,18 +74,10 @@ repositories {
     maven {
         url = uri("https://modmaven.dev/")
         content {
-            includeGroup("net.fabricmc.fabric-api")
             includeGroup("appeng")
             includeGroup("mezz.jei")
         }
     }
-    maven {
-        url = uri("https://maven.bai.lol")
-        content {
-            includeGroup("mcp.mobius.waila")
-            includeGroup("lol.bai")
-        }
-    }
     maven {
         url = uri("https://maven.shedaniel.me/")
         content {
@@ -98,34 +89,15 @@ repositories {
     maven {
         url = uri("https://maven.terraformersmc.com/")
         content {
-            includeGroup("com.terraformersmc")
             includeGroup("dev.emi")
         }
     }
-    maven {
-        url = uri("https://maven.ladysnake.org/releases")
-        content {
-            includeGroup("dev.onyxstudios.cardinal-components-api")
-        }
-    }
-    maven {
-        url = uri("https://maven.parchmentmc.net/")
-        content {
-            includeGroup("org.parchmentmc.data")
-        }
-    }
     maven {
         url = uri("https://maven.theillusivec4.top/")
         content {
             includeGroup("top.theillusivec4.curios")
         }
     }
-    maven {
-        url = uri("https://repo.spongepowered.org/maven")
-        content {
-            includeGroup("org.spongepowered")
-        }
-    }
     maven {
         url = uri("https://api.modrinth.com/maven")
         content {

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,12 @@
-minecraftVersion=1.201
 neoforgeVersion=21.0.30-beta
-neoForge.parchment.minecraftVersion=1.20.6
-neoForge.parchment.mappingsVersion=2024.05.01-nightly-SNAPSHOT
+neoForge.parchment.minecraftVersion=1.21
+neoForge.parchment.mappingsVersion=2024.06.23-nightly-SNAPSHOT
 
 # Mod Properties
 mavenGroup=de.mari_023
 modID=ae2wtlib
 
-ae2Version=19.0.4-alpha
+ae2Version=19.0.5-alpha
 curiosVersion=8.0.0-beta.4+1.20.6
 
 reiVersion=16.0.729
@@ -24,7 +23,7 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=true
 # Temp fix for Spotless
 # https://github.com/diffplug/spotless/issues/834
-org.gradle.jvmargs=-Xmx4G \
+org.gradle.jvmargs= \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,15 +1 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        mavenCentral()
-        maven {
-            name = "NeoForged"
-            url = uri("https://maven.neoforged.net/releases")
-            content {
-                includeGroup("net.neoforged")
-            }
-        }
-    }
-}
-
 rootProject.name = "ae2wtlib"