diff --git a/.gitignore b/.gitignore index 04a624879..0e0d47eed 100644 --- a/.gitignore +++ b/.gitignore @@ -30,9 +30,10 @@ config/emendatusenigmatica/default config/forgeendertech/Biomes/ screenshots/ -# Instance Sync and other jars +# Cat-Downloader-Legacy and other jars **/*.jar !InstanceSync*.jar +!Cat-Downloader-Legacy-*.jar **/*.jar.disabled **/*.jar.meta @@ -260,6 +261,9 @@ NewWorldBiomeIdFixer.json config/terraforged/performance_internal.conf config/sidebar_buttons.json config/emi.css +automation/CDL-Logs/*.log +automation/CDL-Logs/*.log.gz +automation/Cat-Downloader-Legacy-Settings.json5 emi.json config/compressedcreativity-client.toml config/AdvancedBackups-client.properties diff --git a/InstanceSync.jar b/InstanceSync.jar deleted file mode 100644 index fb26ea9e5..000000000 Binary files a/InstanceSync.jar and /dev/null differ diff --git a/automation/Cat-Downloader-Legacy.jar b/automation/Cat-Downloader-Legacy.jar new file mode 100644 index 000000000..09e0abb89 Binary files /dev/null and b/automation/Cat-Downloader-Legacy.jar differ diff --git a/automation/Cat-Downloader-Legacy_Setup.bat b/automation/Cat-Downloader-Legacy_Setup.bat new file mode 100644 index 000000000..c1023aa23 --- /dev/null +++ b/automation/Cat-Downloader-Legacy_Setup.bat @@ -0,0 +1,16 @@ +@echo off + +REM You set your arguments here +set arguments_setup=-SettingsPath:automation -LogsPath:automation/CDL-Logs -DefaultSettings:false -Mode:CF-Instance +set arguments_launch=-SettingsPath:automation + +cd .. +type NUL > .git/hooks/post-merge +echo #!/bin/sh > .git/hooks/post-merge +echo java -jar automation/Cat-Downloader-Legacy.jar %arguments_launch% >> .git/hooks/post-merge + +echo Git Hooks have been set up! Running Cat-Downloader-Legacy... + +IF EXIST "automation/Cat-Downloader-Legacy-Settings.json5" (java -jar automation/Cat-Downloader-Legacy.jar %arguments_launch%) ELSE (java -jar automation/Cat-Downloader-Legacy.jar %arguments_setup%) + +pause \ No newline at end of file diff --git a/automation/Cat-Downloader-Legacy_Setup.sh b/automation/Cat-Downloader-Legacy_Setup.sh new file mode 100644 index 000000000..8277d6976 --- /dev/null +++ b/automation/Cat-Downloader-Legacy_Setup.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +ARGUMENTS_SETUP="-SettingsPath:automation -LogsPath:automation/CDL-Logs -DefaultSettings:false -Mode:CF-Instance" +ARGUMENTS_LAUNCH="-SettingsPath:automation" + +cd .. +echo "#!/bin/sh" > .git/hooks/post-merge +echo "java -jar automation/Cat-Downloader-Legacy.jar ${ARGUMENTS_LAUNCH}" >> .git/hooks/post-merge +chmod +x .git/hooks/post-merge + +echo Git Hooks have been set up! Running Cat-Downloader-Legacy... + +if [ -f "automation/Cat-Downloader-Legacy-Settings.json5" ]; then + java -jar automation/Cat-Downloader-Legacy.jar ${ARGUMENTS_LAUNCH} +else + java -jar automation/Cat-Downloader-Legacy.jar ${ARGUMENTS_SETUP} +fi diff --git a/automation/InstanceSyncSetup.bat b/automation/InstanceSyncSetup.bat deleted file mode 100644 index a13b7116d..000000000 --- a/automation/InstanceSyncSetup.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off - -cd .. -type NUL > .git/hooks/post-merge -echo #!/bin/sh > .git/hooks/post-merge -echo java -jar InstanceSync.jar >> .git/hooks/post-merge - -echo Done setting up hooks -echo Running InstanceSync - -java -jar InstanceSync.jar \ No newline at end of file diff --git a/automation/InstanceSyncSetup.sh b/automation/InstanceSyncSetup.sh deleted file mode 100644 index 2963488fc..000000000 --- a/automation/InstanceSyncSetup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -cd .. -echo "#!/bin/sh" > .git/hooks/post-merge -echo "java -jar InstanceSync.jar" >> .git/hooks/post-merge -chmod +x .git/hooks/post-merge - -echo "Done setting up hooks" -echo "Running InstanceSync" - -java -jar InstanceSync.jar \ No newline at end of file