3.1.0-alpha.7, Modrinth changes

This commit is contained in:
Madis 2022-01-07 20:08:00 +02:00
parent bca142212c
commit 7a596d464d
23 changed files with 712 additions and 629 deletions

View file

@ -6,6 +6,11 @@ This is the changelog for the Fabric modpack [Fabulously Optimized](https://www.
Notes:
* See an error about "cloth-client-events-v0.mixins.json"? This is known, simply launch again until I find a fix. See [#192](https://github.com/Fabulously-Optimized/fabulously-optimized/issues/192)
### 3.1.0-alpha.6 (2022-01-07)
* Iris got a performance update, the game should run better regardless of whether you have shaders enabled.
* Updated Animatica, Colormatic, Fabric API, Iris Shaders, Reese's Sodium Options
### 3.1.0-alpha.6 (2022-01-02)
Happy new year, time to test Phosphor! [Vote here!](https://github.com/Fabulously-Optimized/fabulously-optimized/issues/21#issuecomment-1003749296)

View file

@ -0,0 +1,41 @@
import os
from zipfile import ZipFile
user_path = os.path.expanduser("~")
git_path = user_path + "/Documents/GitHub/fabulously-optimized/"
version_no = "1.18.1"
packwiz_path = git_path + "Packwiz/" + version_no + "/"
pw_exe_path = "..\packwiz.exe"
mods_path = packwiz_path + "mods"
mod_files = os.listdir(mods_path)
for item in mod_files:
os.remove( os.path.join(mods_path, item))
def extract_file(from_zip, from_file, to_path, from_desc, to_desc):
with ZipFile(from_zip, 'r') as zip:
if from_file in zip.namelist():
zip.extract(from_file, to_path)
print("Copied " + from_desc + " to " + to_desc)
else:
print("Skipped " + from_desc + " copying to " + to_desc + ", didn't exist")
os.chdir(packwiz_path)
cf_zip_path = input("Please drag the Curseforge zip file here: ")[3:][:-1] # Because dragging the file adds "& " and double quotes
os.system(pw_exe_path + " curseforge import \"" + cf_zip_path + "\"")
#os.system(pw_exe_path + " remove hydrogen")
#os.system(pw_exe_path + " mr install hydrogen")
os.system(pw_exe_path + " refresh")
# Copy fresh manifest/modlist to git
extract_file(cf_zip_path, "manifest.json", git_path + "Curseforge", "Curseforge manifest.json", "Git")
extract_file(cf_zip_path, "modlist.html", git_path + "Curseforge", "Curseforge modlist.html", "Git")
# Export Modrinth pack and manifest
os.system(pw_exe_path + " modrinth export")
for pack in os.listdir(packwiz_path):
if pack.endswith('.mrpack'):
extract_file(packwiz_path + "/" + pack, "modrinth.index.json", git_path + "/" + "Modrinth", "Modrinth manifest", "Git")
os.replace(packwiz_path + "/" + pack, os.path.expanduser("~/Desktop") + "/" + pack)
print("Moved " + pack + " to desktop")

View file

@ -1,33 +0,0 @@
import os, shutil
from zipfile import ZipFile
user_path = os.path.expanduser("~")
git_path = user_path + "/Documents/GitHub/fabulously-optimized/"
version_no = "1.18.1"
packwiz_path = git_path + "Packwiz/" + version_no + "/"
exe_path = "..\packwiz.exe"
mods_path = packwiz_path + "mods"
mod_files = os.listdir(mods_path)
for item in mod_files:
os.remove( os.path.join(mods_path, item))
def extract_file(from_file, to_path, from_desc, to_desc):
with ZipFile(cf_zip_path, 'r') as zip:
if from_file in zip.namelist():
zip.extract(from_file, to_path)
print("Copied " + from_desc + " to " + to_desc)
else:
print("Skipped " + from_desc + " copying to " + to_desc + ", didn't exist")
os.chdir(packwiz_path)
cf_zip_path = input("Please drag the Curseforge zip file here: ")[3:][:-1] # Because dragging the file adds "& " and double quotes
os.system(exe_path + " curseforge import \"" + cf_zip_path + "\"")
#os.system(exe_path + " remove hydrogen")
#os.system(exe_path + " mr install hydrogen")
os.system(exe_path + " refresh")
# Copy fresh manifest/modlist to git
extract_file("manifest.json", git_path + "Curseforge", "Curseforge manifest.json", "Git")
extract_file("modlist.html", git_path + "Curseforge", "Curseforge modlist.html", "Git")

View file

@ -1,105 +0,0 @@
# Original by https://github.com/RozeFound, modified by Madis0
from pathlib import Path
import pkg_resources as dist
try: dist.require(['tomli']) # python -m pip install tomli
except dist.DistributionNotFound as Error:
exit(Error.report() + '\nThe following dependency is missing: {}"'.format(Error.req))
from tomli import load as parse_toml
class ModrinthManager(object):
def __init__(self, packwiz_folder:Path, output_folder:Path) -> None:
pack_summary = "A Fabric-based modpack for Minecraft that focuses on performance and graphics optimizations"
self.root_dir = packwiz_folder
self.output_dir = output_folder if output_folder else Path()
with open(self.root_dir / "pack.toml") as file:
pack_info = parse_toml(file)
self.index = {
"formatVersion": int(1),
"game": "minecraft",
"versionId": pack_info['version'] if 'version' in pack_info else input("Specify pack version: "),
"name": pack_info['name'], # Can be optional
"summary": pack_summary, # input("Describe your pack: "),
"files": [],
"dependencies": {
"minecraft": pack_info['versions']['minecraft']
}
}
if 'fabric' in pack_info['versions']: self.index['dependencies']['fabric-loader'] = pack_info['versions']['fabric']
elif 'forge' in pack_info['versions']: self.index['dependencies']['forge'] = pack_info['versions']['forge']
from zipfile import ZipFile
self.zip = ZipFile(self.output_dir / (self.index['name'] + " " + self.index['versionId'] + " Modrinth.mrpack"), "w")
super().__init__()
def __del__(self):
from json import dumps
self.zip.writestr("modrinth.index.json", dumps(self.index, indent=4))
self.zip.close()
def add_override(self, path:Path):
override_dir = Path("overrides")
relative_path = path.relative_to(self.root_dir)
self.zip.write(path, override_dir / relative_path)
def add_mod(self, path:Path):
mods_dir = Path("mods")
with open(path) as file:
mod_info = parse_toml(file)
mod_index = {
"path": mods_dir.joinpath(mod_info['filename']).as_posix(),
"hashes": {mod_info['download']['hash-format']: mod_info['download']['hash']},
"downloads": [mod_info['download']['url']]
}
self.index['files'].append(mod_index)
def main():
from argparse import ArgumentParser
parser = ArgumentParser(description="Python script for converting packwiz to modrinth modpack format")
parser.add_argument('-i', '--input', dest='input_dir', type=Path, help='Specify packwiz pack directory', required=True)
parser.add_argument('-o', '--output', dest='output_dir', type=Path, help='Specify output directory (optional)')
git_path = Path.home() / "Documents/GitHub/fabulously-optimized"
version_no = "1.18.1"
packwiz_path = git_path / "Packwiz" / version_no
modrinth_path = git_path / "Modrinth"
args = parser.parse_args(['-i', str(packwiz_path),
'-o', str(Path.home() / "Desktop")])
manager = ModrinthManager(args.input_dir, args.output_dir)
with open(args.input_dir / "index.toml") as file:
index = parse_toml(file)
for file in index['files']:
if 'metafile' in file and file['metafile'] is True:
manager.add_mod(args.input_dir / file['file'])
else: manager.add_override(args.input_dir / file['file'])
# Export index.json to git
from json import dump
with open(modrinth_path / "modrinth.index.json", "w") as file:
dump(manager.index, file, indent = 4)
if __name__ == "__main__":
main()

View file

@ -11,7 +11,7 @@
"manifestType": "minecraftModpack",
"manifestVersion": 1,
"name": "Fabulously Optimized",
"version": "3.1.0-alpha.6",
"version": "3.1.0-alpha.7",
"author": "robotkoer",
"files": [
{
@ -26,7 +26,7 @@
},
{
"projectID": 306612,
"fileID": 3577046,
"fileID": 3595229,
"required": true
},
{
@ -50,13 +50,13 @@
"required": true
},
{
"projectID": 372124,
"fileID": 3573395,
"projectID": 399798,
"fileID": 3573935,
"required": true
},
{
"projectID": 399798,
"fileID": 3573935,
"projectID": 372124,
"fileID": 3573395,
"required": true
},
{
@ -66,7 +66,7 @@
},
{
"projectID": 511319,
"fileID": 3578930,
"fileID": 3596724,
"required": true
},
{
@ -116,7 +116,7 @@
},
{
"projectID": 533006,
"fileID": 3577480,
"fileID": 3594396,
"required": true
},
{
@ -205,13 +205,13 @@
"required": true
},
{
"projectID": 455508,
"fileID": 3558900,
"projectID": 452768,
"fileID": 3550935,
"required": true
},
{
"projectID": 452768,
"fileID": 3550935,
"projectID": 455508,
"fileID": 3596182,
"required": true
},
{
@ -230,13 +230,13 @@
"required": true
},
{
"projectID": 325092,
"fileID": 3549774,
"projectID": 360438,
"fileID": 3590908,
"required": true
},
{
"projectID": 360438,
"fileID": 3590908,
"projectID": 325092,
"fileID": 3591953,
"required": true
},
{

View file

@ -6,8 +6,8 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/tooltipfix">ToolTipFix (by Kyrptonaught)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/not-enough-crashes">Not Enough Crashes (Fabric) (by NatanFudge)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/language-reload">Language Reload (by Jerozgen)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/phosphor">Phosphor (Fabric) (by jellysquid3_)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/item-model-fix">Item Model Fix (Fabric) (by Pepper_Bell)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/phosphor">Phosphor (Fabric) (by jellysquid3_)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/fabrishot">Fabrishot (by ramidzkh)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/reeses-sodium-options">Reese's Sodium Options (by FlashyReese)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/borderless-mining">Borderless Mining (by comp500)</a></li>
@ -37,12 +37,12 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/dont-clear-chat-history">Don't Clear Chat History (by anar4732)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/lambdynamiclights">LambDynamicLights (by LambdAurora)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/dynamic-fps">Dynamic FPS (by juliand665)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/irisshaders">Iris Shaders (by coderbot)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-fade">No Fade (by UltimateBoomer)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/irisshaders">Iris Shaders (by coderbot)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric) (by shedaniel)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/completeconfig">CompleteConfig (by Lortseam_)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/yosbr">Your Options Shall Be Respected (YOSBR) (by shedaniel)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/colormatic">Colormatic (by kwertiTheCats)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/lithium">Lithium (Fabric) (by jellysquid3_)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/colormatic">Colormatic (by kwertiTheCats)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/indium">Indium (by comp500)</a></li>
</ul>

File diff suppressed because it is too large Load diff

View file

@ -5,5 +5,5 @@ MinMemAlloc=512
OverrideJavaArgs=true
OverrideMemory=true
iconKey=pack
name=Fabulously Optimized 3.1.0-alpha.6
name=Fabulously Optimized 3.1.0-alpha.7
notes=https://www.curseforge.com/minecraft/modpacks/fabulously-optimized

View file

@ -1,5 +1,6 @@
name = "Fabulously Optimized"
pack-format = "packwiz:1.0.0"
version = "1.11.2"
[index]
file = "index.toml"

View file

@ -1,5 +0,0 @@
packwiz
Readme.md
*.exe
*.bat
*.jar

View file

@ -0,0 +1 @@
../1.16.5/.packwizignore

View file

@ -1,5 +1,6 @@
name = "Fabulously Optimized"
pack-format = "packwiz:1.0.0"
version = "2.6.2"
[index]
file = "index.toml"

View file

@ -1,5 +0,0 @@
packwiz
Readme.md
*.exe
*.bat
*.jar

View file

@ -0,0 +1 @@
../1.16.5/.packwizignore

View file

@ -5,7 +5,7 @@ mainMenu {
x { it - 2 }
y { it - 20 }
}
text = literal("Fabulously Optimized 3.1.0-alpha.6")
text = literal("Fabulously Optimized 3.1.0-alpha.7")
align = "right"
color = 0xFFFFFF
hoveredColor = 0x55FFFF

View file

@ -18,7 +18,7 @@ hash = "823e13cceab67ae7856cbfc91fcec40cadb1a7b958993b92f2501928659a0641"
[[files]]
file = "config/slightguimodifications/cts.groovy"
hash = "9e07d927cace3894dcbd4f8be79a2f64eb4745bf63c37b0cec2064720cdcd202"
hash = "509002f7873214ac503754d99067d778d703c2e227343d1df436aa34533cf0b1"
[[files]]
file = "config/sodium-mixins.properties"
@ -95,7 +95,7 @@ metafile = true
[[files]]
file = "mods/animatica.toml"
hash = "509a6b36ee65f458986dd19eb09b4c5f5feda7a976937a3cb6dfe4fee095797c"
hash = "c4cec0badc05f9c2945d03606d482b512abdac912502236dd1f4c3eef48421d6"
metafile = true
[[files]]
@ -140,7 +140,7 @@ metafile = true
[[files]]
file = "mods/colormatic.toml"
hash = "c1c4f73e371a2682b1609322a3ba1af39fe8ca7d60e2366f3c07b045cbb1d7ac"
hash = "2c4245d20eeb865f12b185a5f0b165d97d10e5f087192488e4e4a8329b4039f9"
metafile = true
[[files]]
@ -185,7 +185,7 @@ metafile = true
[[files]]
file = "mods/fabric-api.toml"
hash = "1cba7ffaf01ed4ca7f2cb06133963ed3d574376d4f03012dfa1c584539d5603d"
hash = "2fdfc03898a5e23b23e9eecbce011c2ea0e0386cff14be61518b342533b6c663"
metafile = true
[[files]]
@ -215,7 +215,7 @@ metafile = true
[[files]]
file = "mods/irisshaders.toml"
hash = "16cfbd80478e47ad53d383025c5fa8cb3360f8d186a0dfb44eb2ae6c973f9b2b"
hash = "fd255090b8121a20465cb46482af2b3035507462f5540a90272c8ae8fbc8e08f"
metafile = true
[[files]]
@ -280,7 +280,7 @@ metafile = true
[[files]]
file = "mods/reeses-sodium-options.toml"
hash = "a3b39e94523b4e4b0bf40b5bd6d900342d153bec98910f9c174c1cd2e436dd69"
hash = "1c6b6d6958e1fd8d9566e384d1fed58958fdc0a5d8c557e52793f75887148d99"
metafile = true
[[files]]

View file

@ -1,13 +1,13 @@
name = "Animatica"
filename = "animatica-0.2+1.18.jar"
filename = "animatica-0.3+1.18.jar"
side = "both"
[download]
url = "https://edge.forgecdn.net/files/3577/480/animatica-0.2+1.18.jar"
url = "https://edge.forgecdn.net/files/3594/396/animatica-0.3+1.18.jar"
hash-format = "murmur2"
hash = "1842450262"
hash = "3836591055"
[update]
[update.curseforge]
file-id = 3577480
file-id = 3594396
project-id = 533006

View file

@ -1,13 +1,13 @@
name = "Colormatic"
filename = "colormatic-2.4.0+mc.1.18.jar"
filename = "colormatic-3.0.0+mc.1.18.jar"
side = "both"
[download]
url = "https://edge.forgecdn.net/files/3549/774/colormatic-2.4.0+mc.1.18.jar"
url = "https://edge.forgecdn.net/files/3591/953/colormatic-3.0.0+mc.1.18.jar"
hash-format = "murmur2"
hash = "2915827074"
hash = "3053511537"
[update]
[update.curseforge]
file-id = 3549774
file-id = 3591953
project-id = 325092

View file

@ -1,13 +1,13 @@
name = "Fabric API"
filename = "fabric-api-0.45.0+1.18.jar"
filename = "fabric-api-0.45.2+1.18.jar"
side = "both"
[download]
url = "https://edge.forgecdn.net/files/3577/46/fabric-api-0.45.0+1.18.jar"
url = "https://edge.forgecdn.net/files/3595/229/fabric-api-0.45.2+1.18.jar"
hash-format = "murmur2"
hash = "3382045089"
hash = "2626514222"
[update]
[update.curseforge]
file-id = 3577046
file-id = 3595229
project-id = 306612

View file

@ -1,13 +1,13 @@
name = "Iris Shaders"
filename = "iris-mc1.18.1-1.1.3.jar"
filename = "iris-mc1.18.1-1.1.4.jar"
side = "both"
[download]
url = "https://edge.forgecdn.net/files/3558/900/iris-mc1.18.1-1.1.3.jar"
url = "https://edge.forgecdn.net/files/3596/182/iris-mc1.18.1-1.1.4.jar"
hash-format = "murmur2"
hash = "3998045195"
hash = "3265639627"
[update]
[update.curseforge]
file-id = 3558900
file-id = 3596182
project-id = 455508

View file

@ -1,13 +1,13 @@
name = "Reese's Sodium Options"
filename = "reeses_sodium_options-mc1.18.1-1.2.4.jar"
filename = "reeses_sodium_options-mc1.18.1-1.3.0.jar"
side = "both"
[download]
url = "https://edge.forgecdn.net/files/3578/930/reeses_sodium_options-mc1.18.1-1.2.4.jar"
url = "https://edge.forgecdn.net/files/3596/724/reeses_sodium_options-mc1.18.1-1.3.0.jar"
hash-format = "murmur2"
hash = "3255020958"
hash = "2910872584"
[update]
[update.curseforge]
file-id = 3578930
file-id = 3596724
project-id = 511319

View file

@ -1,10 +1,11 @@
name = "Fabulously Optimized"
version = "3.1.0-alpha.7"
pack-format = "packwiz:1.0.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "63812f3d3fa05c9c2b2a94daf36d8476863a305b03297f11218b59bf90aff46b"
hash = "9ded097d63d29957860e7c6a8ca771de5290c27e34fb0016902aefb9d8ce0b92"
[versions]
fabric = "0.12.12"

View file

@ -1,5 +0,0 @@
packwiz
Readme.md
*.exe
*.bat
*.jar

1
Packwiz/1.18/.packwizignore Symbolic link
View file

@ -0,0 +1 @@
../1.16.5/.packwizignore

View file

@ -1,5 +1,6 @@
name = "Fabulously Optimized"
pack-format = "packwiz:1.0.0"
version = "3.0.0-alpha.4"
[index]
file = "index.toml"

View file

@ -15,7 +15,7 @@ Supports CurseForge Launcher, MultiMC, GDLauncher and vanilla launcher. [Install
_These downloads do not yet support the modpack or the mods :(_
* [Auto-updating](https://github.com/Madis0/fabulously-optimized/wiki/Auto-updating-MultiMC-pack) MultiMC pack: [1.16.5](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v1.11.1/Fabulously.Optimized.MC.1.16.5.auto-update.zip) | [1.17.1](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v2.6.1/Fabulously.Optimized.MC.1.17.1.auto-update.zip) | [1.18](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v3.0.0-alpha.4/Fabulously.Optimized.MC.1.18.auto-update.zip) | [1.18.1](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v3.1.0-alpha.5/Fabulously.Optimized.MC.1.18.1.auto-update.zip)
* [Auto-updating](https://github.com/Madis0/fabulously-optimized/wiki/Auto-updating-MultiMC-pack) MultiMC pack: [1.16.5](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v1.11.1/Fabulously.Optimized.MC.1.16.5.auto-update.zip) | [1.17.1](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v2.6.1/Fabulously.Optimized.MC.1.17.1.auto-update.zip) | _[1.18](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v3.0.0-alpha.4/Fabulously.Optimized.MC.1.18.auto-update.zip)_ (EOL) | [1.18.1](https://github.com/Fabulously-Optimized/fabulously-optimized/releases/download/v3.1.0-alpha.5/Fabulously.Optimized.MC.1.18.1.auto-update.zip)
* ~~Vanilla installer~~ [(planned)](https://github.com/Madis0/fabulously-optimized/issues/110)
* ~~Modrinth~~ [(planned)](https://github.com/Madis0/fabulously-optimized/issues/63)
* [GitHub releases](https://github.com/Fabulously-Optimized/fabulously-optimized/releases)