From d288115757bac9effe81c61bcf933c299e8b6d36 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 5 Dec 2024 12:56:37 +0000 Subject: [PATCH] Update readme with fully working process. --- pfm/cache/pfm-datapack/modsList | 2 +- readme.txt | 4 +++ sync_instance_with_server.bat | 57 +++++++++++++++++++-------------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/pfm/cache/pfm-datapack/modsList b/pfm/cache/pfm-datapack/modsList index b1f2ae9..0aa75ab 100644 --- a/pfm/cache/pfm-datapack/modsList +++ b/pfm/cache/pfm-datapack/modsList @@ -1 +1 @@ -{ag_day_counter=3.0, aiimprovements=0.5.2, alexsmobs=1.18.6, alternate_current=0.0NONE, another_furniture=1.2.2-1.18.2, ante=1.1, apocalypsenow=2.0.7, architectury=4.11.93, artifacts=1.18.2-4.2.0, atlaslib=1.1.7a, attributefix=14.0.2, autoreglib=1.7-53, balm=3.2.1+0, bcc=1.1.21-build.48+mc1.18.2, beefix=1.0.7, bettercombat=1.6.2+1.18.2, bettermineshafts=1.18.2-Forge-2.2, biomesoplenty=1.18.2-16.0.0.109, buildersdelight=1.0, camera=1.18.2-1.0.5, canary=0.3.3, car=1.18.2-1.0.1, carryon=1.17.0.8, cfm=7.0.0-pre35, cgm=1.3.3, chalk=1.4.2, chunky=1.2.164, citadel=1.11.3, clickmachine=6.0.5, cloth_config=6.4.90, clumps=8.0.0+17, cold_sweat=2.2.5.1, collective=6.53, comforts=1.18.2-5.0.0.6, configured=2.0.0, connectivity=1.18.2-3.2, contenttweaker=1.0.0+13, coroutil=1.18.2-1.3.6, corpse=1.18.2-1.0.1, cosmeticarmorreworked=1.18.2-v2a, crafttweaker=9.1.211, create=0.5.1.f, create_central_kitchen=1.3.9.d, create_sa=2.0.4., createaddition=1.18.2-1.0.0, createbigcannons=0.5.3.b-nightly-55e3ae8, createdeco=1.3.3-1.18.2, createtweaker=2.0.0.20, creativecore=0.0NONE, crittersandcompanions=1.18.2-1.0.2, crossbowverhaul=1.4.1, cupboard=1.18.2-1.5, curios=1.18.2-5.0.7.1, customportalapi=0.0.5-1.18.2-forge, customvillagertrades=18.24.0, dcfixes=1.0.7, diet=1.18.2-1.3.2.1, dietarystatistics=1.0.2, drg_flares=1.2.2, dsp=1.0.1-build.10+mc1.18.2, dummmmmmy=1.18-1.5.2, durabilitytooltip=1.1.4, easy_villagers=1.18.2-1.0.11, embellishcraft=1.18.2-5.0.1.0, emojiful=1.18.2-3.0.1, enhancedai=1.6.11, enhancedcelestials=2.0.7, enhancedvisuals=1.6.4, entitycollisionfpsfix=1.0.0, expandability=6.0.0, explorerscompass=1.18.2-1.3.0-forge, farmersdelight=1.18.2-1.2.3, fastasyncworldsave=1.18.2-1.2, fastbench=6.1.1, fastfurnace=6.0.3, fastleafdecay=28, fastsuite=3.0.2, ferritecore=4.2.2, firstaid=1.11.1, fixedanvilrepaircost=3.1, flywheel=0.6.10-105, forge=40.2.4, framework=0.4.2, ftblibrary=1802.3.9-build.167, ftbquests=1802.3.15-build.298, ftbteams=1802.2.9-build.88, fxcontrol=1.18-3.0.9, geckolib3=3.0.57, getittogetherdrops=1.3, globalgamerules=6.0.0.5, guardvillagers=1.4.3, harvestwithease=6.1.0.0, horde_hoard=1.0.0, hordes=1.5.3a, iceberg=1.0.49, immersiveengineering=1.18.2-8.4.0-161, immersivepetroleum=4.2.0-25, immersiveposts=4.3.0-3, incontrol=1.18-6.1.13, insanelib=1.5.3, itemfilters=1802.2.8-build.47, jei=10.2.1.1005, jeimultiblocks=0.0.2, jeitweaker=3.0.0.9, kiwi=6.1.3, kotlinforforge=3.10.0, kubejs=1802.5.5-build.567, lazydfu=0.1.3, lightspeed=1.18.2-1.1.0, logbegone=1.0.4, lootr=0.3.25.62, lostcities=1.18-5.3.29, lostsouls=1.18-2.0.5, mapperbase=1.18.2-4.0.1.0, maxhealthfix=5.0.4, minecraft=1.18.2, mixinextras=0.4.0-beta.2, mixinsquared=0.1.2-beta.6, mobsunscreen=1.18.1-3.0.4, mobtimizations=1.18.2-1.0.0, modernfix=5.13.0+mc1.18.2, mousetweaks=2.21, mutationcraft=1.0.0, nameless_trinkets=1.18.2-1.7.5, nanhealthfixer=1.18.2-0.0.1, naturescompass=1.18.2-1.9.7-forge, nerb=0.3, novillagerdm=3.0.0, openpartiesandclaims=0.20.1, oretweaker=3.4.0, parcool=1.18.2-3.1.0.6-R, patchouli=1.18.2-71.1, pehkui=3.7.11+1.18.2-forge, pfm=1.2.1, pipez=1.18.2-1.1.5, placebo=6.6.6, playeranimator=1.0.2+1.18, pluto=0.0.6, polymorph=1.18.2-0.46, puffish_skills=0.10.0, quark=3.2-358, railways=1.4.8+forge-mc1.18.2-build.23, readyplayerfun=1.18.2-1.4.1.9, refinedstorage=1.10.6, rhino=1802.2.1-build.255, ritchiesprojectilelib=1.0.0-3a68f88+1.18.2-forge, rocks=1.0.4, saturn=0.1.3, securitycraft=1.9.7, selene=1.18.2-1.17.9, sereneseasons=1.18.2-7.0.0.13, simplebackups=1.18.2-1.1.9, simpleplanes=1.18.2-5.2.1, simpleshops=1.1.4, simplylight=1.18.2-1.4.5-build.43, smoothboot=0.0.4, smoothchunk=1.18.2-1.9, snowrealmagic=4.2.4, solcarrot=1.18.1-1.12.0, sophisticatedbackpacks=1.18.2-3.19.1.959, sophisticatedcore=1.18.2-0.5.106.502, spacecatasb=18.13.1, spark=1.10.38, spiderstpo=2.0.3, stackablepotions=1.0.0, starlight=1.0.2+forge.83663de, starterkit=5.2, storagedrawers=10.2.1, structureessentials=1.18.2-3.0, supermartijn642configlib=1.1.6, supermartijn642corelib=1.1.12, swingthroughgrass=1.18.2-1.9.1, tac=0.3.10-1.18.2, terrablender=1.2.0.126, theoneprobe=1.18-5.1.2, thirst=1.18.2-1.3.4, toofast=0.0.1.2, trashcans=1.0.18, trashslot=11.0.3, treeharvester=8.1, undead_revamp2=1.0.0, vmh=1.2.2-forge-1.18.2, voicechat=1.18.2-2.4.28, watut=1.18.2-1.0.14, xaerominimapfair=24.2.0, xaeroworldmap=1.39.0, xpbook=2.1.7, yungsapi=1.18.2-Forge-2.2.9, zombie_extreme=0.2.4, zombieawareness=1.18.1-1.12.3, zombiemobs=1.4.0} \ No newline at end of file +{ag_day_counter=3.0, aiimprovements=0.5.2, alexsmobs=1.18.6, alternate_current=0.0NONE, another_furniture=1.2.2-1.18.2, ante=1.1, apocalypsenow=2.0.7, architectury=4.11.93, artifacts=1.18.2-4.2.0, atlaslib=1.1.7a, attributefix=14.0.2, autoreglib=1.7-53, balm=3.2.1+0, bcc=1.1.21-build.48+mc1.18.2, beefix=1.0.7, bettercombat=1.6.2+1.18.2, bettermineshafts=1.18.2-Forge-2.2, biomesoplenty=1.18.2-16.0.0.109, buildersdelight=1.0, camera=1.18.2-1.0.5, canary=0.3.3, car=1.18.2-1.0.1, carryon=1.17.0.8, cfm=7.0.0-pre35, cgm=1.3.3, chalk=1.4.2, chunky=1.2.164, citadel=1.11.3, clickmachine=6.0.5, cloth_config=6.4.90, clumps=8.0.0+17, cold_sweat=2.2.5.1, collective=6.53, comforts=1.18.2-5.0.0.6, configured=2.0.0, connectivity=1.18.2-3.2, contenttweaker=1.0.0+13, coroutil=1.18.2-1.3.6, corpse=1.18.2-1.0.1, cosmeticarmorreworked=1.18.2-v2a, crafttweaker=9.1.211, create=0.5.1.f, create_central_kitchen=1.3.9.d, create_sa=2.0.4., createaddition=1.18.2-1.0.0, createbigcannons=0.5.3.b-nightly-55e3ae8, createdeco=1.3.3-1.18.2, createtweaker=2.0.0.20, creativecore=0.0NONE, crittersandcompanions=1.18.2-1.0.2, crossbowverhaul=1.4.1, cupboard=1.18.2-1.5, curios=1.18.2-5.0.7.1, customportalapi=0.0.5-1.18.2-forge, customvillagertrades=18.24.0, dcfixes=1.0.7, diet=1.18.2-1.3.2.1, dietarystatistics=1.0.2, drg_flares=1.2.2, dsp=1.0.1-build.10+mc1.18.2, dummmmmmy=1.18-1.5.2, durabilitytooltip=1.1.4, easy_villagers=1.18.2-1.0.11, embellishcraft=1.18.2-5.0.1.0, emojiful=1.18.2-3.0.1, enhancedai=1.6.11, enhancedcelestials=2.0.7, enhancedvisuals=1.6.4, entitycollisionfpsfix=1.0.0, expandability=6.0.0, explorerscompass=1.18.2-1.3.0-forge, farmersdelight=1.18.2-1.2.3, fastasyncworldsave=1.18.2-1.2, fastbench=6.1.1, fastfurnace=6.0.3, fastleafdecay=28, fastsuite=3.0.2, ferritecore=4.2.2, firstaid=1.11.1, fixedanvilrepaircost=3.1, flywheel=0.6.10-105, forge=40.2.4, framework=0.4.2, ftblibrary=1802.3.9-build.167, ftbquests=1802.3.15-build.298, ftbteams=1802.2.9-build.88, fxcontrol=1.18-3.0.9, geckolib3=3.0.57, getittogetherdrops=1.3, globalgamerules=6.0.0.5, guardvillagers=1.4.3, harvestwithease=6.1.0.0, horde_hoard=1.0.0, hordes=1.5.3a, iceberg=1.0.49, immersiveengineering=1.18.2-8.4.0-161, immersivepetroleum=4.2.0-25, immersiveposts=4.3.0-3, incontrol=1.18-6.1.13, insanelib=1.5.3, itemfilters=1802.2.8-build.47, jei=10.2.1.1005, jeimultiblocks=0.0.2, jeitweaker=3.0.0.9, kiwi=6.1.3, kotlinforforge=3.10.0, kubejs=1802.5.5-build.567, lazydfu=0.1.3, lightspeed=1.18.2-1.1.0, logbegone=1.0.4, lootr=0.3.25.62, lostcities=1.18-5.3.29, lostsouls=1.18-2.0.5, mapperbase=1.18.2-4.0.1.0, maxhealthfix=5.0.4, minecraft=1.18.2, mixinextras=0.4.0-beta.2, mixinsquared=0.1.2-beta.6, mobsunscreen=1.18.1-3.0.4, mobtimizations=1.18.2-1.0.0, modernfix=5.13.0+mc1.18.2, mousetweaks=2.21, mutationcraft=1.0.0, nameless_trinkets=1.18.2-1.7.5, nanhealthfixer=1.18.2-0.0.1, naturescompass=1.18.2-1.9.7-forge, nerb=0.3, novillagerdm=3.0.0, openpartiesandclaims=0.20.1, oretweaker=3.4.0, parcool=1.18.2-3.1.0.6-R, patchouli=1.18.2-71.1, pehkui=3.7.11+1.18.2-forge, pfm=1.2.1, pipez=1.18.2-1.1.5, placebo=6.6.6, playeranimator=1.0.2+1.18, playerstats=1.0.0, pluto=0.0.6, polymorph=1.18.2-0.46, puffish_skills=0.10.0, quark=3.2-358, railways=1.4.8+forge-mc1.18.2-build.23, readyplayerfun=1.18.2-1.4.1.9, refinedstorage=1.10.6, rhino=1802.2.1-build.255, ritchiesprojectilelib=1.0.0-3a68f88+1.18.2-forge, rocks=1.0.4, saturn=0.1.3, securitycraft=1.9.7, selene=1.18.2-1.17.9, sereneseasons=1.18.2-7.0.0.13, simplebackups=1.18.2-1.1.9, simpleplanes=1.18.2-5.2.1, simpleshops=1.1.4, simplylight=1.18.2-1.4.5-build.43, smoothboot=0.0.4, smoothchunk=1.18.2-1.9, snowrealmagic=4.2.4, solcarrot=1.18.1-1.12.0, sophisticatedbackpacks=1.18.2-3.19.1.959, sophisticatedcore=1.18.2-0.5.106.502, spacecatasb=18.13.1, spark=1.10.38, spiderstpo=2.0.3, stackablepotions=1.0.0, starlight=1.0.2+forge.83663de, starterkit=5.2, storagedrawers=10.2.1, structureessentials=1.18.2-3.0, supermartijn642configlib=1.1.6, supermartijn642corelib=1.1.12, swingthroughgrass=1.18.2-1.9.1, tac=0.3.10-1.18.2, terrablender=1.2.0.126, theoneprobe=1.18-5.1.2, thirst=1.18.2-1.3.4, toofast=0.0.1.2, trashcans=1.0.18, trashslot=11.0.3, treeharvester=8.1, undead_revamp2=1.0.0, vmh=1.2.2-forge-1.18.2, voicechat=1.18.2-2.4.28, watut=1.18.2-1.0.14, xaerominimapfair=24.2.0, xaeroworldmap=1.39.0, xpbook=2.1.7, yungsapi=1.18.2-Forge-2.2.9, zombie_extreme=0.2.4, zombieawareness=1.18.1-1.12.3, zombiemobs=1.4.0} \ No newline at end of file diff --git a/readme.txt b/readme.txt index e7dc325..1760c84 100644 --- a/readme.txt +++ b/readme.txt @@ -5,3 +5,7 @@ # Run the forge installer 1.18.2-40.2.4 and click Install server, then select this directory to install. # After that, launch the command prompt and navigate to the project directory then run run.bat file to start the server and notify the discord channel. Make sure to agree with eula on the first time. + +# Sync minecraft instance with server: +## 1. paste minecraft_server_zombie/sync_instance_with_server.bat in your instance's minecraft directory +## 2. double click to run sync_instance_with_server.bat from your instance's minecraft directory \ No newline at end of file diff --git a/sync_instance_with_server.bat b/sync_instance_with_server.bat index 69a812b..e98a40a 100644 --- a/sync_instance_with_server.bat +++ b/sync_instance_with_server.bat @@ -20,39 +20,48 @@ if %ERRORLEVEL% NEQ 0 ( exit /b 1 ) -:: Process each folder +:: Create a temporary directory for the git operations +set "TEMP_GIT_DIR=%TEMP%\mc_git_sync" +if exist "%TEMP_GIT_DIR%" rd /s /q "%TEMP_GIT_DIR%" +mkdir "%TEMP_GIT_DIR%" +cd "%TEMP_GIT_DIR%" + +:: Initialize git repo +git init +git remote add origin "%REPO_URL%" +git config core.sparseCheckout true + +:: Set up sparse checkout for selected folders +del /q .git\info\sparse-checkout 2>nul for %%F in (%SYNC_FOLDERS%) do ( - echo Processing %%F... - - :: Create directory if it doesn't exist - if not exist "%~dp0%%F" mkdir "%~dp0%%F" - - :: Initialize git in the directory if not already done - if not exist "%~dp0%%F\.git" ( - cd "%~dp0%%F" - git init - git remote add origin "%REPO_URL%" - :: Configure sparse checkout - git config core.sparseCheckout true - :: Set up sparse checkout to only get this directory - echo %%F> .git/info/sparse-checkout - :: Initial fetch of just this directory - git fetch --depth 1 origin main - git checkout main - ) else ( - :: Just pull updates if git is already initialized - cd "%~dp0%%F" - git fetch origin main - git reset --hard origin/main + echo %%F/>> .git\info\sparse-checkout +) + +:: Fetch latest content +git fetch --depth 1 origin main +git checkout main + +:: Copy contents to instance folders +for %%F in (%SYNC_FOLDERS%) do ( + if exist "%TEMP_GIT_DIR%\%%F" ( + echo Syncing %%F... + :: Create target directory if it doesn't exist + if not exist "%~dp0%%F" mkdir "%~dp0%%F" + :: Copy contents, updating only newer files + robocopy "%TEMP_GIT_DIR%\%%F" "%~dp0%%F" /E /XO /NP /NFL /NDL ) ) +:: Clean up +cd "%~dp0" +rd /s /q "%TEMP_GIT_DIR%" + echo. echo Sync completed successfully! echo. echo This sync has: echo - Updated all tracked files from the repository -echo - Kept your local untracked files intact +echo - Preserved your local untracked files echo. pause \ No newline at end of file