Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap out InstanceSync for Cat-Downloader-Legacy #659

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -260,3 +261,6 @@ 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
Binary file removed InstanceSync.jar
Binary file not shown.
Binary file added automation/Cat-Downloader-Legacy.jar
NielsPilgaard marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
16 changes: 16 additions & 0 deletions automation/Cat-Downloader-Legacy_Setup.bat
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions automation/Cat-Downloader-Legacy_Setup.sh
Original file line number Diff line number Diff line change
@@ -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
11 changes: 0 additions & 11 deletions automation/InstanceSyncSetup.bat

This file was deleted.

11 changes: 0 additions & 11 deletions automation/InstanceSyncSetup.sh

This file was deleted.