Skip to content

Commit

Permalink
fix: Remove MC and URL. Typo in Fabric-function. wget if curl is unav…
Browse files Browse the repository at this point in the history 
…ailable in bash.
  • Loading branch information
@Griefed
Griefed committed Jul 22, 2024
1 parent c426640 commit af69564
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 91 deletions.
4 changes: 0 additions & 4 deletions HELP.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,11 @@ The following placeholders will be replaced by ServerPackCreator during the crea
| SPC_MINECRAFT_VERSION_SPC | The Minecraft version of the modpack from which the server pack is created. |
| SPC_MODLOADER_SPC | The modloader of the modpack from which the server pack is created. |
| SPC_MODLOADER_VERSION_SPC | The modloader version of the modpack from which the server pack is created. |
| SPC_MINECRAFT_SERVER_URL_SPC | The download URL corresponding to the Minecraft version of the modpack from which the server pack is created. |
| SPC_JAVA_ARGS_SPC | Java JVM args which are to be used when running the server pack. |
| SPC_JAVA_SPC | `java` by default. Start scripts in ZIP-archives will always receive `java` as the value. You may change the value in the table provided in the GUI if you need a different Java path for local testing and debugging. Scripts in the unzipped server pack will have the custom value avaiable. |
| SPC_FABRIC_INSTALLER_VERSION_SPC | The latest release version of the Fabric installer during creation. |
| SPC_QUILT_INSTALLER_VERSION_SPC | The latest release version of the Quilt installer during creation. |
| SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC | The latest release version of the LegacyFabric installer during creation. |
| SPC_NEOFORGE_INSTALLER_URL_SPC | The URL to the NeoForge installer for the given Minecraft & NeoForge version, supplied during creation. |
| SPC_RECOMMENDED_JAVA_VERSION_SPC | The recommended Java version to use with the modded server, as stated by Mojang themselves. |
| SPC_WAIT_FOR_USER_INPUT_SPC | true/false allows you to enable/disable user confirmation upon graceful script ending. |
| SPC_ADDITIONAL_ARGS_SPC | Additional arguments to supply to the JVM when starting the server. `-Dlog4j2.formatMsgNoLookups=true` by default. |
Expand All @@ -130,8 +128,6 @@ The contents of the variables are as follows. See `### Default values` above for
| LEGACYFABRIC_INSTALLER_VERSION | SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC |
| FABRIC_INSTALLER_VERSION | SPC_FABRIC_INSTALLER_VERSION_SPC |
| QUILT_INSTALLER_VERSION | SPC_QUILT_INSTALLER_VERSION_SPC |
| NEOFORGE_INSTALLER_URL | SPC_NEOFORGE_INSTALLER_URL_SPC |
| MINECRAFT_SERVER_URL | SPC_MINECRAFT_SERVER_URL_SPC |
| RECOMMENDED_JAVA_VERSION | SPC_RECOMMENDED_JAVA_VERSION_SPC |
| JAVA_ARGS | "SPC_JAVA_ARGS_SPC" |
| JAVA | "SPC_JAVA_SPC" |
Expand Down
3 changes: 0 additions & 3 deletions ...eator-api/src/main/kotlin/de/griefed/serverpackcreator/api/config/ConfigurationHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,6 @@ class ConfigurationHandler(
*
* 1. `SPC_SERVERPACKCREATOR_VERSION_SPC` : `ServerPackCreator version with which the scripts were created`
* 1. `SPC_MINECRAFT_VERSION_SPC` : `Minecraft version of the modpack`
* 1. `SPC_MINECRAFT_SERVER_URL_SPC` : `Download-URL to the Minecraft server
` *
* 1. `SPC_MODLOADER_SPC` : `The modloader of the modpack`
* 1. `SPC_MODLOADER_VERSION_SPC` : `The modloader version of the modpack
Expand Down Expand Up @@ -613,10 +612,8 @@ class ConfigurationHandler(
packConfig.scriptSettings["SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC"] = versionMeta.legacyFabric.releaseInstaller()

if (server.isEmpty || server.get().url().isEmpty) {
packConfig.scriptSettings["SPC_MINECRAFT_SERVER_URL_SPC"] = ""
packConfig.scriptSettings["SPC_RECOMMENDED_JAVA_VERSION_SPC"] = ""
} else {
packConfig.scriptSettings["SPC_MINECRAFT_SERVER_URL_SPC"] = server.get().url().get().toString()
if (server.get().javaVersion().isPresent) {
packConfig.scriptSettings["SPC_RECOMMENDED_JAVA_VERSION_SPC"] = server.get().javaVersion().get().toString()
} else {
Expand Down
3 changes: 0 additions & 3 deletions serverpackcreator-api/src/main/kotlin/de/griefed/serverpackcreator/api/config/PackConfig.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ private const val spcQuiltInstallerVersionKey = "SPC_QUILT_INSTALLER_VERSION_SPC

private const val spcLegacyFabricInstallerVersionKey = "SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC"

private const val spcMinecraftServerUrlKey = "SPC_MINECRAFT_SERVER_URL_SPC"

private const val spcWaitForUserInputKey = "SPC_WAIT_FOR_USER_INPUT_SPC"

private const val spcRestartServerKey = "SPC_RESTART_SPC"
Expand All @@ -178,7 +176,6 @@ private val scriptSettingsDefaultKeys = arrayOf(
spcFabricInstallerVersionKey,
spcQuiltInstallerVersionKey,
spcLegacyFabricInstallerVersionKey,
spcMinecraftServerUrlKey,
spcWaitForUserInputKey,
spcRestartServerKey,
spcSkipJavaCheckKey,
Expand Down
15 changes: 5 additions & 10 deletions ...ator-api/src/main/kotlin/de/griefed/serverpackcreator/api/serverpack/ServerPackHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,13 @@ class ServerPackHandler(
# - No 'java' command be available OR
# - The available Java version behind 'java' be incompatible with your Minecraft version.
# JABBA_VERSION has no effect on the installation of Jabba when using PowerShell.
# MINECRAFT_VERSION should be edited manually. If you change this version, then MINECRAFT_SERVER_URL will no longer
# point at the correct server JAR required to run your server. If you find that the Minecraft version is
# incorrect, please contact the creator of this server pack. If you created this server pack yourself,
# please regenerate it with the correct Minecraft version.
# The same applies to MODLOADER_VERSION when you are using NeoForge.
# MINECRAFT_VERSION is tightly coupled with the modloader version. Be careful when changing this, as the new
# new version you set may not be compatible with the modloader and modloader version combination.
# MODLOADER and MODLOADER_VERSION same thing as with MINECRAFT_VERSION. Changing any of these three values may
# have unforseen consequences. Well, I say unforseen, it mostly causes the server to straight up not start,
# because of incompatibilities. Be very careful when changing these!
#
# DO NOT EDIT THE FOLLOWING VARIABLES MANUALLY
# - MINECRAFT_VERSION
# - MINECRAFT_SERVER_URL
# - MODLOADER
# - MODLOADER_VERSION when using NeoForge.
# - FABRIC_INSTALLER_VERSION
# - QUILT_INSTALLER_VERSION
# - LEGACYFABRIC_INSTALLER_VERSION
Expand All @@ -144,7 +140,6 @@ class ServerPackHandler(
LEGACYFABRIC_INSTALLER_VERSION=SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC
FABRIC_INSTALLER_VERSION=SPC_FABRIC_INSTALLER_VERSION_SPC
QUILT_INSTALLER_VERSION=SPC_QUILT_INSTALLER_VERSION_SPC
MINECRAFT_SERVER_URL=SPC_MINECRAFT_SERVER_URL_SPC
RECOMMENDED_JAVA_VERSION=SPC_RECOMMENDED_JAVA_VERSION_SPC
JAVA_ARGS="SPC_JAVA_ARGS_SPC"
JAVA="SPC_JAVA_SPC"
Expand Down
4 changes: 0 additions & 4 deletions serverpackcreator-api/src/main/resources/HELP.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,11 @@ The following placeholders will be replaced by ServerPackCreator during the crea
| SPC_MINECRAFT_VERSION_SPC | The Minecraft version of the modpack from which the server pack is created. |
| SPC_MODLOADER_SPC | The modloader of the modpack from which the server pack is created. |
| SPC_MODLOADER_VERSION_SPC | The modloader version of the modpack from which the server pack is created. |
| SPC_MINECRAFT_SERVER_URL_SPC | The download URL corresponding to the Minecraft version of the modpack from which the server pack is created. |
| SPC_JAVA_ARGS_SPC | Java JVM args which are to be used when running the server pack. |
| SPC_JAVA_SPC | `java` by default. Start scripts in ZIP-archives will always receive `java` as the value. You may change the value in the table provided in the GUI if you need a different Java path for local testing and debugging. Scripts in the unzipped server pack will have the custom value avaiable. |
| SPC_FABRIC_INSTALLER_VERSION_SPC | The latest release version of the Fabric installer during creation. |
| SPC_QUILT_INSTALLER_VERSION_SPC | The latest release version of the Quilt installer during creation. |
| SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC | The latest release version of the LegacyFabric installer during creation. |
| SPC_NEOFORGE_INSTALLER_URL_SPC | The URL to the NeoForge installer for the given Minecraft & NeoForge version, supplied during creation. |
| SPC_RECOMMENDED_JAVA_VERSION_SPC | The recommended Java version to use with the modded server, as stated by Mojang themselves. |
| SPC_WAIT_FOR_USER_INPUT_SPC | true/false allows you to enable/disable user confirmation upon graceful script ending. |
| SPC_ADDITIONAL_ARGS_SPC | Additional arguments to supply to the JVM when starting the server. `-Dlog4j2.formatMsgNoLookups=true` by default. |
Expand All @@ -130,8 +128,6 @@ The contents of the variables are as follows. See `### Default values` above for
| LEGACYFABRIC_INSTALLER_VERSION | SPC_LEGACYFABRIC_INSTALLER_VERSION_SPC |
| FABRIC_INSTALLER_VERSION | SPC_FABRIC_INSTALLER_VERSION_SPC |
| QUILT_INSTALLER_VERSION | SPC_QUILT_INSTALLER_VERSION_SPC |
| NEOFORGE_INSTALLER_URL | SPC_NEOFORGE_INSTALLER_URL_SPC |
| MINECRAFT_SERVER_URL | SPC_MINECRAFT_SERVER_URL_SPC |
| RECOMMENDED_JAVA_VERSION | SPC_RECOMMENDED_JAVA_VERSION_SPC |
| JAVA_ARGS | "SPC_JAVA_ARGS_SPC" |
| JAVA | "SPC_JAVA_SPC" |
Expand Down
Loading

0 comments on commit af69564

Please sign in to comment.