Initial 1.20.4 Neoforge port.

Flanks255 · Feb 14, 2024 · 26987d4 · 26987d4
1 parent 63cb147
commit 26987d4
Show file tree

Hide file tree

Showing 39 changed files with 528 additions and 672 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ build
 # other
 eclipse
 run
+runs
 
 # Files from Forge MDK
 forge*changelog.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,2 @@
+### [1.20.4 / 1.0.4]
+- Ported to 1.20.4 NeoForge
diff --git a/build.gradle b/build.gradle
@@ -1,91 +1,69 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.creeperhost.net/' }
-        maven { url = 'https://maven.minecraftforge.net' }
-        maven { url = 'https://maven.parchmentmc.org' }
-        maven { url = "https://plugins.gradle.org/m2/" }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-        classpath 'org.parchmentmc:librarian:1.+'
-        classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
-    }
+plugins {
+    id 'java-library'
+    id 'idea'
+    id 'maven-publish'
+    id 'net.neoforged.gradle.userdev' version '7.0.84'
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.parchmentmc.librarian.forgegradle'
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
-apply plugin: "com.matthewprenger.cursegradle"
-apply from: 'https://files.saps.dev/ci/git-md-changelog.gradle'
-apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'
 
 repositories {
     maven { url = 'https://maven.creeperhost.net/' }
     maven { url "https://www.cursemaven.com" }
-    maven { url "https://dvs1.progwml6.com/files/maven" }
 }
 
 def ENV = System.getenv()
 version = "${minecraft_version}-${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}"
 group = 'com.flanks255'
-archivesBaseName = 'pocketstorage'
+base {
+    archivesName = "pocketstorage"
+}
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-minecraft {
-    if (mappings_channel == "parchment_overlay") {
-        mappings channel: 'parchment', version: "$mappings_overlay-$mappings_version"
-    } else {
-        mappings channel: "$mappings_channel", version: "$mappings_version"
-    }
-    //accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-
-            mods {
-                pocketstorage {
-                    source sourceSets.main
-                }
-            }
-        }
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
-        server {
-            workingDirectory project.file('run')
+runs {
+    // applies to all the run configs below
+    configureEach {
+        //Limit ram usage for the dev environment to 4GB
+        jvmArgument '-Xmx8G'
 
-            args 'nogui'
+        modSource project.sourceSets.main
+    }
 
-            mods {
-                pocketstorage {
-                    source sourceSets.main
-                }
-            }
+    client {
+        systemProperty 'neoforge.enabledGameTestNamespaces', "pocketstorage"
+        programArguments.addAll('--width', '1280', '--height', '720')
+        if  (ENV.MCDEVUSER) {
+            programArguments.addAll('--username', ENV.MCDEVUSER)
+        }
+        if (ENV.MCDEVUUID) {
+            programArguments.addAll('--uuid', ENV.MCDEVUUID)
         }
+    }
 
-        data {
-            workingDirectory project.file('run')
+    server {
+        systemProperty 'neoforge.enabledGameTestNamespaces', "pocketstorage"
+        programArgument '--nogui'
+    }
 
-            args '--mod', 'pocketstorage', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+    gameTestServer {
+        systemProperty 'forge.enabledGameTestNamespaces', "pocketstorage"
+    }
 
-            mods {
-                pocketstorage {
-                    source sourceSets.main
-                }
-            }
-        }
+    data {
+        programArguments.addAll '--mod', "pocketstorage", '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
-sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-dependencies {
-    minecraft "net.minecraftforge:forge:$minecraft_version-$forge_version"
 
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}") //new
-    compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
+dependencies {
+    implementation "net.neoforged:neoforge:${neo_version}"
+    compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"//new
+    compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
+    runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
 //
 //    runtimeOnly fg.deobf("curse.maven:TOP-245211:3671753")
 //    runtimeOnly fg.deobf("curse.maven:FS-556861:3820051")
@@ -107,47 +85,44 @@ jar {
     }
 }
 
-def reobfFile = file("$buildDir/reobfJar/output.jar")
-def reobfArtifact = artifacts.add('default', reobfFile) {
-    type 'jar'
-    builtBy 'reobfJar'
-}
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
-            artifact(reobfArtifact) {
-                builtBy reobfArtifact
-                artifactId = archivesBaseName
-                classifier null
-            }
+        register('mavenJava', MavenPublication) {
+            groupId project.group
+            artifactId base.archivesName.get()
+            version project.version
+            from components.java
         }
     }
 
     repositories {
-if (ENV.SAPS_TOKEN) {
-maven {
-    url "https://maven.saps.dev/minecraft"
-    credentials {
-        username = "flanks"
-        password = "${ENV.SAPS_TOKEN}"
-    }
-}
-}
+        if (ENV.SAPS_TOKEN) {
+            maven {
+                url "https://maven.saps.dev/minecraft"
+                credentials {
+                    username = "flanks"
+                    password = "${ENV.SAPS_TOKEN}"
+                }
+            }
+        }
     }
 }
 
-if (ENV.CURSEFORGE_KEY) {
+//https://modmuss50.github.io/mod-publish-plugin/
+publishMods {
+    dryRun = !providers.environmentVariable("CURSEFORGE_KEY").isPresent()
+    file = jar.archiveFile
+    changelog = file("./CHANGELOG.md").text
+    modLoaders.add("NeoForge")
+    type = BETA
     curseforge {
-        apiKey = ENV.CURSEFORGE_KEY
-        project {
-            id = project.curseforge_id
-            releaseType = "beta"
-            addGameVersion "Forge"
-            addGameVersion "1.20.1"
-            mainArtifact(jar)
-            changelog = getGitChangelog
-            changelogType = 'markdown'
-        }
+        accessToken = providers.environmentVariable("CURSEFORGE_KEY")
+        projectId = project.curseforge_id
+        minecraftVersions.add(project.minecraft_version)
     }
 }
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,9 @@
 org.gradle.jvmargs=-Xmx6G
 org.gradle.daemon=false
 mod_version=1.0.4
-minecraft_version=1.20.1
-forge_version=47.0.35
-mappings_version=2023.07.02-1.20.1
-#this is the older one
-mappings_overlay=1.19.3
-mappings_channel=parchment
-jei_version=15.2.0.22
+minecraft_version=1.20.4
+neo_version=20.4.147-beta
+neogradle.subsystems.parchment.minecraftVersion=1.20.3
+neogradle.subsystems.parchment.mappingsVersion=2023.12.31
+jei_version=17.3.0.48
 curseforge_id=367734
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'Creeperhost Maven'
+            url = 'https://maven.creeperhost.net/'
+        }
+        maven {
+            name = 'Official NeoForge Maven'
+            url = 'https://maven.neoforged.net/releases'
+        }
+    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}
+rootProject.name = "pocketstorage"
diff --git a/src/generated/resources/.cache/1b4cfbe3eac3eb659ac6e8e1e54167c1ba5cf5d7 b/src/generated/resources/.cache/1b4cfbe3eac3eb659ac6e8e1e54167c1ba5cf5d7
@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-12T20:16:36.4337544	Item Models: pocketstorage
+// 1.20.4	2024-02-14T17:25:56.5080929	Item Models: pocketstorage
 d2088eb8aafe47e6697a5490bbe49b47adf4c3d7 assets/pocketstorage/models/item/psu_1.json
 d2088eb8aafe47e6697a5490bbe49b47adf4c3d7 assets/pocketstorage/models/item/psu_2.json
 d2088eb8aafe47e6697a5490bbe49b47adf4c3d7 assets/pocketstorage/models/item/psu_3.json

diff --git a/.../c622617f6fabf890a00b9275cd5f643584a8a2c8 → .../6ccc82dbae535bb2c1346a4947d4925358f3cc05 b/.../c622617f6fabf890a00b9275cd5f643584a8a2c8 → .../6ccc82dbae535bb2c1346a4947d4925358f3cc05
@@ -1,2 +1,2 @@
-// 1.20.1	2023-07-12T20:16:36.4382577	Languages: en_us
+// 1.20.4	2024-02-14T17:25:56.5121045	Languages: en_us for mod: pocketstorage
 e7d65f46436151223a4c0dc0337da428bb0ef0ce assets/pocketstorage/lang/en_us.json
diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,5 +1,5 @@
-// 1.20.1	2023-07-12T20:16:36.4362612	Recipes
+// 1.20.4	2024-02-14T17:28:30.3184491	Recipes
 5fdfeac43f0c108954af058160ea89bcde22ccf6 data/pocketstorage/recipes/tier1.json
-ad1d4f55149183f89fed58e620a9b77fd8705dd6 data/pocketstorage/recipes/tier2.json
-daafcd04c66d1dc30f9382758d59ed0db6607583 data/pocketstorage/recipes/tier3.json
-e8389405fb58004c0d9c996c3b683ef3c678b9fc data/pocketstorage/recipes/tier4.json
+244b3a73706e5f61db956fae3bd896cd13318494 data/pocketstorage/recipes/tier2.json
+aff707a6c099642cbc29afacd2d9cffb0bdfb5ad data/pocketstorage/recipes/tier3.json
+e4e1117d9c3cae7212ea2c5ef2ee0ed875f3558e data/pocketstorage/recipes/tier4.json
diff --git a/src/generated/resources/data/pocketstorage/recipes/tier2.json b/src/generated/resources/data/pocketstorage/recipes/tier2.json
@@ -1,28 +1,28 @@
 {
-  "type": "pocketstorage:data_upgrade",
-  "category": "misc",
-  "key": {
-    "A": {
-      "tag": "forge:ingots/gold"
+  "type": "pocketstorage:upgrade",
+  "value": {
+    "category": "misc",
+    "key": {
+      "A": {
+        "tag": "forge:ingots/gold"
+      },
+      "B": {
+        "item": "minecraft:piston"
+      },
+      "C": {
+        "tag": "forge:chests"
+      },
+      "D": {
+        "item": "pocketstorage:psu_1"
+      }
     },
-    "B": {
-      "item": "minecraft:piston"
-    },
-    "C": {
-      "tag": "forge:chests"
-    },
-    "D": {
-      "type": "pocketstorage:nbt_target",
-      "item": "pocketstorage:psu_1"
+    "pattern": [
+      "ABA",
+      "CDC",
+      "ABA"
+    ],
+    "result": {
+      "item": "pocketstorage:psu_2"
     }
-  },
-  "pattern": [
-    "ABA",
-    "CDC",
-    "ABA"
-  ],
-  "result": {
-    "item": "pocketstorage:psu_2"
-  },
-  "show_notification": false
+  }
 }
diff --git a/src/generated/resources/data/pocketstorage/recipes/tier3.json b/src/generated/resources/data/pocketstorage/recipes/tier3.json
@@ -1,28 +1,28 @@
 {
-  "type": "pocketstorage:data_upgrade",
-  "category": "misc",
-  "key": {
-    "A": {
-      "tag": "forge:gems/diamond"
+  "type": "pocketstorage:upgrade",
+  "value": {
+    "category": "misc",
+    "key": {
+      "A": {
+        "tag": "forge:gems/diamond"
+      },
+      "B": {
+        "item": "minecraft:piston"
+      },
+      "C": {
+        "tag": "forge:chests"
+      },
+      "D": {
+        "item": "pocketstorage:psu_2"
+      }
     },
-    "B": {
-      "item": "minecraft:piston"
-    },
-    "C": {
-      "tag": "forge:chests"
-    },
-    "D": {
-      "type": "pocketstorage:nbt_target",
-      "item": "pocketstorage:psu_2"
+    "pattern": [
+      "ABA",
+      "CDC",
+      "ABA"
+    ],
+    "result": {
+      "item": "pocketstorage:psu_3"
     }
-  },
-  "pattern": [
-    "ABA",
-    "CDC",
-    "ABA"
-  ],
-  "result": {
-    "item": "pocketstorage:psu_3"
-  },
-  "show_notification": false
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ build @@
     # other
     eclipse
     run
+    runs
     # Files from Forge MDK
     forge*changelog.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		### [1.20.4 / 1.0.4]
		- Ported to 1.20.4 NeoForge