diff --git a/.gitignore b/.gitignore index b8f715a..9304d64 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ .minecraft/.* .minecraft/essential .minecraft/figura -.minecraft/mods/ .minecraft/ModTranslations .minecraft/not-enough-crashes .minecraft/patched_shaders diff --git a/packwiz-data/index.toml b/.minecraft/index.toml similarity index 98% rename from packwiz-data/index.toml rename to .minecraft/index.toml index 8749368..2dff0f8 100644 --- a/packwiz-data/index.toml +++ b/.minecraft/index.toml @@ -220,6 +220,11 @@ file = "mods/plasmo-voice.toml" hash = "57a9ada9e8ce3c8e7ad5329bf9fb23e9e9b67b8218ded7637f6858a6a6b98764" metafile = true +[[files]] +file = "mods/replaymod.toml" +hash = "3e34335c8ef1e7cdd67398611b5adeb3e5e6dbe01b2dc0a24c20514d12692f79" +metafile = true + [[files]] file = "mods/roughly-enough-items.toml" hash = "a5ac3d55f14e556a76eebad326f3cd531b86318df09bdd039ca6d6f567c83ae0" diff --git a/packwiz-data/mods/antighost.toml b/.minecraft/mods/antighost.toml similarity index 100% rename from packwiz-data/mods/antighost.toml rename to .minecraft/mods/antighost.toml diff --git a/packwiz-data/mods/architectury-fabric.toml b/.minecraft/mods/architectury-fabric.toml similarity index 100% rename from packwiz-data/mods/architectury-fabric.toml rename to .minecraft/mods/architectury-fabric.toml diff --git a/packwiz-data/mods/badstdout.toml b/.minecraft/mods/badstdout.toml similarity index 100% rename from packwiz-data/mods/badstdout.toml rename to .minecraft/mods/badstdout.toml diff --git a/packwiz-data/mods/betterf3.toml b/.minecraft/mods/betterf3.toml similarity index 100% rename from packwiz-data/mods/betterf3.toml rename to .minecraft/mods/betterf3.toml diff --git a/packwiz-data/mods/blockmeterfabric.toml b/.minecraft/mods/blockmeterfabric.toml similarity index 100% rename from packwiz-data/mods/blockmeterfabric.toml rename to .minecraft/mods/blockmeterfabric.toml diff --git a/packwiz-data/mods/blockmixer-fabric.toml b/.minecraft/mods/blockmixer-fabric.toml similarity index 100% rename from packwiz-data/mods/blockmixer-fabric.toml rename to .minecraft/mods/blockmixer-fabric.toml diff --git a/packwiz-data/mods/blur-fabric.toml b/.minecraft/mods/blur-fabric.toml similarity index 100% rename from packwiz-data/mods/blur-fabric.toml rename to .minecraft/mods/blur-fabric.toml diff --git a/packwiz-data/mods/bobby.toml b/.minecraft/mods/bobby.toml similarity index 100% rename from packwiz-data/mods/bobby.toml rename to .minecraft/mods/bobby.toml diff --git a/packwiz-data/mods/c2me-fabric.toml b/.minecraft/mods/c2me-fabric.toml similarity index 100% rename from packwiz-data/mods/c2me-fabric.toml rename to .minecraft/mods/c2me-fabric.toml diff --git a/packwiz-data/mods/chunky.toml b/.minecraft/mods/chunky.toml similarity index 100% rename from packwiz-data/mods/chunky.toml rename to .minecraft/mods/chunky.toml diff --git a/packwiz-data/mods/cit-resewn.toml b/.minecraft/mods/cit-resewn.toml similarity index 100% rename from packwiz-data/mods/cit-resewn.toml rename to .minecraft/mods/cit-resewn.toml diff --git a/packwiz-data/mods/clear-despawn-fabric.toml b/.minecraft/mods/clear-despawn-fabric.toml similarity index 100% rename from packwiz-data/mods/clear-despawn-fabric.toml rename to .minecraft/mods/clear-despawn-fabric.toml diff --git a/packwiz-data/mods/cloth-config.toml b/.minecraft/mods/cloth-config.toml similarity index 100% rename from packwiz-data/mods/cloth-config.toml rename to .minecraft/mods/cloth-config.toml diff --git a/packwiz-data/mods/clumps.toml b/.minecraft/mods/clumps.toml similarity index 100% rename from packwiz-data/mods/clumps.toml rename to .minecraft/mods/clumps.toml diff --git a/packwiz-data/mods/continuity.toml b/.minecraft/mods/continuity.toml similarity index 100% rename from packwiz-data/mods/continuity.toml rename to .minecraft/mods/continuity.toml diff --git a/packwiz-data/mods/dark-loading-screen.toml b/.minecraft/mods/dark-loading-screen.toml similarity index 100% rename from packwiz-data/mods/dark-loading-screen.toml rename to .minecraft/mods/dark-loading-screen.toml diff --git a/packwiz-data/mods/entityculling.toml b/.minecraft/mods/entityculling.toml similarity index 100% rename from packwiz-data/mods/entityculling.toml rename to .minecraft/mods/entityculling.toml diff --git a/packwiz-data/mods/essential-mod.toml b/.minecraft/mods/essential-mod.toml similarity index 100% rename from packwiz-data/mods/essential-mod.toml rename to .minecraft/mods/essential-mod.toml diff --git a/packwiz-data/mods/fabric-api.toml b/.minecraft/mods/fabric-api.toml similarity index 100% rename from packwiz-data/mods/fabric-api.toml rename to .minecraft/mods/fabric-api.toml diff --git a/packwiz-data/mods/fabrishot.toml b/.minecraft/mods/fabrishot.toml similarity index 100% rename from packwiz-data/mods/fabrishot.toml rename to .minecraft/mods/fabrishot.toml diff --git a/packwiz-data/mods/ferritecore-fabric.toml b/.minecraft/mods/ferritecore-fabric.toml similarity index 100% rename from packwiz-data/mods/ferritecore-fabric.toml rename to .minecraft/mods/ferritecore-fabric.toml diff --git a/packwiz-data/mods/figura.toml b/.minecraft/mods/figura.toml similarity index 100% rename from packwiz-data/mods/figura.toml rename to .minecraft/mods/figura.toml diff --git a/packwiz-data/mods/first-person-model.toml b/.minecraft/mods/first-person-model.toml similarity index 100% rename from packwiz-data/mods/first-person-model.toml rename to .minecraft/mods/first-person-model.toml diff --git a/packwiz-data/mods/grid.toml b/.minecraft/mods/grid.toml similarity index 100% rename from packwiz-data/mods/grid.toml rename to .minecraft/mods/grid.toml diff --git a/packwiz-data/mods/hudtweaks.toml b/.minecraft/mods/hudtweaks.toml similarity index 100% rename from packwiz-data/mods/hudtweaks.toml rename to .minecraft/mods/hudtweaks.toml diff --git a/packwiz-data/mods/illuminations.toml b/.minecraft/mods/illuminations.toml similarity index 100% rename from packwiz-data/mods/illuminations.toml rename to .minecraft/mods/illuminations.toml diff --git a/packwiz-data/mods/indium.toml b/.minecraft/mods/indium.toml similarity index 100% rename from packwiz-data/mods/indium.toml rename to .minecraft/mods/indium.toml diff --git a/packwiz-data/mods/inspecio.toml b/.minecraft/mods/inspecio.toml similarity index 100% rename from packwiz-data/mods/inspecio.toml rename to .minecraft/mods/inspecio.toml diff --git a/packwiz-data/mods/inventory-hud-forge.toml b/.minecraft/mods/inventory-hud-forge.toml similarity index 100% rename from packwiz-data/mods/inventory-hud-forge.toml rename to .minecraft/mods/inventory-hud-forge.toml diff --git a/packwiz-data/mods/irisshaders.toml b/.minecraft/mods/irisshaders.toml similarity index 100% rename from packwiz-data/mods/irisshaders.toml rename to .minecraft/mods/irisshaders.toml diff --git a/packwiz-data/mods/lambdabettergrass.toml b/.minecraft/mods/lambdabettergrass.toml similarity index 100% rename from packwiz-data/mods/lambdabettergrass.toml rename to .minecraft/mods/lambdabettergrass.toml diff --git a/packwiz-data/mods/lambdynamiclights.toml b/.minecraft/mods/lambdynamiclights.toml similarity index 100% rename from packwiz-data/mods/lambdynamiclights.toml rename to .minecraft/mods/lambdynamiclights.toml diff --git a/packwiz-data/mods/light-overlay.toml b/.minecraft/mods/light-overlay.toml similarity index 100% rename from packwiz-data/mods/light-overlay.toml rename to .minecraft/mods/light-overlay.toml diff --git a/packwiz-data/mods/lithium.toml b/.minecraft/mods/lithium.toml similarity index 100% rename from packwiz-data/mods/lithium.toml rename to .minecraft/mods/lithium.toml diff --git a/packwiz-data/mods/minecraftcapes-mod.toml b/.minecraft/mods/minecraftcapes-mod.toml similarity index 100% rename from packwiz-data/mods/minecraftcapes-mod.toml rename to .minecraft/mods/minecraftcapes-mod.toml diff --git a/packwiz-data/mods/modmenu.toml b/.minecraft/mods/modmenu.toml similarity index 100% rename from packwiz-data/mods/modmenu.toml rename to .minecraft/mods/modmenu.toml diff --git a/packwiz-data/mods/mouse-wheelie.toml b/.minecraft/mods/mouse-wheelie.toml similarity index 100% rename from packwiz-data/mods/mouse-wheelie.toml rename to .minecraft/mods/mouse-wheelie.toml diff --git a/packwiz-data/mods/nimble-fabric.toml b/.minecraft/mods/nimble-fabric.toml similarity index 100% rename from packwiz-data/mods/nimble-fabric.toml rename to .minecraft/mods/nimble-fabric.toml diff --git a/packwiz-data/mods/not-enough-animations.toml b/.minecraft/mods/not-enough-animations.toml similarity index 100% rename from packwiz-data/mods/not-enough-animations.toml rename to .minecraft/mods/not-enough-animations.toml diff --git a/packwiz-data/mods/not-enough-crashes.toml b/.minecraft/mods/not-enough-crashes.toml similarity index 100% rename from packwiz-data/mods/not-enough-crashes.toml rename to .minecraft/mods/not-enough-crashes.toml diff --git a/packwiz-data/mods/ok-zoomer.toml b/.minecraft/mods/ok-zoomer.toml similarity index 100% rename from packwiz-data/mods/ok-zoomer.toml rename to .minecraft/mods/ok-zoomer.toml diff --git a/packwiz-data/mods/paxi-fabric.toml b/.minecraft/mods/paxi-fabric.toml similarity index 100% rename from packwiz-data/mods/paxi-fabric.toml rename to .minecraft/mods/paxi-fabric.toml diff --git a/packwiz-data/mods/perspective-mod-redux.toml b/.minecraft/mods/perspective-mod-redux.toml similarity index 100% rename from packwiz-data/mods/perspective-mod-redux.toml rename to .minecraft/mods/perspective-mod-redux.toml diff --git a/packwiz-data/mods/plasmo-voice.toml b/.minecraft/mods/plasmo-voice.toml similarity index 100% rename from packwiz-data/mods/plasmo-voice.toml rename to .minecraft/mods/plasmo-voice.toml diff --git a/.minecraft/mods/replaymod-1.18.1-2.6.3.jar b/.minecraft/mods/replaymod-1.18.1-2.6.3.jar deleted file mode 100644 index ff07f94..0000000 Binary files a/.minecraft/mods/replaymod-1.18.1-2.6.3.jar and /dev/null differ diff --git a/.minecraft/mods/replaymod.toml b/.minecraft/mods/replaymod.toml new file mode 100644 index 0000000..a59ce98 --- /dev/null +++ b/.minecraft/mods/replaymod.toml @@ -0,0 +1,8 @@ +name = "Replay Mod" +filename = "replaymod-1.18.1-2.6.3.jar" +side = "client" + +[download] +url = "https://minio.replaymod.com/replaymod/replaymod-1.18.1-2.6.3.jar" +hash-format = "sha1" +hash = "a68fed1d79349749d92792bd66769957ad9471f7" diff --git a/packwiz-data/mods/roughly-enough-items.toml b/.minecraft/mods/roughly-enough-items.toml similarity index 100% rename from packwiz-data/mods/roughly-enough-items.toml rename to .minecraft/mods/roughly-enough-items.toml diff --git a/packwiz-data/mods/sodium-extra.toml b/.minecraft/mods/sodium-extra.toml similarity index 100% rename from packwiz-data/mods/sodium-extra.toml rename to .minecraft/mods/sodium-extra.toml diff --git a/packwiz-data/mods/sodium.toml b/.minecraft/mods/sodium.toml similarity index 100% rename from packwiz-data/mods/sodium.toml rename to .minecraft/mods/sodium.toml diff --git a/packwiz-data/mods/starlight.toml b/.minecraft/mods/starlight.toml similarity index 100% rename from packwiz-data/mods/starlight.toml rename to .minecraft/mods/starlight.toml diff --git a/packwiz-data/mods/stendhal.toml b/.minecraft/mods/stendhal.toml similarity index 100% rename from packwiz-data/mods/stendhal.toml rename to .minecraft/mods/stendhal.toml diff --git a/packwiz-data/mods/viafabric.toml b/.minecraft/mods/viafabric.toml similarity index 100% rename from packwiz-data/mods/viafabric.toml rename to .minecraft/mods/viafabric.toml diff --git a/packwiz-data/mods/xaeros-minimap-fair-play-edition.toml b/.minecraft/mods/xaeros-minimap-fair-play-edition.toml similarity index 100% rename from packwiz-data/mods/xaeros-minimap-fair-play-edition.toml rename to .minecraft/mods/xaeros-minimap-fair-play-edition.toml diff --git a/packwiz-data/mods/xaeros-world-map.toml b/.minecraft/mods/xaeros-world-map.toml similarity index 100% rename from packwiz-data/mods/xaeros-world-map.toml rename to .minecraft/mods/xaeros-world-map.toml diff --git a/packwiz-data/mods/yosbr.toml b/.minecraft/mods/yosbr.toml similarity index 100% rename from packwiz-data/mods/yosbr.toml rename to .minecraft/mods/yosbr.toml diff --git a/packwiz-data/mods/yungs-api-fabric.toml b/.minecraft/mods/yungs-api-fabric.toml similarity index 100% rename from packwiz-data/mods/yungs-api-fabric.toml rename to .minecraft/mods/yungs-api-fabric.toml diff --git a/packwiz-data/pack.toml b/.minecraft/pack.toml similarity index 76% rename from packwiz-data/pack.toml rename to .minecraft/pack.toml index 59f1b4b..d0f7099 100644 --- a/packwiz-data/pack.toml +++ b/.minecraft/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.0.0" [index] file = "index.toml" hash-format = "sha256" -hash = "dac39b129aa696bf2610191bbaed4a10a11afb23b55b427663b02210334f8519" +hash = "3e4de9e26ce9c5afff2e126ecc6bbb11244c2dd44683534edf08f7a3e0f550d1" [versions] fabric = "0.13.3" diff --git a/Makefile b/Makefile index dd172d8..112b4e8 100644 --- a/Makefile +++ b/Makefile @@ -17,23 +17,28 @@ default: curseforge: @echo "Making Curseforge pack" - @-mkdir ../vanillia-curseforge - packwiz curseforge export --mods-folder packwiz-data/mods/ --pack-file packwiz-data/pack.toml - mv *.zip ../vanillia-curseforge/ + packwiz curseforge export --pack-file .minecraft/pack.toml -o ../vanillia-curseforge.zip + 7z d ../vanillia-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml + +modrinth: + @echo "Making Modrinth pack" + packwiz modrinth export --pack-file .minecraft/pack.toml -o ../vanillia-modrinth.zip + 7z d ../vanillia-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml multimc: @echo "Making MultiMC pack" - 7z d ../vanillia-mulitmc.zip ./* -r - 7z d ../vanillia-mulitmc.zip ./.* -r - 7z a ../vanillia-mulitmc.zip ./* -r - 7z a ../vanillia-mulitmc.zip ./.minecraft -r + 7z d ../vanillia-multimc.zip ./* -r + 7z d ../vanillia-multimc.zip ./.minecraft -r + 7z a ../vanillia-multimc.zip ./* -r + 7z a ../vanillia-multimc.zip ./.minecraft -r + 7z d ../vanillia-multimc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r technic: @echo "Making Technic pack" -rm -rf .technic -cp -r .minecraft .technic mv .technic/vanillia.icon.png .technic/icon.png - cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/vanillia-modpack/-/raw/main/packwiz-data/pack.toml && cd .. + cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/vanillia-modpack/-/raw/main/.minecraft/pack.toml && cd .. -rm -rf .technic/packwiz* 7z d ../vanillia-technic.zip ./* -r 7z a ../vanillia-technic.zip ./.technic/* -r @@ -42,4 +47,4 @@ clean: -rm -rf .technic -git gc --aggressive --prune -all: curseforge multimc technic clean \ No newline at end of file +all: curseforge modrinth multimc technic clean \ No newline at end of file