-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Preparation neoforge #282
Open
DataDalton
wants to merge
6
commits into
pufferpanel:v3
Choose a base branch
from
DataDalton:patch-1
base: v3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+391
−16
Open
Preparation neoforge #282
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7394d3f
Prepare neoforge template
DataDalton 18424bb
Curseforge forge rename + curseforge neoforge + complete nminecraft t…
DataDalton 5ccb9d0
Remove -shim
DataDalton a58d160
Reorder
DataDalton b85f4b7
Update curseforge neoforge built-in packs
DataDalton 33366df
Add a default neoforge in minecraft
DataDalton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| [ | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-379757", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "21", | ||
| "projectId": "379757", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-574291", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "17", | ||
| "projectId": "574291", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-493082", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "17", | ||
| "projectId": "493082", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-447596", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "21", | ||
| "projectId": "447596", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-491512", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "21", | ||
| "projectId": "491512", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-572641", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "21", | ||
| "projectId": "572641", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-309625", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "17", | ||
| "projectId": "309625", | ||
| "fileId": "5181988" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| }, | ||
| { | ||
| "name": "minecraft-curseforge-neoforge-854426", | ||
| "variables": { | ||
| "memory": "4096", | ||
| "ip": "0.0.0.0", | ||
| "port": "25565", | ||
| "eula": true, | ||
| "javaversion": "17", | ||
| "projectId": "854426", | ||
| "fileId": "0" | ||
| }, | ||
| "environment": { | ||
| "type": "host" | ||
| } | ||
| } | ||
| ] |
156 changes: 156 additions & 0 deletions
156
minecraft-curseforge-neoforge/minecraft-curseforge-neoforge.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <a href='https://account.mojang.com/documents/minecraft_eula'>Minecraft EULA?</a>", | ||
| "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": "17", | ||
| "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": {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be better to just use 1.20.4 or something. Neo even suggests Forge for 1.20.1 instead. And, the actual changes are in the .2 onward.