Skip to content

Commit

Permalink
chore: Re-add test-application.properties, which somehow vanished som…
Browse files Browse the repository at this point in the history
…ewhere in the last commits. Set versioncheck.prerelease to false, in preparation for 3.0.0. Some cleanups here and there.
  • Loading branch information
Griefed committed Mar 25, 2022
1 parent e178b56 commit a7718cc
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1158,8 +1158,6 @@ private void forgeBatchScript(String javaArguments, String minecraftVersion, Str
*/
private void copyFiles(String modpackDir, List<String> directoriesToCopy, List<String> clientMods, String minecraftVersion, String destination) {

// TODO: Move copy segments to private methods to make this whole thing more readable

try {

Files.createDirectories(Paths.get(destination));
Expand Down
2 changes: 1 addition & 1 deletion backend/main/resources/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@
* Empty commit so a new alpha will be generated... ([c1b5698](https://git.griefed.de/Griefed/ServerPackCreator/commit/c1b5698a0aac863518244998c72a4f21ff4d604c))

## [3.0.0-alpha.16](https://git.griefed.de/Griefed/ServerPackCreator/compare/3.0.0-alpha.15...3.0.0-alpha.16) (2022-01-18)


### 👀 Reverts

Expand Down
24 changes: 12 additions & 12 deletions backend/main/resources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ A list of known issues can be found in [Known Issues](https://github.com/Griefed
4. Set a suffix for the server pack to be generated.
5. And much more!
10. **Webservice**
1. Generate a server pack from zipped up modpacks.
2. All generated server packs available for download to everyone.
1. Generate a server pack from zipped up modpacks.
2. All generated server packs available for download to everyone.
11. **Addons!**
1. Users can provide addons which will be executed after the generation of a server pack. Add them to the `addons`-directory.
2. Example addon at [ServerPackCreatorExampleAddon](https://github.com/Griefed/ServerPackCreatorExampleAddon)
1. Users can provide addons which will be executed after the generation of a server pack. Add them to the `addons`-directory.
2. Example addon at [ServerPackCreatorExampleAddon](https://github.com/Griefed/ServerPackCreatorExampleAddon)

# 3. Versions

Expand Down Expand Up @@ -304,7 +304,7 @@ de.griefed.serverpackcreator.curseforge.api.token=
| de.griefed.serverpackcreator.configuration.directories.mustinclude | List of directories which must be included in a server pack. |
| de.griefed.serverpackcreator.curseforge.api.token | CurseAPI token used for generating server packs from CurseForge projects. |

# 5.1.2 Default `application.properties`
# 5.1.2 Default `application.properties`

`application.properties`
```properties
Expand Down Expand Up @@ -715,13 +715,13 @@ A short excerpt:
>
> 1. Fork ServerPackCreator
> 2. Create a new branch in your fork, following one of the following naming schemes:
> 1. The end of each branch name bust be suffixed with a one-word description fitting the changes made. Examples:
> - griefed_chore_readme
> 1. The end of each branch name bust be suffixed with a one-word description fitting the changes made. Examples:
> - griefed_chore_readme
> - griefed_perf_curseforgemodpack
> - griefed_feat_ziparchive
> 2. For more details on what the naming scheme entails, see `.releaserc.yml` in the base directory of the repository or scroll down to the **Commits**-section.
> 3. Schemes:
> 1. your_username_breaking_
> 1. your_username_breaking_
> 2. your_username_build_
> 3. your_username_chore_
> 4. your_username_ci_
Expand All @@ -735,13 +735,13 @@ A short excerpt:
> 12. your_username_test_
> 13. your_username_other_
> 3. Make your changes to your new branch:
> 1. Try to keep the changes atomic, so they best fit the name of the branch.
> 1. Try to keep the changes atomic, so they best fit the name of the branch.
> 2. Follow conventional commit messages. See **Commits**-section for more details. Example:
> - feat: Allow upload of modpack-export zip-archive to web-frontend
> - feat: Allow upload of modpack-export zip-archive to web-frontend
> - refactor: Use apache commons-io for copying, instead of Files
> 4. Open an issue on the main repository, using the **Pull Request** template:
> 1. Issue title: Your Username - Branch type (e.g. feat) - Short description of your changes. Example:
> - Griefed - feat - Allow upload of modpack-export zip-archive to web-frontend
> 1. Issue title: Your Username - Branch type (e.g. feat) - Short description of your changes. Example:
> - Griefed - feat - Allow upload of modpack-export zip-archive to web-frontend
> 2. Issue description: Fill in the sections the template provide.
> 3. Submit the new issue
> 5. I will then create a new branch in the main repository, with the same name as your branch, to which you will **then** create a pull request to.
Expand Down
3 changes: 1 addition & 2 deletions backend/main/resources/serverpackcreator.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Supported languages: [en_us, uk_ua, de_de]
# TODO: Set de.griefed.serverpackcreator.versioncheck.prerelease to false before next stable release
de.griefed.serverpackcreator.versioncheck.prerelease=true
de.griefed.serverpackcreator.versioncheck.prerelease=false
de.griefed.serverpackcreator.language=en_us
de.griefed.serverpackcreator.configuration.fallbackmodslist=3dSkinLayers-,AdvancementPlaques-,AmbientSounds_,armorchroma-,backtools-,BetterAdvancements-,BetterAnimationsCollection-,BetterDarkMode-,BetterF3-,BetterF3-,BetterFoliage-,BetterPingDisplay-,BetterPlacement-,Blur-,catalogue-,cherishedworlds-,classicbar-,clickadv-,ClientTweaks_,configured-,Controlling-,CraftPresence-,CTM-,customdiscordrpc-,CustomMainMenu-,DefaultOptions_,defaultoptions-,desiredservers-,Ding-,drippyloadingscreen_,drippyloadingscreen-,Durability101-,dynamic-music-,DynamicSurroundings-,DynamicSurroundingsHuds-,dynmus-,EiraMoticons_,eiramoticons-,EnchantmentDescriptions-,EquipmentCompare-,extremesoundmuffler-,extremeSoundMuffler-,Fallingleaves-,fallingleaves-,fancymenu_,findme-,flickerfix-,FpsReducer-,FullscreenWindowed-,InventoryEssentials_,InventorySpam-,InventoryTweaks-,invtweaks-,ItemBorders-,itemzoom,itlt-,jeed-,jehc-,jeiintegration_,JEITweaker-,just-enough-harvestcraft-,justenoughbeacons-,JustEnoughCalculation-,JustEnoughProfessions-,JustEnoughProfessions-,JustEnoughResources-,keywizard-,konkrete_,lazydfu-,LegendaryTooltips-,light-overlay-,LightOverlay-,LLOverlayReloaded-,loadmyresources_,lootbeams-,mcbindtype-,medievalmusic-,modnametooltip_,modnametooltip-,moreoverlays-,MouseTweaks-,multihotbar-,MyServerIsCompatible-,Neat ,NotifMod-,OldJavaWarning-,OptiFine,OptiForge,ornaments-,overloadedarmorbar-,PackMenu-,PickUpNotifier-,Ping-,preciseblockplacing-,presencefootsteps-,PresenceFootsteps-,ReAuth-,ResourceLoader-,shutupexperimentalsettings-,SimpleDiscordRichPresence-,smoothboot-,sounddeviceoptions-,SpawnerFix-,spoticraft-,tconplanner-,timestamps-,Tips-,TipTheScales-,Toast Control-,Toast-Control-,ToastControl-,torchoptimizer-,torohealth-,toughnessbar-,TravelersTitles-,WindowedFullscreen-,WorldNameRandomizer-,yisthereautojump-
de.griefed.serverpackcreator.configuration.hastebinserver=https://haste.zneix.eu/documents
Expand Down
26 changes: 26 additions & 0 deletions backend/test/resources/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
server.port=8080
server.error.whitelabel.enabled=false
server.tomcat.basedir=.
server.tomcat.accesslog.enabled=true
server.tomcat.accesslog.directory=logs
server.tomcat.accesslog.file-date-format=_yyyy-MM-dd
server.tomcat.accesslog.prefix=tomcat_access
server.tomcat.accesslog.suffix=.log
server.tomcat.accesslog.pattern=common
spring.output.ansi.enabled=ALWAYS
server.error.include-message=ALWAYS
server.error.include-stacktrace=ALWAYS
spring.application.name=ServerPackCreator
spring.datasource.url=jdbc:sqlite:serverpackcreator.db
spring.datasource.driver-class-name=org.sqlite.JDBC
spring.jpa.hibernate.ddl-auto=create
spring.jpa.database-platform=org.sqlite.hibernate.dialect.SQLiteDialect
spring.jpa.open-in-view=false
spring.jdbc.template.query-timeout=3600
spring.transaction.default-timeout=3600
spring.artemis.mode=embedded
spring.artemis.embedded.persistent=false
spring.artemis.embedded.data-directory=work/artemis
spring.datasource.tomcat.max-active=50
spring.datasource.tomcat.max-idle=15
spring.datasource.tomcat.min-idle=8

0 comments on commit a7718cc

Please sign in to comment.