diff --git a/.github/workflows/github-prerelease.yml b/.github/workflows/github-prerelease.yml
index fedcaa9df7adcb376ac05591beed9da978239943..3a3a0b42c610d8cd847f4fb571049dca08a42e0d 100644
--- a/.github/workflows/github-prerelease.yml
+++ b/.github/workflows/github-prerelease.yml
@@ -186,7 +186,7 @@ jobs:
# GENERATE RELEASE
- name: Create Release
id: create_release
- uses: softprops/action-gh-release@v2.1.0
+ uses: softprops/action-gh-release@v2.2.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ needs.preparations.outputs.version }}
diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml
index 959410d9ee933413cf667f0fa2456c8d4b7e87c7..b45c30ea0c915f8d487fefcd06a34634c3bef8b6 100644
--- a/.github/workflows/github_release.yml
+++ b/.github/workflows/github_release.yml
@@ -178,7 +178,7 @@ jobs:
# GENERATE RELEASE
- name: Create Release
id: create_release
- uses: softprops/action-gh-release@v2.1.0
+ uses: softprops/action-gh-release@v2.2.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ needs.preparations.outputs.version }}
@@ -283,7 +283,7 @@ jobs:
# DEPLOY TO GH-PAGES
- name: Deploy to GitHub-Pages
- uses: JamesIves/github-pages-deploy-action@v4.7.1
+ uses: JamesIves/github-pages-deploy-action@v4.7.3
with:
branch: gh-pages
folder: serverpackcreator-api/build/dokka
\ No newline at end of file
diff --git a/HELP.md b/HELP.md
index 36ad64c016c706094ef36cb2b05f760e750c68e4..b823c9f634e6176b19aca4d4cf0bb392bf81d7ca 100644
--- a/HELP.md
+++ b/HELP.md
@@ -309,11 +309,14 @@ This will disable the automatic updating of the `SPC_JAVA_SPC`-placeholder in yo
### Updating
If you wish to use the latest and greatest hits of clientside-only mods ServerPackCreator has to
-offer, you need to update it via **Menu Bar -> File -> Update Fallback Clientside Modslist** and
+offer, you need to update it via **Menu Bar -> Edit -> Update Fallback Clientside Modslist** and
then either
-- Clear your clientside-only mods list in your config, save it, then load it again (either via the
- menu or by restarting SPC)
+- In the GUI, head to the **Advanced Section** of your server pack config, to the clientside- and whitelist, and click the reset-button (cog with two red arrows)
+
+**OR**
+
+- Clear your clientside-only mods list in your config, save it, then load it again (either via the menu or by restarting SPC)
**OR**
@@ -325,8 +328,7 @@ then either
**OR**
-- Empty the clientside-mods field, save the configuration, load the configuration. This will fill it
- with the default clientside-mods list
+- Empty the clientside-mods field, save the configuration, load the configuration. This will fill it with the default clientside-mods list
If you added custom mods to this list, you must make sure you migrate them over to the new setting
yourself.
@@ -438,7 +440,29 @@ change `de.griefed.serverpackcreator.configuration.aikar` to your liking.
using the appropriate button in the GUI will result in the same setting for all server pack
configurations.
-## Excluding files from ZIP-archives
+## Excluding files
+
+### Using exclusion-filters
+
+You can specify exclusion-filters for every inclusion-specification of your server pack config.
+There are two ways of telling SPC to exclude files.
+
+1. Inclusion-specific exclusion
+
+This will exclude files only for the inclusion at hand. So if you specify an exclusion for, say, *config*, then only
+files from *config* will be excluded.
+
+Setting `config.brandon3055.servers.1234-5678-91011-121314.dat` as the exclusion-filter for *config* will
+exclude said file from the config-directory during server pack generation.
+
+2. Global exclusion
+
+If you specify an exclusion-filter for an inclusion-spec *without setting a source*, then it will be treated as a global
+exclusion-filter, which can and will affect every single inclusion-spec in your server pack.
+
+Setting `.*.png`, for example, will exclude every *.png*-file from your server pack.
+
+### From ZIP-archives
You can globally configure files which should be excluded from ZIP-archives.
To do so, you need to edit your `serverpackcreator.properties`-file and change
@@ -1103,6 +1127,32 @@ Note: This path will not be present in the `variables.txt` in the ZIP-archive of
+## Tips
+
+1. You can save the currently selected server pack configuration by pressing CTRL + S.
+2. You can open a new server pack configuration tab by pressing CTRL + T.
+3. Identified a mod which crashes servers, and therefore only required on the clientside, but not on the server side i.e. in your server pack? Submit an Improvement Request on GitHub, with the name of the mod and the link to CurseForge / Modrinth!
+4. <br>You can create server packs from zipped modpacks. Make sure all modpack contents are at the root of the ZIP-archive, and not bundled in a sub-folder inside the archive. Point the <i>Modpack Directory</i> setting of your server pack configuration at your ZIP-archive and set everything else according to your modpack. You still need to tell ServerPackCreator which directories or files to include, which Minecraft version, modloader and modloader version your modpack uses, though!
+5. Want to tickle some more performance out of your server? Try out Aikars Flags! Check out <i>Advanced Settings -> Use Aikars Flags</i> which will add said Aikars Flags to your server packs <i>Run Arguments</i>. Generate your server pack and run your server to see whether it improved your servers performance!
+6. Want to keep different versions of a server pack, generated from the same modpack? Take a look at <i>Server Pack Suffix</i> which will add said suffix to the generated server pack, allowing you to try out different settings for your server pack, without loosing previous generation. Suffixes like <i>Aikars_Flags</i>, <i>With_Blueprints</i>, <i>With_BlueMap</i> to give you an idea.
+7. You can add server icons for quick selection by copying them to the server icon directory. In the menu at the top, click <i>View -> Open server-icon directory</i>. Any PNG-, JPG-, JPEG- and BMP-image added to said directory will be available in your server pack configs <i>Server Icon Quick select</i> dropdown. Select an image from said dropdown to quickly use it as your servers icon!
+8. You can add server properties for quick selection by copying them to the server properties directory. In the menu at the top, click <i>View -> Open server-properties directory</i>. Any PROPERTIES-file added to said directory will be available in your server pack configs <i>Server Properties Quick select</i> dropdown. Select an entry from said dropdown to quickly use it as your servers properties-file!
+9. <br>You can let ServerPackCreator scan your modpack-directory and try to automatically set the Minecraft version, modloader and modloader version, as well as some commonly used directories in servers. Hit the magnifying-glass-button on the right to your <i>Modpack Directory</i>-setting.
+10. <br>You can let ServerPackCreator copy a file or directory to a customized destination in your server pack. Say you've got a folder <i>MyAwesomeStuff</i> in your modpack configured as the Source, filling <i>Destination</i> with, say, <i>AwesomeStuff</i> will copy the aforementioned <i>Source</i> to your specified Destination inside your server pack.<br>Inclusions which specify an explicit <i>Destination</i> are marked with a <i>D</i>.
+11. You can filter files and directories from any <i>Source</i>-specification by providing a <i>Inclusion-Filter</i>. Any file or directory matching the Regex-expression you provided will be included in your server pack. To include everything from your specified <i>Source</i>, leave <i>Inclusion-Filter</i> empty.
+12. You can filter files and directories from any <i>Source</i>-specification by providing an <i>Exclusion-Filter</i>. Any file or directory matching the Regex-expression you provided will be excluded from your server pack. If you leave Exclusion-Filter empty, no files or directories will be excluded from the specified Source.
+13. Global exclusion-filters allow you to globally exclude files and directories from any source during the creation of your server pack. To specify a global exclusion-filter, add a new entry in your <i>Server-files</i>, leave <i>Source</i> empty, but fill <i>Exclusion-Filter</i> with a Regex-expression based on which files or directories should be excluded during the creation of your server pack. A global exclusion-filter will be marked with (E) in your Server-files list.
+14. If ServerPackCreators default font size is too small for you, or the theme not to your liking, you can change these settings in <i>Settings -> Gui</i> to better fit your personal preferences.
+15. Not sure if a clientside-only mod is included in the list of clientside-only mods in your server pack config? Click the aforementioned list and hit CTRL+F and search for it! Try searching for "advan" to highlight all entries which contain that text! You can perform text-searches like that in every textarea of ServerPackCreator. Searching textfields is not possible, though, so keep that in mind.
+16. Need to replace some text in a textarea? Say, for example, you've got some JVM flags / run arguments you want to replace with something else? Click <i>Advanced Settings -> Run Arguments</i> and hit CTRL+R, then type in the text you want to replace as well as the text you want to place it with and hit <i>OK</i>. You can perform replace-actions like that in every textarea of ServerPackCreator. Replacing in textfields is not possible, though, so keep that in mind.
+17. No longer need the currently selected server pack configuration? Close it by pressing CTRL+W!
+18. You can save all currently opened server pack configurations, or in other words, all currently opened tabs with your server pack configurations, by pressing CTRL+SHIFT+S!
+19. You can open the dialog to load a server pack configuration by pressing CTRL+L.
+20. You can start a server pack generation for the currently selected config-tab by pressing CTRL+G.
+21. Does your server crash, with a message like "Error: could not find or load main class @user_jvm_args.txt"? This is most likely because you are trying to run the server with an incompatible Java version. Java 8 is required to run Minecraft versions 1.12 through 1.17. Java 17 is required to run Minecraft version 1.18 and up.
+22. <br>You can set a path to a Java executable or binary for every Java version from 8 upward.<br>If, for example, you've got modpacks which run Minecraft 1.12.2 and 1.19.2, you'll need Java 8 and Java 17.<br>Add an entry for version 8, then enter the path to the binary / executable.<br>The next time you load a server pack config, ServerPackCreator will automatically adjust the "SPC_JAVA_SPC" script placeholder accordingly.<br>Now, when you generate a server pack, the unzipped one will have the "JAVA" variable, inside variables.txt, point towards the Java installation the server pack requires to run.<br>The variables.txt inside the ZIP-archive, if you let ServerPackCreator create one, will still point to "java".<br>The benefit? You can immediately test your server pack, using the Java installation it requires. If everything works, you can distribute your server pack!
+23. <br>Identified a clientside-only mod and want to exclude it from your server, or have you run into a false-positive with the clientside-mod exclusion and want to whitelist a mod to prevent exclusion? Select the part of the filename by which the mod can be identified, even when the version of the mod changes. Right-click and select either option which suits your need!<br>Usually it is enough to select the part of the mods filename which contains the name of the mod, without any version information. For example <b>connectedglass-</b> as demonstrated in the screenshot on the side. Not selecting the version has the benefit of ensuring future versions of the mod get excluded/whitelisted, too.
+
## Fun Stuff
> This chapter contains some 'just for the heck of it'-things. Nothing in this chapter receives support and is merely
diff --git a/img/tip10.png b/img/tip10.png
new file mode 100644
index 0000000000000000000000000000000000000000..511d939defca7bde83fcf1e247d3e7d036dc977d
Binary files /dev/null and b/img/tip10.png differ
diff --git a/img/tip22.png b/img/tip22.png
new file mode 100644
index 0000000000000000000000000000000000000000..6db17e081c1d27cd75419b25b5207cea8f726ef7
Binary files /dev/null and b/img/tip22.png differ
diff --git a/img/tip23.png b/img/tip23.png
new file mode 100644
index 0000000000000000000000000000000000000000..89db4adde19c04b699c2d839471aad5fd7566a49
Binary files /dev/null and b/img/tip23.png differ
diff --git a/img/tip4.png b/img/tip4.png
new file mode 100644
index 0000000000000000000000000000000000000000..581c67d574fda2dfa21b56dfef8f9336c31f0126
Binary files /dev/null and b/img/tip4.png differ
diff --git a/img/tip9.png b/img/tip9.png
new file mode 100644
index 0000000000000000000000000000000000000000..69601fb76e547d29c361685010e4ed9d00a57c5d
Binary files /dev/null and b/img/tip9.png differ
diff --git a/serverpackcreator-api/build.gradle.kts b/serverpackcreator-api/build.gradle.kts
index 9d8341ec34b1d69b175f9f379182827481905d8f..21ad6d3b42f1c74a803646a2ff4c45a99a356fd6 100644
--- a/serverpackcreator-api/build.gradle.kts
+++ b/serverpackcreator-api/build.gradle.kts
@@ -4,7 +4,7 @@ import java.util.prefs.Preferences
plugins {
id("serverpackcreator.kotlin-conventions")
id("serverpackcreator.dokka-conventions")
- id("de.comahe.i18n4k") version "0.9.0"
+ id("de.comahe.i18n4k") version "0.10.0"
}
repositories {
@@ -16,9 +16,9 @@ dependencies {
api("io.github.microutils:kotlin-logging:3.0.5")
api("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
api("de.jensklingenberg.ktorfit:ktorfit-lib:2.1.0")
- api("de.comahe.i18n4k:i18n4k-core:0.9.0")
- api("de.comahe.i18n4k:i18n4k-core-jvm:0.9.0")
- implementation("org.jetbrains.kotlin:kotlin-bom:2.1.0")
+ api("de.comahe.i18n4k:i18n4k-core:0.10.0")
+ api("de.comahe.i18n4k:i18n4k-core-jvm:0.10.0")
+ implementation("org.jetbrains.kotlin:kotlin-bom:2.1.10")
implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
implementation(files("${layout.buildDirectory.asFile.get()}/resources/main"))
api("com.electronwill.night-config:toml:3.8.1")
diff --git a/serverpackcreator-api/src/main/i18n/Translations_en_GB.properties b/serverpackcreator-api/src/main/i18n/Translations_en_GB.properties
index 2f1f9acf8cc4c900110018a59c638eff679c3ef3..531c4750ee3702a1fdfae08527e565d2ee499674 100644
--- a/serverpackcreator-api/src/main/i18n/Translations_en_GB.properties
+++ b/serverpackcreator-api/src/main/i18n/Translations_en_GB.properties
@@ -109,9 +109,9 @@ cli.config.check.success=No errors encountered.
cli.config.save.intro=Would you like to save this configuration as an additional, separate, configuration file?
cli.config.save.name=Enter the path under which you want to additionally store the above configuration, example "C:\\Users\\YourUser\\Documents\\myconfig.conf":
cli.config.save.saved=Your configuration has been saved to {0}.
-cli.config.save.info=Please note that running ServerPackCreator in CLI mode requires a valid 'serverpackcreator.conf'-file to be present.
-cli.config.save.load=You may load the previous configuration, saved as {0} and save it as 'serverpackcreator.conf'
-cli.config.save.saved.default=Your configuration has been saved as 'serverpackcreator.conf'.
+cli.config.save.info=Please note that running ServerPackCreator in CLI mode requires a valid ''serverpackcreator.conf''-file to be present.
+cli.config.save.load=You may load the previous configuration, saved as {0} and save it as ''serverpackcreator.conf''
+cli.config.save.saved.default=Your configuration has been saved as ''serverpackcreator.conf''.
### GUI
createserverpack.gui.createandshowgui=ServerPackCreator
@@ -133,7 +133,7 @@ createserverpack.gui.createserverpack.labelclientmods=Mod-Exclusions
createserverpack.gui.createserverpack.labelclientmods.tip=Mods to exclude from the server pack. Comma separated. Example: AmbientSounds-,BackTools-,BetterAdvancement-,BetterPing-
createserverpack.gui.createserverpack.labelwhitelistmods=Whitelisted Mods
createserverpack.gui.createserverpack.labelwhitelistmods.tip=Mods to include in the server pack, regardless of whether a match was found in the clientside-mods list. Comma separated. Example: Ping-Wheel.
-createserverpack.gui.createserverpack.textclientmods.error=Must not end with ',', spaces or contain illegal characters.
+createserverpack.gui.createserverpack.textclientmods.error=Must not end with '','', spaces or contain illegal characters.
createserverpack.gui.createserverpack.labelcopydirs=Server-files
createserverpack.gui.createserverpack.labelcopydirs.tip=Comma separated. Example: mods, config, options.txt or explicit source/file;destination/file-combinations
createserverpack.gui.createserverpack.labeliconpath=Server Icon
@@ -237,7 +237,7 @@ createserverpack.gui.quickselect=Quick select:
createserverpack.gui.advanced=Advanced Settings
createserverpack.gui.plugins=Plugins
createserverpack.gui.title.new=New Config
-createserverpack.gui.about.text=ServerPackCreator is a Java-program which creates a server pack from any given Forge or Fabric modpack.\nCustomize the configuration to your liking and off you go. Whenever you are working on an update to your\nmodpack, you simply run ServerPackCreator and BAM! You've got yourself a server pack for your new modpack version.\nServerPackCreator is a passion project on which I am working in my spare time. It is also the main reason for why I got\ninto programming in the first place. I started getting into Java programming in february 2021,\nwhen I was working on an update for one of my Minecraft modpacks, Survive Create Prosper 4, and got tired and bored of\nmanually creating a server pack everytime I wanted to update and test something, or just release a new server pack\nfor the new modpack version. The thought "There must be a way to automate this, or at least make it less tedious..." was\nthe spark which sent me off into the world of programming in Java.\nAnd here we are.
+createserverpack.gui.about.text=ServerPackCreator is a Java-program which creates a server pack from any given Forge or Fabric modpack.\nCustomize the configuration to your liking and off you go. Whenever you are working on an update to your\nmodpack, you simply run ServerPackCreator and BAM! You''ve got yourself a server pack for your new modpack version.\nServerPackCreator is a passion project on which I am working in my spare time. It is also the main reason for why I got\ninto programming in the first place. I started getting into Java programming in february 2021,\nwhen I was working on an update for one of my Minecraft modpacks, Survive Create Prosper 4, and got tired and bored of\nmanually creating a server pack everytime I wanted to update and test something, or just release a new server pack\nfor the new modpack version. The thought "There must be a way to automate this, or at least make it less tedious..." was\nthe spark which sent me off into the world of programming in Java.\nAnd here we are.
createserverpack.gui.about.hastebin.dialog=Open in browser or copy to clipboard?
createserverpack.gui.about.hastebin.dialog.yes=Open in Browser
createserverpack.gui.about.hastebin.dialog.no=Neither
@@ -252,7 +252,7 @@ createserverpack.gui.modpack.scan.message=Updated server pack configuration with
createserverpack.gui.modpack.select.gdlauncher.title=Are you using GDLauncher? Is this a GDLauncher modpack?
createserverpack.gui.modpack.select.gdlauncher.message=GDLauncher keeps the interesting files in a subfolder called instance. Would you like to use that directory instead?
createserverpack.gui.config.load.error=Error loading configuration file!
-createserverpack.gui.config.load.error.message=Couldn't load configuration file. Cause:
+createserverpack.gui.config.load.error.message=Couldn''t load configuration file. Cause:
createserverpack.gui.close.unsaved.title=Unsaved changes for {0}
createserverpack.gui.close.unsaved.message=Your configuration for {0} has unsaved changes.\nSave before closing?
createserverpack.gui.close.title=Close tab
@@ -342,7 +342,7 @@ menubar.gui.menuitem.donate=Support me!
menubar.gui.menuitem.wiki.help=Help
menubar.gui.menuitem.wiki.howto=Getting started
menubar.gui.menuitem.updates=Check for updates
-menubar.gui.menuitem.updates.none=No updates available!\nYou're already using the latest version.
+menubar.gui.menuitem.updates.none=No updates available!\nYou''re already using the latest version.
menubar.gui.menuitem.updates.none.title=No updates available
menubar.gui.menuitem.spclog=Open ServerPackCreator log
menubar.gui.menuitem.modloaderlog=Open modloader-installer log
@@ -410,7 +410,7 @@ settings.global.zip.tooltip=Files which should be excluded from server pack ZIP-
settings.global.zip.label=ZIP-Exclusions
settings.global.inclusions.tooltip=Recommended file or directory inclusions for server pack configurations.
settings.global.inclusions.label=Recommended Inclusions
-settings.global.aikars.tooltip=Global Aikars flags used when pressing the 'Use Aikars Flags'-button in a server pack config tab
+settings.global.aikars.tooltip=Global Aikars flags used when pressing the ''Use Aikars Flags''-button in a server pack config tab
settings.global.aikars.label=Global Aikars Flags
settings.global.scripts.tooltip=Script templates used for creating the start scripts for generated server packs.
settings.global.scripts.label=Script Templates
@@ -459,7 +459,7 @@ settings.global.javapaths.value=Path to binary (Linux/UNIX) or exe (Windows)
settings.check.home=Home-directory either does not exist or is not writable.
settings.check.java=Java executable/binary either does not exist, is not readable, or is not executable.
settings.check.serverpacks=Server packs directory either does not exist or is not writable.
-settings.check.whitespace=Must not end with ','!
+settings.check.whitespace=Must not end with '',''!
settings.check.fallbackurl=Invalid URL format!
settings.webservice=Webservice
settings.webservice.database.host.tooltip=Host on which the database-server runs on
@@ -539,14 +539,14 @@ firstrun.java=<html>The Java version required by your selected Minecraft version
firstrun.modloader=<html>The modloader your modpack uses.<br>Click the element to open a list of available modloaders<br>and select the one your modpack uses.</html>
firstrun.modloader.version=<html>The modloader version your modpack uses.<br>Click the element to open a list of available versions<br>for the selected modloader and select the one your modpack uses.</html>
firstrun.finish.title=Happy little server packs
-firstrun.finish.message=Congrats! You configured your first server pack. If you're happy with the configuration, you can hit the "Generate"-button on the bottom left. Other than that, feel free to explore the rest of ServerPackCreators possibilities. Happy server packing!\n\nCheers,\nGriefed
+firstrun.finish.message=Congrats! You configured your first server pack. If you''re happy with the configuration, you can hit the "Generate"-button on the bottom left. Other than that, feel free to explore the rest of ServerPackCreators possibilities. Happy server packing!\n\nCheers,\nGriefed
tips.title=Tip Of The Day!
tips.know=Did you know...
tips.show=Show tips on startup
tips.next=Next >
tips.previous=< Previous
tips.close=Close
-tip.1.content=<html>You can save the currently selected server pack configuration by pressing CTRL + S.
+tip.1.content=<html>You can save the currently selected server pack configuration by pressing CTRL + S.</html>
tip.1.name=Save quickly
tip.2.content=<html>You can open a new server pack configuration tab by pressing CTRL + T.</html>
tip.2.name=Open a new tab
@@ -564,7 +564,7 @@ tip.8.content=<html>You can add server properties for quick selection by copying
tip.8.name=Shipped properties
tip.9.content=<html>You can let ServerPackCreator scan your modpack-directory and try to automatically set the Minecraft version, modloader and modloader version, as well as some commonly used directories in servers. Hit the magnifying-glass-button on the right to your <i>Modpack Directory</i>-setting.</html>
tip.9.name=Clientside detection
-tip.10.content=<html>You can let ServerPackCreator copy a file or directory to a customized destination in your server pack. Say you've got a folder <i>MyAwesomeStuff</i> in your modpack configured as the Source, filling <i>Destination</i> with, say, <i>AwesomeStuff</i> will copy the aforementioned <i>Source</i> to your specified Destination inside your server pack.<br>Inclusions which specify an explicit <i>Destination</i> are marked with a <i>D</i>.</html>
+tip.10.content=<html>You can let ServerPackCreator copy a file or directory to a customized destination in your server pack. Say you''ve got a folder <i>MyAwesomeStuff</i> in your modpack configured as the Source, filling <i>Destination</i> with, say, <i>AwesomeStuff</i> will copy the aforementioned <i>Source</i> to your specified Destination inside your server pack.<br>Inclusions which specify an explicit <i>Destination</i> are marked with a <i>D</i>.</html>
tip.10.name=Advanced inclusion
tip.11.content=<html>You can filter files and directories from any <i>Source</i>-specification by providing a <i>Inclusion-Filter</i>. Any file or directory matching the Regex-expression you provided will be included in your server pack. To include everything from your specified <i>Source</i>, leave <i>Inclusion-Filter</i> empty.</html>
tip.11.name=Advanced inclusion filtering
@@ -576,19 +576,19 @@ tip.14.content=<html>If ServerPackCreators default font size is too small for yo
tip.14.name=Size matters
tip.15.content=<html>Not sure if a clientside-only mod is included in the list of clientside-only mods in your server pack config? Click the aforementioned list and hit CTRL+F and search for it! Try searching for "advan" to highlight all entries which contain that text! You can perform text-searches like that in every textarea of ServerPackCreator. Searching textfields is not possible, though, so keep that in mind.</html>
tip.15.name=Searching...
-tip.16.content=<html>Need to replace some text in a textarea? Say, for example, you've got some JVM flags / run arguments you want to replace with something else? Click <i>Advanced Settings -> Run Arguments</i> and hit CTRL+R, then type in the text you want to replace as well as the text you want to place it with and hit <i>OK</i>. You can perform replace-actions like that in every textarea of ServerPackCreator. Replacing in textfields is not possible, though, so keep that in mind.</html>
+tip.16.content=<html>Need to replace some text in a textarea? Say, for example, you''ve got some JVM flags / run arguments you want to replace with something else? Click <i>Advanced Settings -> Run Arguments</i> and hit CTRL+R, then type in the text you want to replace as well as the text you want to place it with and hit <i>OK</i>. You can perform replace-actions like that in every textarea of ServerPackCreator. Replacing in textfields is not possible, though, so keep that in mind.</html>
tip.16.name=This to that
tip.17.content=<html>No longer need the currently selected server pack configuration? Close it by pressing CTRL+W!</html>
tip.17.name=Be gone, config!
tip.18.content=<html>You can save all currently opened server pack configurations, or in other words, all currently opened tabs with your server pack configurations, by pressing CTRL+SHIFT+S!</html>
-tip.18.name=Gotta save 'em all!
+tip.18.name=Gotta save ''em all!
tip.19.content=<html>You can open the dialog to load a server pack configuration by pressing CTRL+L.</html>
tip.19.name=Quick loading
tip.20.content=<html>You can start a server pack generation for the currently selected config-tab by pressing CTRL+G.</html>
tip.20.name=Quick generation
tip.21.content=<html>Does your server crash, with a message like "Error: could not find or load main class @user_jvm_args.txt"? This is most likely because you are trying to run the server with an incompatible Java version. Java 8 is required to run Minecraft versions 1.12 through 1.17. Java 17 is required to run Minecraft version 1.18 and up.</html>
tip.21.name=Use the right version!
-tip.22.content=<html>You can set a path to a Java executable or binary for every Java version from 8 upward.<br>If, for example, you've got modpacks which run Minecraft 1.12.2 and 1.19.2, you'll need Java 8 and Java 17.<br>Add an entry for version 8, then enter the path to the binary / executable.<br>The next time you load a server pack config, ServerPackCreator will automatically adjust the "SPC_JAVA_SPC" script placeholder accordingly.<br>Now, when you generate a server pack, the unzipped one will have the "JAVA" variable, inside variables.txt, point towards the Java installation the server pack requires to run.<br>The variables.txt inside the ZIP-archive, if you let ServerPackCreator create one, will still point to "java".<br>The benefit? You can immediately test your server pack, using the Java installation it requires. If everything works, you can distribute your server pack!</html>
+tip.22.content=<html>You can set a path to a Java executable or binary for every Java version from 8 upward.<br>If, for example, you''ve got modpacks which run Minecraft 1.12.2 and 1.19.2, you''ll need Java 8 and Java 17.<br>Add an entry for version 8, then enter the path to the binary / executable.<br>The next time you load a server pack config, ServerPackCreator will automatically adjust the "SPC_JAVA_SPC" script placeholder accordingly.<br>Now, when you generate a server pack, the unzipped one will have the "JAVA" variable, inside variables.txt, point towards the Java installation the server pack requires to run.<br>The variables.txt inside the ZIP-archive, if you let ServerPackCreator create one, will still point to "java".<br>The benefit? You can immediately test your server pack, using the Java installation it requires. If everything works, you can distribute your server pack!</html>
tip.22.name=Java Paths for quicker testing!
tip.23.content=<html>Identified a clientside-only mod and want to exclude it from your server, or have you run into a false-positive with the clientside-mod exclusion and want to whitelist a mod to prevent exclusion? Select the part of the filename by which the mod can be identified, even when the version of the mod changes. Right-click and select either option which suits your need!<br>Usually it is enough to select the part of the mods filename which contains the name of the mod, without any version information. For example <b>connectedglass-</b> as demonstrated in the screenshot on the side. Not selecting the version has the benefit of ensuring future versions of the mod get excluded/whitelisted, too.</html>
tip.23.name=Exclude or whitelist mod conveniently
@@ -596,9 +596,9 @@ tip.23.name=Exclude or whitelist mod conveniently
## Error logs
configuration.title.error=This configuration has errors!
configuration.title.warning=Unsaved changes!
-configuration.log.error.checkconfig.start=Couldn't parse config file. Consider checking your config file and fixing empty values. If the value needs to be an empty string, leave its value to "".
+configuration.log.error.checkconfig.start=Couldn''t parse config file. Consider checking your config file and fixing empty values. If the value needs to be an empty string, leave its value to "".
configuration.log.error.checkmodpackdir=Modpack directory not specified. Please specify an existing directory.
-configuration.log.error.modpack.overrides=Modpack contains directory \"overrides\". Modpacks must be installed through a client such as CurseForge, GDLauncher, MultiMC etc. Full modpacks shouldn't contain the overrides directory anymore.
+configuration.log.error.modpack.overrides=Modpack contains directory \"overrides\". Modpacks must be installed through a client such as CurseForge, GDLauncher, MultiMC etc. Full modpacks shouldn''t contain the overrides directory anymore.
configuration.log.error.serverpack.suffix=Suffix contains illegal characters.
configuration.log.error.checkcopydirs.empty=No directories or files specified for copying. This would result in an empty serverpack.
configuration.log.error.checkcopydirs.notfound=Copy-file or copy-directory {0} does not exist. Please specify existing directories or files.
@@ -612,9 +612,9 @@ configuration.log.error.checkmodloader=Invalid modloader specified. Modloader mu
configuration.log.error.checkmodloaderversion=Specified incorrect modloader version. Please check your modpack for the correct version and enter again.
configuration.log.error.checkmodloaderandversion=Minecraft {0} and {1} {2} are not compatible.
configuration.log.error.minecraft.modloader=Minecraft {0} and {1} are not compatible. No versions available.
-configuration.log.error.isdir.copydir=There's something wrong with your setting of directories to include in your server pack.
+configuration.log.error.isdir.copydir=There''s something wrong with your setting of directories to include in your server pack.
configuration.log.error.modpackdirectory=Modpack directory {0} could not be found.
-configuration.log.error.servericon.error=Couldn't generate a preview of the server-icon. Is it a valid image-file?
+configuration.log.error.servericon.error=Couldn''t generate a preview of the server-icon. Is it a valid image-file?
configuration.log.error.servericon=The specified server-icon does not exist: {0}
configuration.log.error.serverproperties=The specified server.properties does not exist: {0}
configuration.log.error.serverproperties.pure=The specified server.properties does not exist!
@@ -623,16 +623,16 @@ configuration.log.error.encountered=Encountered {0} errors during the configurat
configuration.log.error.formatting=Invalid formatting. No empty entries, last entry must not end with a \",\" or unnecessary whitespace
configuration.log.error.zip.overrides=The ZIP-file you specified only contains one directory: {0}. ZIP-files for ServerPackCreator must be full modpacks, with all their contents being in the root of the ZIP-file.
configuration.log.error.zip.modsorconfig=The ZIP-file you specified does not contain the mods or config directories. What use is a modded server without mods and their configurations?
-configuration.log.error.zip.directories=Couldn't acquire directories in ZIP-file.
+configuration.log.error.zip.directories=Couldn''t acquire directories in ZIP-file.
configuration.log.error.zip.manifest=Error parsing CurseForge manifest.json from ZIP-file.
configuration.log.error.zip.instance=Error parsing minecraftisntance.json from ZIP-file.
configuration.log.error.zip.config=Error parsing config.json from ZIP-file.
configuration.log.error.zip.mmcpack=Error parsing mmc-pack.json from ZIP-file.
createserverpack.log.error.minecraft.server=A server is not available for the specified Minecraft version.
-createserverpack.log.error.copy.directory=Couldn't gather file {0} from directory {1}.
+createserverpack.log.error.copy.directory=Couldn''t gather file {0} from directory {1}.
createserverpack.log.error.copy=An error occurred gathering files to copy to the server pack.
about.log.error.browser=Error opening browser.
-createserverpack.log.error.configuration.none.message=There's no configuration available from which a server pack could be generated...
+createserverpack.log.error.configuration.none.message=There''s no configuration available from which a server pack could be generated...
createserverpack.log.error.configuration.none.title=No Configuration Available
## Info logs
configuration.log.info.start=You started ServerPackCreator with the "{0}" argument. Step-by-step generation of config file initiated...
@@ -654,8 +654,8 @@ createserverpack.log.info.buttoncreateserverpack.start=Checking entered configur
createserverpack.log.info.buttoncreateserverpack.checked=Configuration checked successfully.
createserverpack.log.info.buttoncreateserverpack.generating=Generating server pack for {0}
createserverpack.log.info.buttoncreateserverpack.ready=Server pack created!
-createserverpack.log.info.icon=No custom icon specified or the file doesn't exist.
-createserverpack.log.info.properties=No custom properties specified or the file doesn't exist.
+createserverpack.log.info.icon=No custom icon specified or the file doesn''t exist.
+createserverpack.log.info.properties=No custom properties specified or the file doesn''t exist.
main.log.info.system.java=Java version: {0}
main.log.info.system.include=Include this information when reporting an issue on GitHub.
updates.log.info.none=No updates available.
diff --git a/serverpackcreator-app/build.gradle.kts b/serverpackcreator-app/build.gradle.kts
index 1dad3abd8e62789781a3aad1873f12c1edc6f2f4..36448aba69cbee5eb0b98bdc8bfae619581602c8 100644
--- a/serverpackcreator-app/build.gradle.kts
+++ b/serverpackcreator-app/build.gradle.kts
@@ -51,12 +51,12 @@ dependencies {
api("net.java.balloontip:balloontip:1.2.4.1")
api("com.cronutils:cron-utils:9.2.1")
api("tokyo.northside:tipoftheday:0.4.2")
- compileOnly("com.install4j:install4j-runtime:11.0.1")
+ compileOnly("com.install4j:install4j-runtime:11.0.2")
//WEB
api("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
- api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
- api("org.springframework.boot:spring-boot-starter-web:3.3.2")
+ api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3")
+ api("org.springframework.boot:spring-boot-starter-web:3.4.3")
api("org.springframework.boot:spring-boot-starter-log4j2:3.4.0")
api("org.springframework.boot:spring-boot-starter-data-jpa:3.4.1")
api("org.postgresql:postgresql:42.7.3")
@@ -65,7 +65,7 @@ dependencies {
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testRuntimeOnly("com.h2database:h2:2.3.232")
testImplementation("org.springframework.boot:spring-boot-starter-test:3.4.1")
- developmentOnly("org.springframework.boot:spring-boot-devtools:3.4.0")
+ developmentOnly("org.springframework.boot:spring-boot-devtools:3.4.3")
//developmentOnly("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
}
diff --git a/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/configs/components/inclusions/InclusionsEditor.kt b/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/configs/components/inclusions/InclusionsEditor.kt
index eaf4dfae3ca2298fe89e85145443db32ba4d7996..8e85c27bc70a2f95bf42b73a7fd2bf18cca8ccb9 100644
--- a/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/configs/components/inclusions/InclusionsEditor.kt
+++ b/serverpackcreator-app/src/main/kotlin/de/griefed/serverpackcreator/app/gui/window/configs/components/inclusions/InclusionsEditor.kt
@@ -279,11 +279,13 @@ class InclusionsEditor(
}
} else {
tipContent = Translations.createserverpack_gui_inclusions_editor_tip_prefix.toString()
- val prefix = if (!inclusionSelection.destination.isNullOrBlank()) {
+
+ /*val prefix = if (!inclusionSelection.destination.isNullOrBlank()) {
inclusionSelection.destination + File.separator
} else {
File(inclusionSelection.source).name + File.separator
- }
+ }*/
+
if (File(configEditor.getModpackDirectory(), inclusionSelection.source).isFile) {
tipContent += File(configEditor.getModpackDirectory(), inclusionSelection.source).absolutePath.replace(
configEditor.getModpackDirectory() + File.separator,
@@ -303,7 +305,8 @@ class InclusionsEditor(
configEditor.getModloader()
)
for (file in acquired) {
- tipContent += "${prefix}${file.destinationFile.name}\n"
+ /*${prefix}*/
+ tipContent += "${file.sourcePath.toString().replace(configEditor.getModpackDirectory(),"")}\n"
}
}
diff --git a/serverpackcreator-app/src/main/resources/de/griefed/resources/gui/LICENSE-AGREEMENT b/serverpackcreator-app/src/main/resources/de/griefed/resources/gui/LICENSE-AGREEMENT
index 363f1988cf42b73d2f2622e5f6c9dfeb543d47a2..1fe169b6f41a54956ed9ac98eb2d8e907f966d8b 100644
--- a/serverpackcreator-app/src/main/resources/de/griefed/resources/gui/LICENSE-AGREEMENT
+++ b/serverpackcreator-app/src/main/resources/de/griefed/resources/gui/LICENSE-AGREEMENT
@@ -515,6 +515,173 @@ License: GNU Lesser General Public License v3.0
URL: https://www.gnu.org/licenses/lgpl-3.0.txt
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+
#######################################
(3 of 42)
diff --git a/serverpackcreator-help/Writerside/spch.tree b/serverpackcreator-help/Writerside/spch.tree
index 11ff09a80e7da361ef174741e8ae7d48a106d05c..3550adaae17594dc14afe11fffad06f0002896ee 100644
--- a/serverpackcreator-help/Writerside/spch.tree
+++ b/serverpackcreator-help/Writerside/spch.tree
@@ -27,6 +27,7 @@
<toc-element topic="Special-Mods.md"/>
<toc-element topic="Translations.md"/>
<toc-element topic="Working-With-Plugins.md"/>
+ <toc-element topic="Tips.md"/>
<toc-element topic="Fun-Stuff.md"/>
</toc-element>
<toc-element topic="Documents.md">
diff --git a/serverpackcreator-help/Writerside/topics/Exclusions.md b/serverpackcreator-help/Writerside/topics/Exclusions.md
index 008ff6a212f8dc5d14d92a36c7c47a11ec26a8a1..14075f370f19c1330d9bac144dae27d1c8e10c74 100644
--- a/serverpackcreator-help/Writerside/topics/Exclusions.md
+++ b/serverpackcreator-help/Writerside/topics/Exclusions.md
@@ -1,3 +1,3 @@
# File Exclusions
-<include from="HELP.md" element-id="excluding-files-from-zip-archives"></include>
\ No newline at end of file
+<include from="HELP.md" element-id="excluding-files"></include>
\ No newline at end of file
diff --git a/serverpackcreator-help/Writerside/topics/Tips.md b/serverpackcreator-help/Writerside/topics/Tips.md
new file mode 100644
index 0000000000000000000000000000000000000000..96e65ccb7dccd99d6dfbf99e9dc1f8c463cab98b
--- /dev/null
+++ b/serverpackcreator-help/Writerside/topics/Tips.md
@@ -0,0 +1,3 @@
+# Tips
+
+<include from="HELP.md" element-id="tips"></include>
\ No newline at end of file
diff --git a/serverpackcreator-help/Writerside/topics/img/tip10.png b/serverpackcreator-help/Writerside/topics/img/tip10.png
new file mode 100644
index 0000000000000000000000000000000000000000..511d939defca7bde83fcf1e247d3e7d036dc977d
Binary files /dev/null and b/serverpackcreator-help/Writerside/topics/img/tip10.png differ
diff --git a/serverpackcreator-help/Writerside/topics/img/tip22.png b/serverpackcreator-help/Writerside/topics/img/tip22.png
new file mode 100644
index 0000000000000000000000000000000000000000..6db17e081c1d27cd75419b25b5207cea8f726ef7
Binary files /dev/null and b/serverpackcreator-help/Writerside/topics/img/tip22.png differ
diff --git a/serverpackcreator-help/Writerside/topics/img/tip23.png b/serverpackcreator-help/Writerside/topics/img/tip23.png
new file mode 100644
index 0000000000000000000000000000000000000000..89db4adde19c04b699c2d839471aad5fd7566a49
Binary files /dev/null and b/serverpackcreator-help/Writerside/topics/img/tip23.png differ
diff --git a/serverpackcreator-help/Writerside/topics/img/tip4.png b/serverpackcreator-help/Writerside/topics/img/tip4.png
new file mode 100644
index 0000000000000000000000000000000000000000..581c67d574fda2dfa21b56dfef8f9336c31f0126
Binary files /dev/null and b/serverpackcreator-help/Writerside/topics/img/tip4.png differ
diff --git a/serverpackcreator-help/Writerside/topics/img/tip9.png b/serverpackcreator-help/Writerside/topics/img/tip9.png
new file mode 100644
index 0000000000000000000000000000000000000000..69601fb76e547d29c361685010e4ed9d00a57c5d
Binary files /dev/null and b/serverpackcreator-help/Writerside/topics/img/tip9.png differ
diff --git a/serverpackcreator-plugin-example/build.gradle.kts b/serverpackcreator-plugin-example/build.gradle.kts
index 0f4714c5a3d2eb0c582df8d5063de40b0a8a1532..9b3b338c1d6d07d72608e85213c13b912eb13562 100644
--- a/serverpackcreator-plugin-example/build.gradle.kts
+++ b/serverpackcreator-plugin-example/build.gradle.kts
@@ -3,7 +3,7 @@ import java.util.*
plugins {
id("serverpackcreator.kotlin-conventions")
- id("de.comahe.i18n4k") version "0.9.0"
+ id("de.comahe.i18n4k") version "0.10.0"
kotlin("kapt")
}
@@ -40,8 +40,8 @@ dependencies {
// Testing
- testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
- testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")
+ testImplementation("org.junit.jupiter:junit-jupiter-api:5.12.0")
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.12.0")
}
tasks.processResources {