1.20 update

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build 1.19.x
+name: Build 1.20.x
 
 on:
   push:

.github/workflows/test.yml

@@ -1,11 +1,11 @@
-name: Test 1.19.x
+name: Test 1.20.x
 
 on:
   push:
     branches:
-      - 1.19.4
+      - 1.20.x
   pull_request:
-    branches: [ 1.19.4 ]
+    branches: [ 1.20.x ]
 
 jobs:
   main:

build.gradle

@@ -1,33 +1,20 @@
-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'org.spongepowered:mixingradle:0.7.+'
-    }
-}
-
 plugins {
     id 'com.matthewprenger.cursegradle' version '1.4.0'
     id 'idea'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'maven-publish'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-apply plugin: 'maven-publish'
-
 def envVersion = System.getenv('VERSION')
 version = envVersion == null ? '0.0.0-indev' : envVersion
 group = 'com.eerussianguy.betterfoliage' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'betterfoliage'
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println("Java: ${System.getProperty("java.version")} JVM: ${System.getProperty("java.vm.version")} (${System.getProperty("java.vendor")}) Arch: ${System.getProperty("os.arch")}")
+println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
-    mappings channel: 'official', version: '1.19.4'
+    mappings channel: 'official', version: '1.20'
     runs {
         client {
             workingDirectory project.file('run')
@@ -44,28 +31,14 @@ minecraft {
             }
         }
 
-        server {
-            workingDirectory project.file('run')
-
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                betterfoliage {
-                    source sourceSets.main
-                }
-            }
-        }
     }
 }
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.4-45.0.43'
+    minecraft 'net.minecraftforge:forge:1.20-46.0.1'
 
     //runtimeOnly fg.deobf('bop:BiomesOPlenty-1.18.2:16.0.0.109-universal')
     //runtimeOnly fg.deobf('tb:TerraBlender-forge-1.18.2:1.1.0.102')
@@ -85,7 +58,7 @@ jar {
             "Specification-Vendor": "eerussianguy",
             "Specification-Version": "1", // We are version 1 of ourselves
             "Implementation-Title": project.name,
-            "Implementation-Version": "${project.version}",
+            "Implementation-Version": "${project.jar.archiveVersion}",
             "Implementation-Vendor" :"eerussianguy",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists