Update to 1.20

Miki-Tellurium · Jun 8, 2023 · 0800527 · 0800527
1 parent c295d44
commit 0800527
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 97 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,141 +1,119 @@
 buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
-        maven {
-            url = 'https://repo.spongepowered.org/repository/maven-public/'
-            content { includeGroup "org.spongepowered" }
-        }
-        mavenCentral()
-    }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.7.+'
     }
 }
-apply plugin: 'net.minecraftforge.gradle'
+
+plugins {
+    id 'java'
+    id 'eclipse'
+    id 'maven-publish'
+    id 'net.minecraftforge.gradle' version '5.1.+'
+}
+apply plugin: 'java'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '1.0.2-1.19.4-forge'
-group = 'com.mikitellurium.potionsreglint' 
-archivesBaseName = 'potionsreglint'
+archivesBaseName = project.mod_id
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+mixin {
+    add sourceSets.main, "potionsreglint.refmap.json"
+    config "mixins.potionsreglint.json"
+}
 
-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: mc_version
+
     runs {
         client {
             workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'potionsreglint'
+            ideaModule "${rootProject.name}.${project.name}.main"
+            taskName 'runClient'
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
             mods {
-                potionsreglint {
+                modClientRun {
                     source sourceSets.main
                 }
             }
         }
 
         server {
             workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'potionsreglint'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
-            mods {
-                potionsreglint {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        gameTestServer {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'potionsreglint'
+            ideaModule "${rootProject.name}.${project.name}.main"
+            taskName 'runServer'
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
             mods {
-                potionsreglint {
+                modServerRun {
                     source sourceSets.main
                 }
             }
         }
 
         data {
             workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
+            ideaModule "${rootProject.name}.${project.name}.main"
+            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            taskName 'runData'
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
-            args '--mod', 'potionsreglint', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
             mods {
-                potionsreglint {
+                modDataRun {
                     source sourceSets.main
                 }
             }
         }
     }
 }
 
-
-sourceSets.main.resources { srcDir 'src/generated/resources' }
+sourceSets.main.resources.srcDir 'src/generated/resources'
 
 repositories {
-
-}
-
-dependencies {
-
-    minecraft 'net.minecraftforge:forge:1.19.4-45.0.25'
-
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-}
-
-mixin {
-    // MixinGradle Settings
-    add sourceSets.main, 'mixins.potionsreglint.refmap.json'
-    config 'mixins.potionsreglint.json'
-
-    debug.verbose = true
-    debug.export = true
-}
+    mavenCentral()
 
-jar {
-    manifest {
-        attributes([
-                "Specification-Title"     : "Potions Re-Glint",
-                "Specification-Vendor"    : "Miki Tellurium",
-                "Specification-Version"   : "1.0.2-1.19.4-forge",
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "Miki Tellurium",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
+    maven {
+        name = 'Sponge / Mixin'
+        url = 'https://repo.spongepowered.org/repository/maven-public/'
     }
-}
 
+    dependencies {
+        minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+        annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    }
 
-jar.finalizedBy('reobfJar')
+    jar {
+        manifest {
+            attributes([
+                    'Specification-Title'     : "Potions Re-Glint",
+                    'Specification-Vendor'    : "Miki Tellurium",
+                    'Specification-Version'   : project.jar.archiveVersion,
+                    'Implementation-Title'    : project.name,
+                    'Implementation-Version'  : project.jar.archiveVersion,
+                    'Implementation-Vendor'   : "Miki Tellurium",
+                    'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+                    'Timestamp'               : System.currentTimeMillis(),
+                    'Built-On-Java'           : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
+                    'Built-On-Minecraft'      : mc_version
+            ])
+        }
+    }
 
+    jar.finalizedBy('reobfJar')
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' 
-}
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                groupId project.group
+                artifactId project.archivesBaseName
+                version project.version
+                artifact jar
+            }
+        }
+        repositories {
+            maven {
+                url "file://" + System.getenv("local_maven")
+            }
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,12 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.19.4
+# Project
+version=1.1.0-1.20-forge
+group=com.mikitellurium.potionsreglint
+mod_id=potionsreglint
+
+mc_version=1.20
+
+# Forge
+forge_version=46.0.1
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,10 +1,10 @@
 modLoader="javafml" #mandatory
-loaderVersion="[45,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[46,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 license="All rights reserved"
 #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
 [[mods]] #mandatory
 modId="potionsreglint" #mandatory
-version="1.0.2-1.19.4" #mandatory
+version="1.1.0-1.20" #mandatory
  # A display name for the mod
 displayName="Potions Re-Glint" #mandatory
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
@@ -23,12 +23,12 @@ description='''Adds back the enchantment glint to potions'''
 [[dependencies.potionsreglint]] #optional
     modId="forge" #mandatory
     mandatory=true #mandatory
-    versionRange="[45.0.25,)" #mandatory
+    versionRange="[46.0.1,)" #mandatory
     ordering="NONE"
     side="BOTH"
 [[dependencies.potionsreglint]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.19.4,1.20)"
+    versionRange="[1.20,1.21)"
     ordering="NONE"
     side="BOTH"