diff --git a/.minecraft/bin/version.json b/.minecraft/bin/version.json deleted file mode 100644 index bd620d1..0000000 --- a/.minecraft/bin/version.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "id": "1.18.1", - "inheritsFrom": "1.18.1", - "releaseTime": "2022-02-25T18:25:26+0000", - "time": "2022-02-25T18:25:26+0000", - "type": "release", - "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}", - "libraries": [ - { - "name": "net.fabricmc:tiny-mappings-parser:0.3.0+build.17", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "net.fabricmc:sponge-mixin:0.11.2+mixin.0.8.5", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "net.fabricmc:tiny-remapper:0.8.1", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "net.fabricmc:access-widener:2.1.0", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm:9.2", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-analysis:9.2", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-commons:9.2", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-tree:9.2", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "org.ow2.asm:asm-util:9.2", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "net.fabricmc:intermediary:1.18.1", - "url": "https://maven.fabricmc.net/" - }, - { - "name": "net.fabricmc:fabric-loader:0.13.3", - "url": "https://maven.fabricmc.net/" - } - ], - "mainClass": "net.fabricmc.loader.impl.launch.knot.KnotClient" -} \ No newline at end of file diff --git a/.minecraft/index.toml b/.minecraft/index.toml deleted file mode 100644 index 1040aea..0000000 --- a/.minecraft/index.toml +++ /dev/null @@ -1,28 +0,0 @@ -hash-format = "sha256" - -[[files]] -file = "bin/version.json" -hash = "b5f8dc11af2e5d2eeb17007a53fced417fdb3020baac8a8f8dd230a2d3fd854e" - -[[files]] -file = "modpack.icon.png" -hash = "50f74a7debb4a852e1384434500515f2478b8dcf0d71b75eba148ca34d89715c" - -[[files]] -file = "mods/lithium.toml" -hash = "5a5c6174eda3db8594761efaf64308c44702b3f2a25957b0c35825b0109a1ef0" -metafile = true - -[[files]] -file = "mods/phosphor.toml" -hash = "1fbb24b0b382c6d21bd2fed103e564bfe5f3e5ee10e6686faafd0164f07bf8da" -metafile = true - -[[files]] -file = "mods/sodium.toml" -hash = "4aba93a705eb2c6300818297bc1d85329b9b085392810dbf15c79b5e3dd6d0ef" -metafile = true - -[[files]] -file = "packwiz-installer-bootstrap.jar" -hash = "a8fbb24dc604278e97f4688e82d3d91a318b98efc08d5dbfcbcbcab6443d116c" diff --git a/.minecraft/modpack.icon.png b/.minecraft/modpack.icon.png deleted file mode 100644 index d81d8c4..0000000 Binary files a/.minecraft/modpack.icon.png and /dev/null differ diff --git a/.minecraft/mods/lithium.toml b/.minecraft/mods/lithium.toml deleted file mode 100644 index 0a37cf3..0000000 --- a/.minecraft/mods/lithium.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Lithium (Fabric)" -filename = "lithium-fabric-mc1.18.1-0.7.8.jar" -side = "both" - -[download] -url = "https://edge.forgecdn.net/files/3659/182/lithium-fabric-mc1.18.1-0.7.8.jar" -hash-format = "sha1" -hash = "8b7cd216fee54b9acc261005cae5acbc856b1933" - -[update] -[update.curseforge] -file-id = 3659182 -project-id = 360438 diff --git a/.minecraft/mods/phosphor.toml b/.minecraft/mods/phosphor.toml deleted file mode 100644 index 2d5ead2..0000000 --- a/.minecraft/mods/phosphor.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Phosphor (Fabric)" -filename = "phosphor-fabric-mc1.18.x-0.8.1.jar" -side = "both" - -[download] -url = "https://edge.forgecdn.net/files/3573/395/phosphor-fabric-mc1.18.x-0.8.1.jar" -hash-format = "sha1" -hash = "9b826d21b9cd999853a57c76b0c47ee4d9161dc9" - -[update] -[update.curseforge] -file-id = 3573395 -project-id = 372124 diff --git a/.minecraft/mods/sodium.toml b/.minecraft/mods/sodium.toml deleted file mode 100644 index 3fb5343..0000000 --- a/.minecraft/mods/sodium.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Sodium" -filename = "sodium-fabric-mc1.18.1-0.4.0-alpha6+build.14.jar" -side = "both" - -[download] -url = "https://edge.forgecdn.net/files/3605/309/sodium-fabric-mc1.18.1-0.4.0-alpha6+build.14.jar" -hash-format = "sha1" -hash = "795d4c12bffdb1b21eed5ff87c07ce5ca3c0dcbf" - -[update] -[update.curseforge] -file-id = 3605309 -project-id = 394468 diff --git a/.minecraft/pack.toml b/.minecraft/pack.toml deleted file mode 100644 index ed17aed..0000000 --- a/.minecraft/pack.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Modpack Template" -author = "Merith.TK" -version = "1.0.0" -pack-format = "packwiz:1.0.0" - -[index] -file = "index.toml" -hash-format = "sha256" -hash = "d021bf567c5145418d5c6aec8806f0c9b0d7f8cf9b8a820301e8998e797f59c0" - -[versions] -fabric = "0.13.3" -minecraft = "1.18.1" diff --git a/.minecraft/packwiz-installer-bootstrap.jar b/.minecraft/packwiz-installer-bootstrap.jar deleted file mode 100644 index 84b934c..0000000 Binary files a/.minecraft/packwiz-installer-bootstrap.jar and /dev/null differ diff --git a/.packignore b/.packignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile index bc0ddf6..460e237 100644 --- a/Makefile +++ b/Makefile @@ -17,31 +17,21 @@ default: curseforge: @echo "Making Curseforge pack" - packwiz curseforge export --pack-file .minecraft/pack.toml -o ../modpack-curseforge.zip - 7z d ../modpack-curseforge.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml + packwiz curseforge export --pack-file .minecraft/pack.toml -o ../vivecraft-curseforge.zip + 7z d ../vivecraft-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 ../modpack-modrinth.zip - 7z d ../modpack-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml + packwiz modrinth export --pack-file .minecraft/pack.toml -o ../vivecraft-modrinth.zip + 7z d ../vivecraft-modrinth.zip overrides/packwiz-installer-bootstrap.jar overrides/pack.toml overrides/index.toml multimc: @echo "Making MultiMC pack" - 7z d ../modpack-multimc.zip ./* -r - 7z d ../modpack-multimc.zip ./.minecraft -r - 7z a ../modpack-multimc.zip ./* -r - 7z a ../modpack-multimc.zip ./.minecraft -r - 7z d ../modpack-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/modpack.icon.png .technic/icon.png - cd .technic && java -jar packwiz-installer-bootstrap.jar https://gitlab.com/Merith-TK/modpack-template/-/raw/main/.minecraft/pack.toml && cd .. - -rm -rf .technic/packwiz* - 7z d ../modpack-technic.zip ./* -r - 7z a ../modpack-technic.zip ./.technic/* -r + 7z d ../vivecraft-multimc.zip ./* -r + 7z d ../vivecraft-multimc.zip ./.minecraft -r + 7z a ../vivecraft-multimc.zip ./* -r + 7z a ../vivecraft-multimc.zip ./.minecraft -r + 7z d ../vivecraft-multimc.zip ./.minecraft/mods ./.minecraft/pack.toml ./.minecraft/index.toml -r clean: -rm -rf .technic diff --git a/README.md b/README.md index 60cc3d9..40d2ab5 100644 --- a/README.md +++ b/README.md @@ -1,42 +1,2 @@ -## Update Pack Template -This is a template modpack makers can use to easily release their modpack onto multiple platforms. -currently this template only supports -- Curseforge - - Please note recent API changes to curseforge have broken support for most mods from curseforge in the other three formats - - Multi/PolyMC requires users to download mods manually - - Technc requires modpack makers to download mods manually - - Modrinth just doesnt support it at all -- [Multi/PolyMC](https://polymc.org) -- Technic -- Modrinth - - -### How to use this? -[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/from-referrer/) -- Modpack Makers - - Well first your going to need to install `busybox`, `git`, `go` `7zip`, and `make` on your computer, - - On Windows I personally reccomend getting all of these through [Scoop](https://scoop.sh/) - - After installing scoop, just run - - `scoop install busybox git go make 7zip` - - On Linux, - - Ubuntu/Debian - - `sudo apt install git p7zip make` - - golang needs the latest release, which is unfortunately not in the repos, please manually install it, there are plenty of guides online for this - - Arch - - please use an AUR helper such as `yay` - - `yay -Syu git go p7zip make` - - - after you install go, run this command to install packwiz - - `go install github.com/packwiz/packwiz@latest` - - - I reccomend using VSCode to manage your modpack as you have a full visual editor and git manager built in. - - to add mods, run `packwiz install ` - - for sodium from curseforge, `packwiz cf install sodium` - - to make a release, run `make multimc` or `make technic` - - - Dont forget to make a git repo for your modpack, I reccomend using [GitLab](https://gitlab.com) due to its free Large File Support. - - or a place to host the packwiz-data folder! - -- Modpack Users - - MultiMC - - Use Java 17, MC 1.16.5 runs just fine on forge AND fabric on java 17 +## ViveCraft +This is an personal vivecraft modpack, made like this to make sharing not an headache diff --git a/libraries/OptiFine-1.12.2_HD_U_F5_LIB.jar b/libraries/OptiFine-1.12.2_HD_U_F5_LIB.jar new file mode 100644 index 0000000..eb37d8e Binary files /dev/null and b/libraries/OptiFine-1.12.2_HD_U_F5_LIB.jar differ diff --git a/libraries/minecrift-1.12.2-jrbudda-11-r6.jar b/libraries/minecrift-1.12.2-jrbudda-11-r6.jar new file mode 100644 index 0000000..37f2d0b Binary files /dev/null and b/libraries/minecrift-1.12.2-jrbudda-11-r6.jar differ diff --git a/mmc-pack.json b/mmc-pack.json index 63a762b..3a5558d 100644 --- a/mmc-pack.json +++ b/mmc-pack.json @@ -1,51 +1,42 @@ { "components": [ { - "cachedName": "LWJGL 3", - "cachedVersion": "3.2.2", + "cachedName": "LWJGL 2", + "cachedVersion": "2.9.4-nightly-20150209", "cachedVolatile": true, "dependencyOnly": true, - "uid": "org.lwjgl3", - "version": "3.2.2" + "uid": "org.lwjgl", + "version": "2.9.4-nightly-20150209" }, { "cachedName": "Minecraft", "cachedRequires": [ { - "equals": "3.2.2", - "suggests": "3.2.2", - "uid": "org.lwjgl3" + "suggests": "2.9.4-nightly-20150209", + "uid": "org.lwjgl" } ], - "cachedVersion": "1.18.1", + "cachedVersion": "1.12.2", "important": true, "uid": "net.minecraft", - "version": "1.18.1" + "version": "1.12.2" }, { - "cachedName": "Intermediary Mappings", + "cachedName": "Forge", "cachedRequires": [ { - "equals": "1.18.1", + "equals": "1.12.2", "uid": "net.minecraft" } ], - "cachedVersion": "1.18.1", - "cachedVolatile": true, - "dependencyOnly": true, - "uid": "net.fabricmc.intermediary", - "version": "1.18.1" + "cachedVersion": "14.23.5.2859", + "uid": "net.minecraftforge", + "version": "14.23.5.2859" }, { - "cachedName": "Fabric Loader", - "cachedRequires": [ - { - "uid": "net.fabricmc.intermediary" - } - ], - "cachedVersion": "0.13.3", - "uid": "net.fabricmc.fabric-loader", - "version": "0.13.3" + "cachedName": "Vivecraft", + "cachedVersion": "4", + "uid": "vivecraft" } ], "formatVersion": 1 diff --git a/patches/vivecraft.json b/patches/vivecraft.json new file mode 100644 index 0000000..24c6e0a --- /dev/null +++ b/patches/vivecraft.json @@ -0,0 +1,36 @@ +{ + "uid": "vivecraft", + "releaseTime": "1979-06-01T00:00:00-05:00", + "mainClass": "net.minecraft.launchwrapper.Launch", + "libraries": [ + { + "name": "com.mtbs3d:minecrift:1.12.2-jrbudda-11-r6", + "MMC-hint": "local" + }, + { + "name": "org.json:json:20140107", + "url": "http://vivecraft.org/jar/" + }, + { + "name": "com.sun:jna:4.2.1", + "url": "http://vivecraft.org/jar/" + }, + { + "name": "org.ow2.asm:asm-all:5.2", + "url": "http://files.minecraftforge.net/maven/" + }, + {"name": "net.minecraft:launchwrapper:1.12"}, + { + "name": "optifine:OptiFine:1.12.2_HD_U_F5_LIB", + "MMC-hint": "local" + } + ], + "name": "Vivecraft", + "+tweakers": [ + "org.vivecraft.tweaker.MinecriftForgeTweaker", + "net.minecraftforge.fml.common.launcher.FMLTweaker", + "optifine.OptiFineForgeTweaker" + ], + "time": "1979-06-01T00:00:00-05:00", + "version": "4" +} \ No newline at end of file