From 82858d90b1a8b456346361326f225f47fe2b65eb Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Sat, 17 Aug 2024 19:14:57 +0200
Subject: [PATCH] chore: Remove old paths and values for IDE
---
.gitignore | 4 ++++
.runConfigurations/Build without tests with version.run.xml | 2 +-
.runConfigurations/Debug Fat Jar.run.xml | 2 +-
.../src/test/resources/serverpackcreator.properties | 2 +-
.../testresources/properties/filters/contains.properties | 4 ++--
.../testresources/properties/filters/either.properties | 4 ++--
.../resources/testresources/properties/filters/end.properties | 4 ++--
.../testresources/properties/filters/regex.properties | 4 ++--
.../testresources/properties/filters/start.properties | 4 ++--
spc.install4j | 2 +-
10 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5680f6d57..ec332ffdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -361,6 +361,10 @@ work
licenses/*
!licenses/.gitkeep
+# ServerPackCreator Exampel Plugin
+serverpackcreator-plugin-example/tests/*
+!serverpackcreator-plugin-example/tests/.gitkeep
+
# ServerPackCreator Web
serverpackcreator-web-frontend/.quasar/
serverpackcreator-web-frontend/dist/
diff --git a/.runConfigurations/Build without tests with version.run.xml b/.runConfigurations/Build without tests with version.run.xml
index 8b5aed287..60ba1f5d7 100644
--- a/.runConfigurations/Build without tests with version.run.xml
+++ b/.runConfigurations/Build without tests with version.run.xml
@@ -4,7 +4,7 @@
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
- <option name="scriptParameters" value="-Pversion=6.0.0 --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-app:test" />
+ <option name="scriptParameters" value="-Pversion=6.3.4 --info --full-stacktrace -x :serverpackcreator-api:test -x :serverpackcreator-app:test" />
<option name="taskDescriptions">
<list />
</option>
diff --git a/.runConfigurations/Debug Fat Jar.run.xml b/.runConfigurations/Debug Fat Jar.run.xml
index 54b3bde79..9e193fe4e 100644
--- a/.runConfigurations/Debug Fat Jar.run.xml
+++ b/.runConfigurations/Debug Fat Jar.run.xml
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Debug Fat Jar" type="JarApplication">
<option name="JAR_PATH" value="$PROJECT_DIR$/serverpackcreator-app/build/libs/serverpackcreator-app-dev.jar" />
- <option name="WORKING_DIRECTORY" value="F:\GitLab\ServerPackCreator - ms6\serverpackcreator-app\tests" />
+ <option name="WORKING_DIRECTORY" value="F:\GitLab\ServerPackCreator\serverpackcreator-app\tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="temurin-21" />
<method v="2">
diff --git a/serverpackcreator-api/src/test/resources/serverpackcreator.properties b/serverpackcreator-api/src/test/resources/serverpackcreator.properties
index 14c914bfa..c6fb7141a 100644
--- a/serverpackcreator-api/src/test/resources/serverpackcreator.properties
+++ b/serverpackcreator-api/src/test/resources/serverpackcreator.properties
@@ -1,5 +1,5 @@
#For details about each property, see https://help.serverpackcreator.de/settings-and-configs.html
-#Sat Aug 17 15:44:21 CEST 2024
+#Sat Aug 17 19:07:31 CEST 2024
de.griefed.serverpackcreator.configuration.aikar=-Xms4G -Xmx4G -XX\:+UseG1GC -XX\:+ParallelRefProcEnabled -XX\:MaxGCPauseMillis\=200 -XX\:+UnlockExperimentalVMOptions -XX\:+DisableExplicitGC -XX\:+AlwaysPreTouch -XX\:G1NewSizePercent\=30 -XX\:G1MaxNewSizePercent\=40 -XX\:G1HeapRegionSize\=8M -XX\:G1ReservePercent\=20 -XX\:G1HeapWastePercent\=5 -XX\:G1MixedGCCountTarget\=4 -XX\:InitiatingHeapOccupancyPercent\=15 -XX\:G1MixedGCLiveThresholdPercent\=90 -XX\:G1RSetUpdatingPauseTimePercent\=5 -XX\:SurvivorRatio\=32 -XX\:+PerfDisableSharedMem -XX\:MaxTenuringThreshold\=1 -Dusing.aikars.flags\=https\://mcflags.emc.gs -Daikars.new.flags\=true
de.griefed.serverpackcreator.configuration.directories.mustinclude=mods,config,kubejs,defaultconfigs,scripts
de.griefed.serverpackcreator.configuration.directories.shouldexclude=overrides,packmenu,resourcepacks,server_pack,fancymenu,libraries,downloads,logs,profileImage,resourcepacks,screenshots,shaderpacks,tv-cache,asm
diff --git a/serverpackcreator-api/src/test/resources/testresources/properties/filters/contains.properties b/serverpackcreator-api/src/test/resources/testresources/properties/filters/contains.properties
index 00fb0b5bf..0ce71cdf7 100644
--- a/serverpackcreator-api/src/test/resources/testresources/properties/filters/contains.properties
+++ b/serverpackcreator-api/src/test/resources/testresources/properties/filters/contains.properties
@@ -8,7 +8,7 @@ de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolu
de.griefed.serverpackcreator.configuration.hastebinserver=https\://haste.zneix.eu/documents
de.griefed.serverpackcreator.configuration.modswhitelist=Ping-Wheel-
de.griefed.serverpackcreator.firstrun=false
-de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
de.griefed.serverpackcreator.java=C\:\\Program Files\\Eclipse Adoptium\\jdk-21.0.1.12-hotspot\\bin\\java.exe
de.griefed.serverpackcreator.language=en_us
de.griefed.serverpackcreator.minecraft.snapshots=false
@@ -24,5 +24,5 @@ de.griefed.serverpackcreator.spring.schedules.database.cleanup=0 0 0 * * *
de.griefed.serverpackcreator.spring.schedules.files.cleanup=0 30 0 * * *
de.griefed.serverpackcreator.spring.schedules.versions.refresh=0 0 0 * * *
de.griefed.serverpackcreator.versioncheck.prerelease=false
-server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
spring.datasource.url=jdbc\:postgresql\://localhost\:5432/serverpackcreator
diff --git a/serverpackcreator-api/src/test/resources/testresources/properties/filters/either.properties b/serverpackcreator-api/src/test/resources/testresources/properties/filters/either.properties
index 309ad16cf..e991e968b 100644
--- a/serverpackcreator-api/src/test/resources/testresources/properties/filters/either.properties
+++ b/serverpackcreator-api/src/test/resources/testresources/properties/filters/either.properties
@@ -8,7 +8,7 @@ de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolu
de.griefed.serverpackcreator.configuration.hastebinserver=https\://haste.zneix.eu/documents
de.griefed.serverpackcreator.configuration.modswhitelist=Ping-Wheel-
de.griefed.serverpackcreator.firstrun=false
-de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
de.griefed.serverpackcreator.java=C\:\\Program Files\\Eclipse Adoptium\\jdk-21.0.1.12-hotspot\\bin\\java.exe
de.griefed.serverpackcreator.language=en_us
de.griefed.serverpackcreator.minecraft.snapshots=false
@@ -24,5 +24,5 @@ de.griefed.serverpackcreator.spring.schedules.database.cleanup=0 0 0 * * *
de.griefed.serverpackcreator.spring.schedules.files.cleanup=0 30 0 * * *
de.griefed.serverpackcreator.spring.schedules.versions.refresh=0 0 0 * * *
de.griefed.serverpackcreator.versioncheck.prerelease=false
-server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
spring.datasource.url=jdbc\:postgresql\://localhost\:5432/serverpackcreator
diff --git a/serverpackcreator-api/src/test/resources/testresources/properties/filters/end.properties b/serverpackcreator-api/src/test/resources/testresources/properties/filters/end.properties
index b16ec7eb0..e5904fd35 100644
--- a/serverpackcreator-api/src/test/resources/testresources/properties/filters/end.properties
+++ b/serverpackcreator-api/src/test/resources/testresources/properties/filters/end.properties
@@ -9,7 +9,7 @@ de.griefed.serverpackcreator.configuration.hastebinserver=https\://haste.zneix.e
de.griefed.serverpackcreator.configuration.modswhitelist=Ping-Wheel-
de.griefed.serverpackcreator.configuration.saveloadedconfig=false
de.griefed.serverpackcreator.firstrun=false
-de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
de.griefed.serverpackcreator.java=C\:\\Program Files\\Eclipse Adoptium\\jdk-21.0.1.12-hotspot\\bin\\java.exe
de.griefed.serverpackcreator.language=en_us
de.griefed.serverpackcreator.minecraft.snapshots=false
@@ -25,5 +25,5 @@ de.griefed.serverpackcreator.spring.schedules.database.cleanup=0 0 0 * * *
de.griefed.serverpackcreator.spring.schedules.files.cleanup=0 30 0 * * *
de.griefed.serverpackcreator.spring.schedules.versions.refresh=0 0 0 * * *
de.griefed.serverpackcreator.versioncheck.prerelease=false
-server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
spring.datasource.url=jdbc\:postgresql\://localhost\:5432/serverpackcreator
diff --git a/serverpackcreator-api/src/test/resources/testresources/properties/filters/regex.properties b/serverpackcreator-api/src/test/resources/testresources/properties/filters/regex.properties
index 30efc05b3..d9ddd17c9 100644
--- a/serverpackcreator-api/src/test/resources/testresources/properties/filters/regex.properties
+++ b/serverpackcreator-api/src/test/resources/testresources/properties/filters/regex.properties
@@ -8,7 +8,7 @@ de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolu
de.griefed.serverpackcreator.configuration.hastebinserver=https\://haste.zneix.eu/documents
de.griefed.serverpackcreator.configuration.modswhitelist=Ping-Wheel-
de.griefed.serverpackcreator.firstrun=false
-de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
de.griefed.serverpackcreator.java=C\:\\Program Files\\Eclipse Adoptium\\jdk-21.0.1.12-hotspot\\bin\\java.exe
de.griefed.serverpackcreator.language=en_us
de.griefed.serverpackcreator.minecraft.snapshots=false
@@ -24,5 +24,5 @@ de.griefed.serverpackcreator.spring.schedules.database.cleanup=0 0 0 * * *
de.griefed.serverpackcreator.spring.schedules.files.cleanup=0 30 0 * * *
de.griefed.serverpackcreator.spring.schedules.versions.refresh=0 0 0 * * *
de.griefed.serverpackcreator.versioncheck.prerelease=false
-server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
spring.datasource.url=jdbc\:postgresql\://localhost\:5432/serverpackcreator
diff --git a/serverpackcreator-api/src/test/resources/testresources/properties/filters/start.properties b/serverpackcreator-api/src/test/resources/testresources/properties/filters/start.properties
index 97e72482b..df054422e 100644
--- a/serverpackcreator-api/src/test/resources/testresources/properties/filters/start.properties
+++ b/serverpackcreator-api/src/test/resources/testresources/properties/filters/start.properties
@@ -8,7 +8,7 @@ de.griefed.serverpackcreator.configuration.fallbackmodslist=3dskinlayers-,Absolu
de.griefed.serverpackcreator.configuration.hastebinserver=https\://haste.zneix.eu/documents
de.griefed.serverpackcreator.configuration.modswhitelist=Ping-Wheel-
de.griefed.serverpackcreator.firstrun=false
-de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+de.griefed.serverpackcreator.home=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
de.griefed.serverpackcreator.java=C\:\\Program Files\\Eclipse Adoptium\\jdk-21.0.1.12-hotspot\\bin\\java.exe
de.griefed.serverpackcreator.language=en_us
de.griefed.serverpackcreator.minecraft.snapshots=false
@@ -24,5 +24,5 @@ de.griefed.serverpackcreator.spring.schedules.database.cleanup=0 0 0 * * *
de.griefed.serverpackcreator.spring.schedules.files.cleanup=0 30 0 * * *
de.griefed.serverpackcreator.spring.schedules.versions.refresh=0 0 0 * * *
de.griefed.serverpackcreator.versioncheck.prerelease=false
-server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator - ms6\\serverpackcreator-api\\tests
+server.tomcat.basedir=F\:\\GitLab\\ServerPackCreator\\serverpackcreator-api\\tests
spring.datasource.url=jdbc\:postgresql\://localhost\:5432/serverpackcreator
diff --git a/spc.install4j b/spc.install4j
index 932390941..3d48059fb 100644
--- a/spc.install4j
+++ b/spc.install4j
@@ -3,7 +3,7 @@
<directoryPresets config="./img" />
<application name="ServerPackCreator" applicationId="3565-3228-6904-0931" mediaDir="./media" mediaFilePattern="ServerPackCreator-${compiler:sys.version}-Installer-${compiler:sys.platform}" compression="9" lzmaCompression="true" createChecksums="false" shrinkRuntime="false" shortName="SPC" publisher="Griefed" publisherWeb="https://serverpackcreator.de" version="${compiler:projectVersion}" allPathsRelative="true" autoSave="true" macVolumeId="521d0a10ddf6d897" javaMinVersion="21">
<variables>
- <variable name="projectDir" value="F:\GitLab\ServerPackCreator - ms6" description="Project directory of ServerPackCreator on your system" />
+ <variable name="projectDir" value="F:\GitLab\ServerPackCreator" description="Project directory of ServerPackCreator on your system" />
<variable name="projectVersion" value="dev" description="The version with which to build this installer." />
<variable name="projectYear" value="2024" />
</variables>
--
GitLab