Sync with upstream

.gitignore

@@ -7,9 +7,9 @@ run
 run-data
 src/generated/resources/.cache
 jar
-/src/main/resources/assets/expandedae/textures/item/base_card.png
-/src/main/resources/assets/expandedae/textures/item/sticky_card_alternative.png
 /src/main/resources/temp.txt
 /scripting/
 /.env
-.gitignore
+.gitignore
+sources
+extra-mods

build.gradle

@@ -11,14 +11,10 @@ buildscript {
 plugins {
     id 'eclipse'
     id 'idea'
-    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
-    id 'org.spongepowered.mixin' version '0.7.+'
+    id 'net.neoforged.moddev.legacyforge' version '2.0.91'
     id 'io.freefair.lombok' version '8.13.1'
 }
 
-apply plugin: 'org.spongepowered.mixin'
-
 group = mod_group_id
 version = mod_version
 
@@ -30,58 +26,52 @@ java {
     toolchain.languageVersion = JavaLanguageVersion.of(17)
 }
 
-minecraft {
-    mappings channel: mapping_channel, version: mapping_version
-    copyIdeResources = true
+legacyForge {
+    version = project.minecraft_version + '-' + project.forge_version
+
     runs {
         configureEach {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
+            gameDirectory = project.file('run')
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+            logLevel = org.slf4j.event.Level.DEBUG
         }
 
         client {
-            property 'mixin.excludes', 'architectury.mixins.json'
-            arg "-mixin.config=mixins.${mod_id}.json"
-            arg "-XX:+AllowEnhancedClassRedefinition"
-            property 'forge.enabledGameTestNamespaces', mod_id
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'expandedae'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            mods {
-                expandedae {
-                    source sourceSets.main
-                }
-            }
+            client()
+            sourceSet = sourceSets.main
+
+
+            systemProperty 'mixin.excludes', 'architectury.mixins.json'
+            jvmArgument "-mixin.config=mixins.${mod_id}.json"
+            jvmArgument "-XX:+AllowEnhancedClassRedefinition"
+            systemProperty 'forge.enabledGameTestNamespaces', mod_id
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+            systemProperty 'forge.logging.console.level', 'debug'
+            systemProperty 'forge.enabledGameTestNamespaces', 'expandedae'
         }
 
         server {
-            property 'forge.enabledGameTestNamespaces', mod_id
-            args '--nogui'
-            arg "-mixin.config=mixins.${mod_id}.json"
-        }
-        gameTestServer {
-            property 'forge.enabledGameTestNamespaces', mod_id
+            server()
+            sourceSet = sourceSets.main
+
+            systemProperty 'forge.enabledGameTestNamespaces', mod_id
+            programArguments.addAll('--nogui', '--world', 'world-extra')
+            programArgument "-mixin.config=mixins.${mod_id}.json"
         }
 
         data {
-            workingDirectory project.file('run-data')
+            data()
+
+            sourceSet = sourceSets.main
 
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            programArguments.addAll('--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath())
+            programArguments.addAll('--existing-mod', 'ae2')
         }
     }
-    mixin {
-        add sourceSets.main, "mixins.${mod_id}.json"
-        defaultObfuscationEnv 'searge'
+    mods {
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
+        }
     }
 }
 
@@ -94,6 +84,9 @@ sourceSets {
     }
 }
 
+def extraModsDir = "extra-mods"
+file(extraModsDir).mkdir()
+
 repositories {
     mavenLocal()
     maven {
@@ -116,10 +109,6 @@ repositories {
     maven { // Registrate
         url "https://maven.tterrag.com/"
     }
-    maven {
-        name = "Illusive Soulworks maven"
-        url = "https://maven.theillusivec4.top/"
-    }
     maven {
         name = 'GTCEu Maven'
         url = 'https://maven.gtceu.com'
@@ -136,48 +125,55 @@ repositories {
         name = "Jared's maven"
         url = "https://maven.blamejared.com/"
     }
+    flatDir {
+        name "extra-mods"
+        dir file(extraModsDir)
+    }
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    implementation fg.deobf("appeng:appliedenergistics2-forge:$ae2_version")
-    implementation fg.deobf("curse.maven:guideme-1173950:6489464")
-
-    implementation fg.deobf("curse.maven:ex-pattern-provider-892005:6518515")
-    implementation fg.deobf("curse.maven:glodium-957920:5226922")
-
-    //runtimeOnly fg.deobf("curse.maven:modern-ae2-additions-1028068:6342203")
-
-    implementation fg.deobf("curse.maven:applied-energistics-2-wireless-terminals-459929:5217955")
-    runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137938")
-    runtimeOnly fg.deobf("curse.maven:curios-309927:6418456")
-
-    runtimeOnly fg.deobf("curse.maven:geckolib-388172:6027567")
-    implementation fg.deobf("curse.maven:mega-cells-622112:6175008")
-    runtimeOnly fg.deobf("curse.maven:cloth-config-348521:5729105")
-
-    runtimeOnly fg.deobf("curse.maven:jade-324717:6271651")
-    runtimeOnly fg.deobf("curse.maven:observable-509575:5643037")
-    runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137938")
-    runtimeOnly fg.deobf("curse.maven:kotlin-for-forge-351264:5402061")
-
-    implementation 'org.spongepowered:mixin:0.8.5'
+    // literally AE2
+    modImplementation "appeng:appliedenergistics2-forge:$ae2cl_version"
+    modImplementation "curse.maven:guideme-1173950:6489464"
+
+    // AE Addons
+    modImplementation "curse.maven:applied-energistics-2-wireless-terminals-459929:5217955"
+    modImplementation "curse.maven:mega-cells-622112:6175008"
+    modImplementation "curse.maven:ex-pattern-provider-892005:6518515"
+    // And their dependencies
+    modImplementation "curse.maven:glodium-957920:5226922"
+    modRuntimeOnly "curse.maven:architectury-api-419699:5137938"
+    modRuntimeOnly "curse.maven:curios-309927:6418456"
+    modRuntimeOnly "curse.maven:geckolib-388172:6027567"
+    modRuntimeOnly "curse.maven:cloth-config-348521:5729105"
+
+    modImplementation("com.gregtechceu.gtceu:gtceu-1.20.1:$gtceu_version") { transitive = false }
+    modImplementation("com.lowdragmc.ldlib:ldlib-forge-1.20.1:$ldlib_version") { transitive = false }
+
+    modRuntimeOnly "curse.maven:jade-324717:6271651"
+    modRuntimeOnly "curse.maven:observable-509575:5643037"
+    modRuntimeOnly "curse.maven:architectury-api-419699:5137938"
+    modRuntimeOnly "curse.maven:kotlin-for-forge-351264:5402061"
+
+    modRuntimeOnly "curse.maven:patchouli-306770:6164575"
+    modImplementation "dev.emi:emi-forge:${emi_version}"
+    modRuntimeOnly("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
+
+    for (extraModJar in fileTree(dir: "extra-mods", include: '*.jar')) {
+        def basename = extraModJar.name.substring(0, extraModJar.name.length() - ".jar".length())
+        def versionSep = basename.lastIndexOf('-')
+        assert versionSep != -1
+        def artifactId = basename.substring(0, versionSep)
+        def version = basename.substring(versionSep + 1)
+        modRuntimeOnly "extra-mods:$artifactId:$version"
+    }
+
+    compileOnly "org.jetbrains:annotations:26.0.2-1"
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
-    implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.4.1")) {
-        jarJar.ranged(it, "[0.4.1,)")
-    }
-
-    runtimeOnly fg.deobf("curse.maven:patchouli-306770:6164575")
-
-    implementation fg.deobf("curse.maven:ars-energistique-905641:5504444")
-    runtimeOnly fg.deobf("curse.maven:ars-nouveau-401955:5894609")
-
-    implementation fg.deobf("dev.emi:emi-forge:${emi_version}")
-    runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"))
+    implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.4.1"))
 }
 
-
 tasks.named('processResources', ProcessResources).configure {
     var replaceProperties = [minecraft_version   : minecraft_version, minecraft_version_range: minecraft_version_range,
                              forge_version       : forge_version, forge_version_range: forge_version_range,
@@ -218,35 +214,11 @@ mixin {
     add sourceSets.main, "mixins.expandedae.refmap.json"
     config "mixins.expandedae.json"
 }
-jarJar.enable()
-reobf {
-    jarJar { }
-}
 
-tasks.jarJar.finalizedBy('reobfJarJar')
-
-sourceSets {
-    main {
-        ext.refMap = "mixins.${mod_id}.refmap.json"
-    }
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            groupId = 'lu.kolja'
-            artifactId = base.archivesName.get()
-            jarJar.component(it)
-            from components.java
-        }
-    }
-    repositories {
-        maven {
-            url = "https://maven.gtceu.com"
-            credentials {
-                username = System.getenv("MAVEN_USER")
-                password = System.getenv("MAVEN_PASSWORD")
-            }
-        }
+jar {
+    manifest {
+        attributes([
+                "MixinConfigs": "mixins.expandedae.json"
+        ])
     }
-}
+}

gradle.properties

@@ -6,18 +6,21 @@ minecraft_version_range=[1.20.1,1.21)
 forge_version=47.4.0
 forge_version_range=[47,)
 loader_version_range=[47,)
-ae2_version=15.4.7-cosmolite.8
-jei_version=15.20.0.112
-emi_version=1.1.21+1.20.1
-curios_version=5.12.1+1.20.1
 
 mapping_channel=official
 mapping_version=1.20.1
 
 mod_id=expandedae
 mod_name=Expanded AE
 mod_license=GNU Lesser General Public License v3.0
-mod_version=1.2.0-cosmolite.6
+mod_version=1.3.1-cosmolite.32
 mod_group_id=lu.kolja
 mod_authors=Kolja
 mod_description=Bigger pattern provider and more QoL features
+
+ae2cl_version=15.4.10-cosmolite.32
+jei_version=15.20.0.115
+emi_version=1.1.21+1.20.1
+curios_version=5.12.1+1.20.1
+gtceu_version=7.3.0
+ldlib_version=1.0.40.b

settings.gradle

@@ -1,15 +1,12 @@
 pluginManagement {
     repositories {
-        gradlePluginPortal()
-        maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
+        gradlePluginPortal() // Needed for spotless
+        maven { url = 'https://maven.minecraftforge.net/' }
+        maven { url = 'https://maven.parchmentmc.org' }
     }
 }
-
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
-rootProject.name = 'expandedae'
+rootProject.name = 'expandedae'

src/generated/resources/assets/expandedae/blockstates/exp_energy_cell.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "fullness=0": {
+      "model": "expandedae:block/exp_energy_cell_0"
+    },
+    "fullness=1": {
+      "model": "expandedae:block/exp_energy_cell_1"
+    },
+    "fullness=2": {
+      "model": "expandedae:block/exp_energy_cell_2"
+    },
+    "fullness=3": {
+      "model": "expandedae:block/exp_energy_cell_3"
+    },
+    "fullness=4": {
+      "model": "expandedae:block/exp_energy_cell_4"
+    }
+  }
+}