5.2 Update

JackyyTV · Sep 2, 2023 · 561b9ed · 561b9ed
1 parent ab162e1
commit 561b9ed
Show file tree

Hide file tree

Showing 41 changed files with 494 additions and 220 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,33 +1,35 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-    }
-}
 plugins {
     id 'eclipse'
+    id 'idea'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
-apply plugin: 'net.minecraftforge.gradle'
 
 import net.minecraftforge.gradle.common.tasks.SignJar
 
 version = "${mc_version}-${mod_version}"
-group = 'jackyy.simplesponge'
-archivesBaseName = "${mod_name}"
+group = "jackyy.${mod_id}"
+base {
+    archivesName = jar_name
+}
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
-    mappings channel: "${mappings_channel}", version: "${mappings_version}"
+    mappings channel: mappings_channel, version: mappings_version
+    copyIdeResources = true
     runs {
-        client {
+        configureEach {
             workingDirectory project.file('run')
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
+            mods {
+                "${mod_id}" {
+                    source sourceSets.main
+                }
+            }
+        }
+        client {
             if (project.hasProperty('mcUUID')) {
                 args '--uuid', project.getProperty('mcUUID')
             }
@@ -37,32 +39,13 @@ minecraft {
             if (project.hasProperty('mcAccessToken')) {
                 args '--accessToken', project.getProperty('mcAccessToken')
             }
-            mods {
-                simplesponge {
-                    source sourceSets.main
-                }
-            }
         }
         server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            mods {
-                simplesponge {
-                    source sourceSets.main
-                }
-            }
+            args '--nogui'
         }
         data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            args '--mod', 'simplesponge', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-            mods {
-                simplesponge {
-                    source sourceSets.main
-                }
-            }
+            workingDirectory project.file('run-data')
+            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
         }
     }
 }
@@ -71,11 +54,8 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
     maven {
-        name = 'JEI Maven'
-        url = 'https://dvs1.progwml6.com/files/maven'
-        content {
-            includeGroup 'mezz.jei'
-        }
+        name = 'ModMaven'
+        url = 'https://modmaven.dev'
     }
     maven {
         name = 'Curse Maven'
@@ -92,18 +72,34 @@ dependencies {
     implementation fg.deobf("mezz.jei:jei-1.16.5:+")
     implementation fg.deobf("curse.maven:hwyla-253449:3033593") //1.10.11-B78_1.16.2
 
-    implementation fg.deobf("curse.maven:gunpowderlib-356646:3198017") //1.16.5-1.2.2
+    implementation fg.deobf("curse.maven:gunpowderlib-356646:4515267") //1.16.5-1.2.3
+}
+
+tasks.named('processResources', ProcessResources).configure {
+    var replaceProperties = [
+            mc_version: mc_version, mc_version_range: mc_version_range,
+            forge_version: forge_version, forge_version_range: forge_version_range,
+            loader_version_range: loader_version_range,
+            mod_id: mod_id, mod_name: mod_name, jar_name: jar_name,
+            mod_license: mod_license, mod_version: mod_version,
+            mod_authors: mod_authors, mod_description: mod_description
+    ]
+    inputs.properties replaceProperties
+
+    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+        expand replaceProperties + [project: project]
+    }
 }
 
 jar {
     manifest {
         attributes([
-                "Specification-Title": "${mod_name}",
-                "Specification-Version": "${project.mc_version}-${project.mod_version}",
-                "Specification-Vendor": "Jackyy",
-                "Implementation-Title": "${mod_name}",
-                "Implementation-Version": "${project.mc_version}-${project.mod_version}",
-                "Implementation-Vendor" :"Jackyy",
+                "Specification-Title": jar_name,
+                "Specification-Version": "${mc_version}-${mod_version}",
+                "Specification-Vendor": mod_authors,
+                "Implementation-Title": jar_name,
+                "Implementation-Version": "${mc_version}-${mod_version}",
+                "Implementation-Vendor": mod_authors,
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
@@ -113,8 +109,6 @@ tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
-jar.finalizedBy('reobfJar')
-
 task signJar(type: SignJar, dependsOn: jar) {
     keyStore = project.findProperty('keyStore')
     alias = project.findProperty('keyStoreAlias')
@@ -126,6 +120,8 @@ task signJar(type: SignJar, dependsOn: jar) {
 
 build.dependsOn signJar
 
+jar.finalizedBy('reobfJar')
+
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
     archiveClassifier.set("sources")

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,20 @@
 org.gradle.jvmargs=-Xmx4G
-mod_name=SimpleSponge
+
+mod_id=simplesponge
+jar_name=SimpleSponge
+mod_name=Simple Sponge
+
 mc_version=1.16.5
+mc_version_range=[1.16,1.17)
+
 forge_version=36.2.39
-mod_version=5.1.2
+forge_version_range=[35,)
+loader_version_range=[35,)
+
 mappings_channel=snapshot
 mappings_version=20210309-1.16.5
+
+mod_version=5.2
+mod_license=MIT License (Original OpenBlocks codes and art assets), Jacky's Minecraft Mods License (The rest of the codes and art assets)
+mod_authors=Jackyy, ThatGamerBlue
+mod_description=OpenBlocks Sponge port for 1.10+, with some extra sprinkles!
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists