Updated to FG 5 and fixed mixins and FG

DynamXInc · Aug 3, 2023 · 1ef6455 · 1ef6455
1 parent 3d62708
commit 1ef6455
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.+'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
         classpath 'org.spongepowered:mixingradle:0.7.+'
     }
@@ -63,18 +63,19 @@ minecraft {
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.12.2-14.23.5.2860'
+    implementation ("net.minecraftforge:mergetool:0.2.3.3") { force = true }
 
     implementation 'com.github.stephengold:Libbulletjme:' + libbulletjme_version
     implementation "fr.aym.acsguis:ACsGuis:1.2.8"
     implementation ":ModProtectionLib:1.3.1"
-    implementation('org.spongepowered:mixin:0.8.3-SNAPSHOT') {
+    implementation('org.spongepowered:mixin:0.8.5') {
         exclude module: 'guava'
         exclude module: 'commons-io'
         exclude module: 'gson'
     }
     compileOnly 'org.projectlombok:lombok:1.18.24'
 
-    shadow('org.spongepowered:mixin:0.8.3-SNAPSHOT') {
+    shadow('org.spongepowered:mixin:0.8.5') {
         exclude module: 'guava'
         exclude module: 'commons-io'
         exclude module: 'gson'
@@ -84,12 +85,13 @@ dependencies {
     shadow fileTree(dir: 'libs', include: '*.jar')
 
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
-    annotationProcessor 'org.spongepowered:mixin:0.8.3-SNAPSHOT:processor'
-    testAnnotationProcessor 'org.spongepowered:mixin:0.8.3-SNAPSHOT:processor'
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    testAnnotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 
 mixin {
     add sourceSets.main, "refmap.dynamxmod.json"
+    config 'mixins.dynamxmod.json'
 }
 
 jar {
@@ -142,6 +144,9 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from(sourceSets.main.allSource) {
         include 'fr/**/**'
     }
+    from (sourceSets.main.output){
+        include '**'
+    }
     classifier = 'sources'
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists