浏览代码

Update MCP, MC, Forge and gradle

malte0811 4 年之前
父节点
当前提交
2fad25372d
共有 3 个文件被更改,包括 16 次插入6 次删除
  1. 11 1
      build.gradle
  2. 4 4
      gradle.properties
  3. 1 1
      gradle/wrapper/gradle-wrapper.properties

+ 11 - 1
build.gradle

@@ -112,7 +112,7 @@ repositories{
 
 dependencies {
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
-    runtimeOnly fg.deobf("mezz.jei:jei-1.16.3:7.6.0.49")
+    annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
@@ -152,3 +152,13 @@ build.dependsOn signJar
 mixin {
     add sourceSets.main, "${modid}.refmap.json"
 }
+
+// Prevent Mixin annotation processor from getting into IDEA's annotation processor settings
+// Copied from Botania
+if (System.getProperty("idea.sync.active") == "true") {
+    afterEvaluate {
+        tasks.withType(JavaCompile).all {
+            it.options.annotationProcessorPath = files()
+        }
+    }
+}

+ 4 - 4
gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 mod_version=1.1.1
 modid=ferritecore
-mc_version=1.16.4
-forge_version=35.1.13
-mapping=20200916
-mcp_version=1.16.2
+mc_version=1.16.5
+forge_version=36.0.0
+mapping=20201028
+mcp_version=1.16.3

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip