diff --git a/.minecraft/icon.png b/.minecraft/icon.png deleted file mode 100644 index 05e1398..0000000 Binary files a/.minecraft/icon.png and /dev/null differ diff --git a/instance.cfg b/instance.cfg index cb1d414..688b751 100644 --- a/instance.cfg +++ b/instance.cfg @@ -10,7 +10,7 @@ LWJGLVersion= LiteloaderVersion= LogPrePostOutput=true MCLaunchMethod=LauncherPart -OverrideCommands=false +OverrideCommands=true OverrideConsole=false OverrideGameTime=false OverrideJavaArgs=false @@ -19,9 +19,12 @@ OverrideMCLaunchMethod=false OverrideMemory=false OverrideNativeWorkarounds=false OverrideWindow=false -iconKey=default -lastLaunchTime=1638305015568 -lastTimePlayed=152 -name=Vanillia 1.18 +PostExitCommand= +PreLaunchCommand=$INST_DIR/update-pack.exe +WrapperCommand= +iconKey=vanillia +lastLaunchTime= +lastTimePlayed= +name=Vanillia Pack 1.18 notes= -totalTimePlayed=245 +totalTimePlayed= diff --git a/update-pack.data/config.toml b/update-pack.data/config.toml new file mode 100644 index 0000000..642ed72 --- /dev/null +++ b/update-pack.data/config.toml @@ -0,0 +1,23 @@ +# The program to run, can be defined as a direct +# file path, or as an EXE in the $PATH variable +program = "busybox.exe" +programArgs = "bash -c 'start.sh'" + +# Working Directory +workingDirectory = "{data}/" + +# Do not include windows path +# If True, only the data directory will be +# treated as $PATH +isolatedPath = true + +# Global Environment variables to be set +# to aid with portability, +[environment] + # Please do not edit these values unless you + # know what you are doing + APPDATA = "{data}/APPDATA" + LOCALAPPDATA = "{data}/APPDATA" + HOME = "{data}/" + USERPROFILE = "{data}/" + # Put your custom environment variables here \ No newline at end of file diff --git a/update-pack.data/start.sh b/update-pack.data/start.sh new file mode 100644 index 0000000..acb45f3 --- /dev/null +++ b/update-pack.data/start.sh @@ -0,0 +1,6 @@ +## DO NOT EDIT THIS FILE, ## +## DOING SO WILL BREAK ## +## THE UPDATER +cp updater.sh update.sh +bash update.sh +rm update.sh diff --git a/update-pack.data/updater.sh b/update-pack.data/updater.sh new file mode 100644 index 0000000..66a7b78 --- /dev/null +++ b/update-pack.data/updater.sh @@ -0,0 +1,21 @@ +GITURL="https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.1/PortableGit-2.33.0-64-bit.7z.exe" + +#install git if not found +if [ ! -f "git/bin/git.exe" ]; then + if [ ! -d "temp" ]; then + mkdir temp + fi + if [ ! -f "temp/git.install.exe" ]; then + wget $GITURL -O temp/git.install.exe + fi + temp/git.install.exe -o git -y +fi +rm -rf temp + +cd ../ + +update-pack.data/git/bin/git.exe config pull.rebase false +update-pack.data/git/bin/git.exe pull origin 1.18 +update-pack.data/git/bin/git.exe branch -D main + +echo "[$0] If there were any errors, please inform the Modpack Author" diff --git a/update-pack.exe b/update-pack.exe new file mode 100644 index 0000000..cc461cf Binary files /dev/null and b/update-pack.exe differ