From 7394d3faac620852cb8103ed133877cb1a13a5d4 Mon Sep 17 00:00:00 2001 From: DataDalton <127766912+DataDalton@users.noreply.github.com> Date: Fri, 31 May 2024 21:32:30 -0400 Subject: [PATCH 1/6] Prepare neoforge template --- minecraft/minecraft.json | 95 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 4 deletions(-) diff --git a/minecraft/minecraft.json b/minecraft/minecraft.json index 7d31cce..bc8b5d6 100644 --- a/minecraft/minecraft.json +++ b/minecraft/minecraft.json @@ -11,6 +11,14 @@ "required": true, "userEdit": true }, + "neoforgebuild": { + "type": "string", + "value": "", + "display": "NeoForge Version", + "desc": "Version of NeoForge to install (may be located here", + "required": false, + "userEdit": true + }, "forgebuild": { "type": "string", "value": "", @@ -64,13 +72,17 @@ "display": "None/Vanilla" }, { - "value": "fabric", - "display": "Fabric" + "value": "neoforge", + "display": "NeoForge" }, { "value": "forge", "display": "MinecraftForge" }, + { + "value": "fabric", + "display": "Fabric" + }, { "value": "paper", "display": "Paper" @@ -121,6 +133,15 @@ "required": true, "userEdit": true, "internal": true + }, + "resolvedNeoForgeVersion": { + "type": "string", + "value": "", + "display": "Resolved NeoForge Version", + "desc": "Internal, resolved version of NeoForge", + "required": true, + "userEdit": true, + "internal": true } }, "groups": [ @@ -140,6 +161,15 @@ ], "order": 1 }, + { + "if": "modlauncher == 'neoforge'", + "display": "NeoForge", + "description": "Settings if using NeoForge", + "variables": [ + "neoforgebuild" + ], + "order": 2 + }, { "if": "modlauncher == 'forge'", "display": "Forge", @@ -147,7 +177,7 @@ "variables": [ "forgebuild" ], - "order": 2 + "order": 3 }, { "if": "modlauncher == 'paper'", @@ -156,7 +186,7 @@ "variables": [ "paperbuild" ], - "order": 3 + "order": 4 } ], "install": [ @@ -189,6 +219,40 @@ "java -jar fabric-installer.jar server -mcversion ${version} -downloadMinecraft -noprofile" ] }, + { + "if": "modlauncher == 'neoforge'", + "type": "neoforgedl", + "target": "installer.jar", + "version": "${neoforgebuild}", + "minecraftVersion": "${version}", + "outputVariable": "resolvedNeoForgeVersion" + }, + { + "if": "modlauncher == 'neoforge' && env == 'host'", + "type": "command", + "commands": [ + "java${javaversion} -jar installer.jar --installServer" + ] + }, + { + "if": "modlauncher == 'neoforge' && env != 'host'", + "type": "command", + "commands": [ + "java -jar installer.jar --installServer" + ] + }, + { + "if": "modlauncher == 'neoforge' && file_exists('neoforge-' + neoforgebuild + '-shim.jar')", + "type": "move", + "source": "neoforge-${neoforgebuild}-shim.jar", + "target": "server.jar" + }, + { + "if": "modlauncher == 'neoforge' && file_exists('neoforge-' + neoforgebuild + '.jar')", + "type": "move", + "source": "neoforge-${neoforgebuild}.jar", + "target": "server.jar" + }, { "if": "modlauncher == 'forge'", "type": "forgedl", @@ -277,6 +341,22 @@ ], "run": { "command": [ + { + "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", + "if": "env == 'host' && modlauncher == 'neoforge' && os == 'windows' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion + '/win_args.txt')" + }, + { + "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", + "if": "env == 'host' && modlauncher == 'neoforge' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion + '/unix_args.txt')" + }, + { + "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", + "if": "env != 'host' && modlauncher == 'neoforge' && os == 'windows' && file_exists('libraries/net/neoforged/nepforge/' + resolvedNeoForgeVersion + '/win_args.txt')" + }, + { + "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", + "if": "env != 'host' && modlauncher == 'neoforge' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion+ '/unix_args.txt')" + }, { "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/minecraftforge/forge/${resolvedForgeVersion}/win_args.txt nogui", "if": "env == 'host' && modlauncher == 'forge' && os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + resolvedForgeVersion + '/win_args.txt')" @@ -310,6 +390,13 @@ } ], "pre": [ + { + "if": "modlauncher == 'neoforge'", + "type": "resolveneoforgeversion", + "minecraftVersion": "${version}", + "version": "${neoforgebuild}", + "outputVariable": "resolvedNeoForgeVersion" + }, { "if": "modlauncher == 'forge'", "type": "resolveforgeversion", From 18424bb5c808e8ede447637f558e72466c918976 Mon Sep 17 00:00:00 2001 From: Dalton Date: Fri, 31 May 2024 21:50:58 -0400 Subject: [PATCH 2/6] Curseforge forge rename + curseforge neoforge + complete nminecraft template --- .../data.json | 16 +- .../minecraft-curseforge-forge.json | 4 +- minecraft-curseforge-neoforge/data.json | 122 ++++++++++++++ .../minecraft-curseforge-neoforge.json | 156 ++++++++++++++++++ 4 files changed, 288 insertions(+), 10 deletions(-) rename {minecraft-curseforge => minecraft-curseforge-forge}/data.json (83%) rename minecraft-curseforge/minecraft-curseforge.json => minecraft-curseforge-forge/minecraft-curseforge-forge.json (98%) create mode 100644 minecraft-curseforge-neoforge/data.json create mode 100644 minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json diff --git a/minecraft-curseforge/data.json b/minecraft-curseforge-forge/data.json similarity index 83% rename from minecraft-curseforge/data.json rename to minecraft-curseforge-forge/data.json index 91731c9..49104be 100644 --- a/minecraft-curseforge/data.json +++ b/minecraft-curseforge-forge/data.json @@ -1,6 +1,6 @@ [ { - "name": "minecraft-curseforge-715572", + "name": "minecraft-curseforge-forge-715572", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -15,7 +15,7 @@ } }, { - "name": "minecraft-curseforge-389615", + "name": "minecraft-curseforge-forge-389615", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -30,7 +30,7 @@ } }, { - "name": "minecraft-curseforge-285109", + "name": "minecraft-curseforge-forge-285109", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -45,7 +45,7 @@ } }, { - "name": "minecraft-curseforge-876781", + "name": "minecraft-curseforge-forge-876781", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -60,7 +60,7 @@ } }, { - "name": "minecraft-curseforge-829758", + "name": "minecraft-curseforge-forge-829758", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -75,7 +75,7 @@ } }, { - "name": "minecraft-curseforge-520914", + "name": "minecraft-curseforge-forge-520914", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -90,7 +90,7 @@ } }, { - "name": "minecraft-curseforge-466901", + "name": "minecraft-curseforge-forge-466901", "variables": { "memory": "4096", "ip": "0.0.0.0", @@ -105,7 +105,7 @@ } }, { - "name": "minecraft-curseforge-887839", + "name": "minecraft-curseforge-forge-887839", "variables": { "memory": "4096", "ip": "0.0.0.0", diff --git a/minecraft-curseforge/minecraft-curseforge.json b/minecraft-curseforge-forge/minecraft-curseforge-forge.json similarity index 98% rename from minecraft-curseforge/minecraft-curseforge.json rename to minecraft-curseforge-forge/minecraft-curseforge-forge.json index 51c7e5c..a2752ca 100644 --- a/minecraft-curseforge/minecraft-curseforge.json +++ b/minecraft-curseforge-forge/minecraft-curseforge-forge.json @@ -54,7 +54,7 @@ "projectId": { "type": "integer", "value": 0, - "display": "Project Id", + "display": "Project ID", "desc": "Project Id for the modpack desired. This is found on the modpack's webpage on the right side.", "required": true, "userEdit": false @@ -62,7 +62,7 @@ "fileId": { "type": "integer", "value": 0, - "display": "File Id", + "display": "File ID", "desc": "File Id for the modpack desired. This is found at the end of the URL for the specific file desired.", "required": true, "userEdit": false diff --git a/minecraft-curseforge-neoforge/data.json b/minecraft-curseforge-neoforge/data.json new file mode 100644 index 0000000..e51628c --- /dev/null +++ b/minecraft-curseforge-neoforge/data.json @@ -0,0 +1,122 @@ +[ + { + "name": "minecraft-curseforge-neoforge-715572", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "17", + "projectId": "715572", + "fileId": "0" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-389615", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "8", + "projectId": "389615", + "fileId": "0" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-285109", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "8", + "projectId": "285109", + "fileId": "0" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-876781", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "17", + "projectId": "876781", + "fileId": "0" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-829758", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "17", + "projectId": "829758", + "fileId": "0" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-520914", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "17", + "projectId": "520914", + "fileId": "0" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-466901", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "17", + "projectId": "466901", + "fileId": "5181988" + }, + "environment": { + "type": "host" + } + }, + { + "name": "minecraft-curseforge-neoforge-887839", + "variables": { + "memory": "4096", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "javaversion": "17", + "projectId": "887839", + "fileId": "0" + }, + "environment": { + "type": "host" + } + } +] \ No newline at end of file diff --git a/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json b/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json new file mode 100644 index 0000000..b80758d --- /dev/null +++ b/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json @@ -0,0 +1,156 @@ +{ + "type": "minecraft-java", + "display": "Minecraft: Java Edition (Curseforge Modpack)", + "icon": "minecraft-java", + "data": { + "eula": { + "type": "boolean", + "value": false, + "display": "EULA Agreement (true/false)", + "desc": "Do you (or the server owner) agree to the Minecraft EULA?", + "required": true, + "userEdit": true + }, + "ip": { + "type": "string", + "value": "0.0.0.0", + "display": "IP", + "desc": "What IP to bind the server to", + "required": true, + "userEdit": false + }, + "javaversion": { + "type": "string", + "value": "21", + "display": "Java Version", + "desc": "Version of Java to use", + "required": true, + "userEdit": true + }, + "jvmArgs": { + "type": "string", + "value": "-Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true", + "display": "JVM Arguments", + "desc": "Extra JVM arguments to pass", + "required": false, + "userEdit": false + }, + "memory": { + "type": "integer", + "value": 1024, + "display": "Memory (MB)", + "desc": "How much memory in MB to allocate to the Java Heap", + "required": true, + "userEdit": false + }, + "port": { + "type": "integer", + "value": 25565, + "display": "Port", + "desc": "What port to bind the server to", + "required": true, + "userEdit": false + }, + "projectId": { + "type": "integer", + "value": 0, + "display": "Project ID", + "desc": "Project ID for the modpack desired. This is found on the modpack's webpage on the right side.", + "required": true, + "userEdit": false + }, + "fileId": { + "type": "integer", + "value": 0, + "display": "File ID", + "desc": "File ID for the modpack desired. This is found at the end of the URL for the specific file desired.", + "required": true, + "userEdit": false + } + }, + "install": [ + { + "if": "javaversion != ''", + "type": "javadl", + "version": "${javaversion}" + }, + { + "if": "env == 'host'", + "type": "curseforge", + "projectId": "${projectId}", + "fileId": "${fileId}", + "java": "java${javaversion}" + }, + { + "if": "env != 'host'", + "type": "curseforge", + "projectId": "${projectId}", + "fileId": "${fileId}" + }, + { + "if": "!file_exists(\"server.properties\")", + "type": "writefile", + "text": "server-ip=${ip}\nserver-port=${port}\n", + "target": "server.properties" + }, + { + "type": "writefile", + "text": "eula=${eula}", + "target": "eula.txt" + } + ], + "run": { + "command": [ + { + "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", + "if": "env == 'host' && os == 'windows' && !file_exists('server.jar')" + }, + { + "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", + "if": "env == 'host' && !file_exists('server.jar')" + }, + { + "command": "java -Xmx${memory}M ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", + "if": "env != 'host' && os == 'windows' && !file_exists('server.jar')" + }, + { + "command": "java -Xmx${memory}M ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", + "if": "env == 'host' && !file_exists('server.jar')" + }, + { + "command": "java${javaversion} -Xmx${memory}M ${jvmArgs} -jar server.jar nogui", + "if": "env == 'host'" + }, + { + "command": "java -Xmx${memory}M ${jvmArgs} -jar server.jar nogui" + } + ], + "pre": [ + { + "if": "!file_exists('server.jar')", + "type": "resolveneoforgeversion", + "outputVariable": "resolvedNeoForgeVersion" + } + ], + "stop": "stop", + "stdin": { + "type": "stdin" + }, + "autostart": false, + "autorecover": false, + "autorestart": false + }, + "environment": { + "type": "host" + }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "eclipse-temurin:${javaversion}" + } + ], + "requirements": {} +} From 5ccb9d0e21c8dc65f76221b2df9349742031a57d Mon Sep 17 00:00:00 2001 From: Dalton Date: Fri, 31 May 2024 22:04:39 -0400 Subject: [PATCH 3/6] Remove -shim --- minecraft/minecraft.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/minecraft/minecraft.json b/minecraft/minecraft.json index bc8b5d6..67403f0 100644 --- a/minecraft/minecraft.json +++ b/minecraft/minecraft.json @@ -241,12 +241,6 @@ "java -jar installer.jar --installServer" ] }, - { - "if": "modlauncher == 'neoforge' && file_exists('neoforge-' + neoforgebuild + '-shim.jar')", - "type": "move", - "source": "neoforge-${neoforgebuild}-shim.jar", - "target": "server.jar" - }, { "if": "modlauncher == 'neoforge' && file_exists('neoforge-' + neoforgebuild + '.jar')", "type": "move", From a58d16047c220e8dffa4e168c227804d9771a189 Mon Sep 17 00:00:00 2001 From: Dalton Date: Fri, 31 May 2024 22:10:08 -0400 Subject: [PATCH 4/6] Reorder --- minecraft/minecraft.json | 128 +++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/minecraft/minecraft.json b/minecraft/minecraft.json index 67403f0..ce0c90b 100644 --- a/minecraft/minecraft.json +++ b/minecraft/minecraft.json @@ -11,19 +11,19 @@ "required": true, "userEdit": true }, - "neoforgebuild": { + "forgebuild": { "type": "string", "value": "", - "display": "NeoForge Version", - "desc": "Version of NeoForge to install (may be located here", + "display": "Forge Version", + "desc": "Version of Forge to install (may be located here", "required": false, "userEdit": true }, - "forgebuild": { + "neoforgebuild": { "type": "string", "value": "", - "display": "Forge Version", - "desc": "Version of Forge to install (may be located here", + "display": "NeoForge Version", + "desc": "Version of NeoForge to install (may be located here", "required": false, "userEdit": true }, @@ -37,7 +37,7 @@ }, "javaversion": { "type": "string", - "value": "17", + "value": "21", "display": "Java Version", "desc": "Version of Java to use", "required": true, @@ -71,14 +71,14 @@ "value": "", "display": "None/Vanilla" }, - { - "value": "neoforge", - "display": "NeoForge" - }, { "value": "forge", "display": "MinecraftForge" }, + { + "value": "neoforge", + "display": "NeoForge" + }, { "value": "fabric", "display": "Fabric" @@ -162,20 +162,20 @@ "order": 1 }, { - "if": "modlauncher == 'neoforge'", - "display": "NeoForge", - "description": "Settings if using NeoForge", + "if": "modlauncher == 'forge'", + "display": "Forge", + "description": "Settings if using MinecraftForge", "variables": [ - "neoforgebuild" + "forgebuild" ], "order": 2 }, { - "if": "modlauncher == 'forge'", - "display": "Forge", - "description": "Settings if using MinecraftForge", + "if": "modlauncher == 'neoforge'", + "display": "NeoForge", + "description": "Settings if using NeoForge", "variables": [ - "forgebuild" + "neoforgebuild" ], "order": 3 }, @@ -220,65 +220,65 @@ ] }, { - "if": "modlauncher == 'neoforge'", - "type": "neoforgedl", + "if": "modlauncher == 'forge'", + "type": "forgedl", "target": "installer.jar", - "version": "${neoforgebuild}", + "version": "${forgebuild}", "minecraftVersion": "${version}", - "outputVariable": "resolvedNeoForgeVersion" + "outputVariable": "resolvedForgeVersion" }, { - "if": "modlauncher == 'neoforge' && env == 'host'", + "if": "modlauncher == 'forge' && env == 'host'", "type": "command", "commands": [ "java${javaversion} -jar installer.jar --installServer" ] }, { - "if": "modlauncher == 'neoforge' && env != 'host'", + "if": "modlauncher == 'forge' && env != 'host'", "type": "command", "commands": [ "java -jar installer.jar --installServer" ] }, { - "if": "modlauncher == 'neoforge' && file_exists('neoforge-' + neoforgebuild + '.jar')", + "if": "modlauncher == 'forge' && file_exists('forge-' + forgebuild + '-shim.jar')", "type": "move", - "source": "neoforge-${neoforgebuild}.jar", + "source": "forge-${forgebuild}-shim.jar", "target": "server.jar" }, { - "if": "modlauncher == 'forge'", - "type": "forgedl", + "if": "modlauncher == 'forge' && file_exists('forge-' + forgebuild + '.jar')", + "type": "move", + "source": "forge-${forgebuild}.jar", + "target": "server.jar" + }, + { + "if": "modlauncher == 'neoforge'", + "type": "neoforgedl", "target": "installer.jar", - "version": "${forgebuild}", + "version": "${neoforgebuild}", "minecraftVersion": "${version}", - "outputVariable": "resolvedForgeVersion" + "outputVariable": "resolvedNeoForgeVersion" }, { - "if": "modlauncher == 'forge' && env == 'host'", + "if": "modlauncher == 'neoforge' && env == 'host'", "type": "command", "commands": [ "java${javaversion} -jar installer.jar --installServer" ] }, { - "if": "modlauncher == 'forge' && env != 'host'", + "if": "modlauncher == 'neoforge' && env != 'host'", "type": "command", "commands": [ "java -jar installer.jar --installServer" ] }, { - "if": "modlauncher == 'forge' && file_exists('forge-' + forgebuild + '-shim.jar')", - "type": "move", - "source": "forge-${forgebuild}-shim.jar", - "target": "server.jar" - }, - { - "if": "modlauncher == 'forge' && file_exists('forge-' + forgebuild + '.jar')", + "if": "modlauncher == 'neoforge' && file_exists('neoforge-' + neoforgebuild + '.jar')", "type": "move", - "source": "forge-${forgebuild}.jar", + "source": "neoforge-${neoforgebuild}.jar", "target": "server.jar" }, { @@ -335,22 +335,6 @@ ], "run": { "command": [ - { - "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", - "if": "env == 'host' && modlauncher == 'neoforge' && os == 'windows' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion + '/win_args.txt')" - }, - { - "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", - "if": "env == 'host' && modlauncher == 'neoforge' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion + '/unix_args.txt')" - }, - { - "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", - "if": "env != 'host' && modlauncher == 'neoforge' && os == 'windows' && file_exists('libraries/net/neoforged/nepforge/' + resolvedNeoForgeVersion + '/win_args.txt')" - }, - { - "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", - "if": "env != 'host' && modlauncher == 'neoforge' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion+ '/unix_args.txt')" - }, { "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/minecraftforge/forge/${resolvedForgeVersion}/win_args.txt nogui", "if": "env == 'host' && modlauncher == 'forge' && os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + resolvedForgeVersion + '/win_args.txt')" @@ -367,6 +351,22 @@ "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/minecraftforge/forge/${resolvedForgeVersion}/unix_args.txt nogui", "if": "env != 'host' && modlauncher == 'forge' && file_exists('libraries/net/minecraftforge/forge/' + resolvedForgeVersion+ '/unix_args.txt')" }, + { + "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", + "if": "env == 'host' && modlauncher == 'neoforge' && os == 'windows' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion + '/win_args.txt')" + }, + { + "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", + "if": "env == 'host' && modlauncher == 'neoforge' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion + '/unix_args.txt')" + }, + { + "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/win_args.txt nogui", + "if": "env != 'host' && modlauncher == 'neoforge' && os == 'windows' && file_exists('libraries/net/neoforged/nepforge/' + resolvedNeoForgeVersion + '/win_args.txt')" + }, + { + "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} @libraries/net/neoforged/neoforge/${resolvedNeoForgeVersion}/unix_args.txt nogui", + "if": "env != 'host' && modlauncher == 'neoforge' && file_exists('libraries/net/neoforged/neoforge/' + resolvedNeoForgeVersion+ '/unix_args.txt')" + }, { "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true ${jvmArgs} -jar fabric-server-launch.jar", "if": "env == 'host' && modlauncher == 'fabric'" @@ -384,19 +384,19 @@ } ], "pre": [ - { - "if": "modlauncher == 'neoforge'", - "type": "resolveneoforgeversion", - "minecraftVersion": "${version}", - "version": "${neoforgebuild}", - "outputVariable": "resolvedNeoForgeVersion" - }, { "if": "modlauncher == 'forge'", "type": "resolveforgeversion", "minecraftVersion": "${version}", "version": "${forgebuild}", "outputVariable": "resolvedForgeVersion" + }, + { + "if": "modlauncher == 'neoforge'", + "type": "resolveneoforgeversion", + "minecraftVersion": "${version}", + "version": "${neoforgebuild}", + "outputVariable": "resolvedNeoForgeVersion" } ], "stop": "stop", From b85f4b7bd3f300c5b9cb5588cf61a064e09f11f4 Mon Sep 17 00:00:00 2001 From: Dalton Date: Fri, 31 May 2024 22:34:58 -0400 Subject: [PATCH 5/6] Update curseforge neoforge built-in packs --- minecraft-curseforge-neoforge/data.json | 44 ++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/minecraft-curseforge-neoforge/data.json b/minecraft-curseforge-neoforge/data.json index e51628c..dd2e259 100644 --- a/minecraft-curseforge-neoforge/data.json +++ b/minecraft-curseforge-neoforge/data.json @@ -1,13 +1,13 @@ [ { - "name": "minecraft-curseforge-neoforge-715572", + "name": "minecraft-curseforge-neoforge-379757", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, - "javaversion": "17", - "projectId": "715572", + "javaversion": "21", + "projectId": "379757", "fileId": "0" }, "environment": { @@ -15,14 +15,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-389615", + "name": "minecraft-curseforge-neoforge-574291", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, - "javaversion": "8", - "projectId": "389615", + "javaversion": "17", + "projectId": "574291", "fileId": "0" }, "environment": { @@ -30,14 +30,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-285109", + "name": "minecraft-curseforge-neoforge-493082", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, - "javaversion": "8", - "projectId": "285109", + "javaversion": "17", + "projectId": "493082", "fileId": "0" }, "environment": { @@ -45,14 +45,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-876781", + "name": "minecraft-curseforge-neoforge-447596", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, - "javaversion": "17", - "projectId": "876781", + "javaversion": "21", + "projectId": "447596", "fileId": "0" }, "environment": { @@ -60,14 +60,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-829758", + "name": "minecraft-curseforge-neoforge-491512", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, - "javaversion": "17", - "projectId": "829758", + "javaversion": "21", + "projectId": "491512", "fileId": "0" }, "environment": { @@ -75,14 +75,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-520914", + "name": "minecraft-curseforge-neoforge-572641", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, - "javaversion": "17", - "projectId": "520914", + "javaversion": "21", + "projectId": "572641", "fileId": "0" }, "environment": { @@ -90,14 +90,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-466901", + "name": "minecraft-curseforge-neoforge-309625", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, "javaversion": "17", - "projectId": "466901", + "projectId": "309625", "fileId": "5181988" }, "environment": { @@ -105,14 +105,14 @@ } }, { - "name": "minecraft-curseforge-neoforge-887839", + "name": "minecraft-curseforge-neoforge-854426", "variables": { "memory": "4096", "ip": "0.0.0.0", "port": "25565", "eula": true, "javaversion": "17", - "projectId": "887839", + "projectId": "854426", "fileId": "0" }, "environment": { From 33366df78cedee4a891c3ddb37320105551ab3cc Mon Sep 17 00:00:00 2001 From: Dalton Date: Fri, 31 May 2024 22:41:53 -0400 Subject: [PATCH 6/6] Add a default neoforge in minecraft Also change default minecraft back to java 17 for now --- .../minecraft-curseforge-neoforge.json | 2 +- minecraft/data.json | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json b/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json index b80758d..19cc869 100644 --- a/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json +++ b/minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json @@ -21,7 +21,7 @@ }, "javaversion": { "type": "string", - "value": "21", + "value": "17", "display": "Java Version", "desc": "Version of Java to use", "required": true, diff --git a/minecraft/data.json b/minecraft/data.json index 8e0ffe8..4e40cea 100644 --- a/minecraft/data.json +++ b/minecraft/data.json @@ -47,6 +47,22 @@ "type": "host" } }, + { + "name": "minecraft-neoforge", + "variables": { + "memory": "2048", + "ip": "0.0.0.0", + "port": "25565", + "eula": true, + "version": "1.20.1", + "motd": "None", + "javaversion": "17", + "modlauncher": "forge" + }, + "environment": { + "type": "host" + } + }, { "name": "minecraft-paper", "variables": {