More fixes

AppliedEnergistics · Nov 6, 2023 · 08b19ab · 08b19ab
1 parent c737752
commit 08b19ab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,6 @@
 
 plugins {
     id "net.neoforged.gradle.userdev"
-    id "net.neoforged.gradle.mixin"
     id "maven-publish"
     id "com.diffplug.spotless"
     id "com.github.johnrengelman.shadow"
@@ -299,7 +298,7 @@ def commonRunProperties = {
 //    jvmArgs "--add-opens", "java.base/java.util.jar=ALL-UNNAMED"
     systemProperties = commonSystemProperties
     // property "mixin.debug.export", "true"
-    modSources = [sourceSets.main]
+    modSources = [sourceSets.main, project(":libs:markdown").sourceSets.main]
 }
 
 ////////////////////
@@ -315,10 +314,6 @@ minecraft {
     }
 }
 
-mixin {
-    config "ae2.mixins.json"
-}
-
 runs {
     client {
         with commonRunProperties
@@ -348,7 +343,7 @@ runs {
         with commonRunProperties
     }
     data {
-        with commonRunProperties
+        modSources.add(project(":libs:markdown").getSourceSets().main)
         programArguments = [
                 '--mod', 'ae2',
                 '--all',

diff --git a/settings.gradle b/settings.gradle
@@ -16,8 +16,7 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'net.neoforged.gradle.userdev' version '7.0.5'
-        id 'net.neoforged.gradle.mixin' version '7.0.5'
+        id 'net.neoforged.gradle.userdev' version '7.0.33'
         id 'com.diffplug.spotless' version '5.12.4'
         id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
         id 'com.github.johnrengelman.shadow' version '7.0.0'

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -13,6 +13,7 @@ modId="ae2"
 version="0.0.0"
 displayName="Applied Energistics 2"
 description="A Mod about Matter, Energy and using them to conquer the world.."
+mixin="ae2.mixins.json"
 
 [[dependencies.ae2]]
     modId="neoforge"