updates forge version

Pokecube-Development · Jul 30, 2021 · 881511f · 881511f
1 parent 631c901
commit 881511f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -94,12 +94,17 @@ minecraft {
             }
         }
         data = {
-            taskName 'run_datagens'
-            workingDirectory project.file('run').canonicalPath
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            workingDirectory project.file('run')
+            //property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
+            properties 'mixin.env.remapRefMap': 'true'
+            property 'mixin.env.refMapRemappingFile', "${project.projectDir}/build/createSrgToMcp/output.srg"
             property 'forge.logging.console.level', 'debug'
             args '--mod', 'pokecube', '--all', '--output', file('src/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0]
-            source sourceSets.main
+            mods {
+                pokecube {
+                    source sourceSets.main
+                }
+            }
         }
     }
 }
@@ -145,6 +150,7 @@ repositories {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${version_minecraft}-${version_forge}"
+   // annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'
 
     //Computer Craft Support.
     implementation fg.deobf("org.squiddev:cc-tweaked-${version_cct_mc}:${version_cct}")
@@ -180,6 +186,10 @@ dependencies {
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${version_curios}:api")
 }
 
+sourceSets {
+    main.resources.srcDirs += 'src/generated/resources'
+}
+
 jar {
     manifest {
         attributes 'FMLAT': 'accesstransformer.cfg',

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-version_forge=36.1.4
+version_forge=36.2.2
 version_minecraft=1.16.5
 version_mcsupport=[1.16.5,1.17)
 version_mappings=1.16.5
@@ -16,7 +16,7 @@ version_thutcore=99
 version_major=3
 version_minor=12
 
-pre_release=true
+pre_release=false
 
 compile_name=pokecube-aio
 author_name=Thutmose