diff --git a/index.toml b/index.toml index e5b0b74..f33c1c4 100644 --- a/index.toml +++ b/index.toml @@ -3878,7 +3878,7 @@ hash = "39884208ba36c0b0363bb60895fe8010b0563ae3350c6bdd8f8a214c94e0e453" [[files]] file = "kubejs/startup_scripts/skapa.js" -hash = "91478e57f5b30945015032c27f9a15d2960bff4804e36a414b9dc2dc4cd9fdf7" +hash = "1699bae54188b6112210c4907140d0b4981f3f9ece9c60110fd89ab6ed6d8033" [[files]] file = "kubejs/startup_scripts/soul_soil_farmland.js" @@ -4336,6 +4336,11 @@ file = "mods/easy-villagers.pw.toml" hash = "dafe645480231497afe34bfacc63a3b8eb8b2f5f823d8222785e384fd27f3b36" metafile = true +[[files]] +file = "mods/edivadlib.pw.toml" +hash = "d47b5e5441de64d4d065ffac5c157535cf08ba2f7e84ee6c90d04c2ee532f322" +metafile = true + [[files]] file = "mods/elytra-slot.pw.toml" hash = "3dfbf226e9b5e0f4277c48e545533e9427af919c2a1f9c2d77dcb36d6619d86e" @@ -4396,6 +4401,11 @@ file = "mods/excavated-variants.pw.toml" hash = "8286c4333edcf81683cedbad6f70530efb2f78c80f9bf98657976fb5c1834539" metafile = true +[[files]] +file = "mods/extrastorage.pw.toml" +hash = "10bfafb3710cee8e1e4a7fe81f23fe77aa30beb171101843bc6b8dff9872dc82" +metafile = true + [[files]] file = "mods/falling-leaves-forge.pw.toml" hash = "ef97a35e45bb7d8056745029a1e3e8a6d2e03632b5e476dd44a01dd17f20ce08" @@ -4461,6 +4471,11 @@ file = "mods/framedblocks.pw.toml" hash = "ec1e75e28d448fba354039b37470565e9c2aefc63fde1852904c38af0b4b2136" metafile = true +[[files]] +file = "mods/framework.pw.toml" +hash = "688b011ac6619ffe9b237336b63b4e14a355a1d1fa30793e1b600a223c488369" +metafile = true + [[files]] file = "mods/free-cam.pw.toml" hash = "6d9a95197fd301c7adc7baf9b47e027616f2dd0010906c8f36c08717bbf0a851" @@ -4516,6 +4531,11 @@ file = "mods/geckolib.pw.toml" hash = "060760770ff9523f85467d066f73b2dbf8f03abadbf57dbdaaa98b92bce8d92b" metafile = true +[[files]] +file = "mods/goblin-traders.pw.toml" +hash = "21767a26f0b81ce406431c8e7bef0be3d0f1b8b109b9748a5ebbda1a18417aec" +metafile = true + [[files]] file = "mods/guard-villagers.pw.toml" hash = "06055ac74134577690e8f301f25111a33bdb14255e60d7e42d8276eae4746c0f" @@ -4771,11 +4791,21 @@ file = "mods/paladins-furniture.pw.toml" hash = "a7fc8bd09cf713064869a1afb52c7747f3a857a5b79f13439e4de457a4565e95" metafile = true +[[files]] +file = "mods/patchouli.pw.toml" +hash = "3a7eaa64434e7449e5fe6bd089bc784499432dae7d6ca07174b55b10a3b32ec8" +metafile = true + [[files]] file = "mods/pathblockjs.pw.toml" hash = "55758d0f6cefac63607f0571142ba32c69dcc1719de552f924626617f9adb820" metafile = true +[[files]] +file = "mods/pipez.pw.toml" +hash = "de8f599eb6d2bf0461014c6d86bcfcaa40db57107e662445e99c04648756554f" +metafile = true + [[files]] file = "mods/placebo.pw.toml" hash = "0f807372e11d5a8a28266ab214fd243fa7558fe3f5a0cc6505090faede8c2dd6" @@ -4801,6 +4831,11 @@ file = "mods/powerfuljs.pw.toml" hash = "bd87f993bf0ce3fcb2abe3c42f8cce07efb2d0a8061131ee1285fefa1b7e39a0" metafile = true +[[files]] +file = "mods/projecte.pw.toml" +hash = "26b6891625bf09317245200e3adb871cea00dbd41859d68cf57062544c0e6041" +metafile = true + [[files]] file = "mods/puzzles-lib.pw.toml" hash = "8a8e0f6db0afb5c64f8efb17c1b2e7a937fee57a8fd41f70ca6d74eaee60e822" @@ -4861,6 +4896,11 @@ file = "mods/ribbits.pw.toml" hash = "026acc060ccb0a4e5509d64ef0a0ea884d350e70a15c361e4fe99824a82c158b" metafile = true +[[files]] +file = "mods/rs-requestify.pw.toml" +hash = "852aae4cac2057a25eed55d5ab00b91a4dcc8603bf63168cfcfdb36ad7b41ddc" +metafile = true + [[files]] file = "mods/saturn.pw.toml" hash = "f9be8361c39f91dce80420324ac45290a990e8178b83df6bdaa8d69f2c7aa8d4" @@ -4881,11 +4921,6 @@ file = "mods/selene.pw.toml" hash = "14134e708ec8e9bee6329df46e188b33a07ed86cff9657a597f53def05cb15df" metafile = true -[[files]] -file = "mods/serene-seasons.pw.toml" -hash = "84ba27cb7bd05174860dba55739d5252f74effd0d77e16383b6c46052fb1774b" -metafile = true - [[files]] file = "mods/simply-light.pw.toml" hash = "762eced5d260cdbc94f0acc033efd8fe70fdfe5a28bd8d180e0b052de509893f" @@ -5021,6 +5056,11 @@ file = "mods/villager-names.pw.toml" hash = "5655edd001450f0638ecf39834a40b6de50ed43e63b3c6b8565dbf20896561d1" metafile = true +[[files]] +file = "mods/visual-workbench.pw.toml" +hash = "3a3648832ed73aad40fc1a29e1092238cbd3cd2b6f70f305db8a0ac6608e95ba" +metafile = true + [[files]] file = "mods/voidtotem.pw.toml" hash = "4b0e1b5ed69e0d92894a079ae017095388b40e32b5174cd1ace55edaa6329621" @@ -5056,6 +5096,11 @@ file = "mods/xaeros-world-map.pw.toml" hash = "e9d60c8dd6456b72a8c7b10b052c8945d8904edf070b35d2ca67b9d83d1b2158" metafile = true +[[files]] +file = "mods/xp-tome.pw.toml" +hash = "5635d71642234a9b14b5a77a8f8569ae2e0f106f6ca499bd32390829d6756fc9" +metafile = true + [[files]] file = "mods/yungs-api.pw.toml" hash = "0604af4500f5e7ea46e38f7faef3459023c305b3155eacbf406e600073f643d9" diff --git a/kubejs/startup_scripts/skapa.js b/kubejs/startup_scripts/skapa.js index 469311b..5a6d841 100644 --- a/kubejs/startup_scripts/skapa.js +++ b/kubejs/startup_scripts/skapa.js @@ -67,7 +67,7 @@ global.thermoelectricgen = { if (temp0 < 0 || temp1 < 0) return; let diff = Math.abs(temp0 - temp1); - energy += Math.floor(Math.sqrt(diff) / 2.0); + energy += Math.floor(Math.sqrt(diff) * 2.0); }) return energy; diff --git a/mods/edivadlib.pw.toml b/mods/edivadlib.pw.toml new file mode 100644 index 0000000..3f8112b --- /dev/null +++ b/mods/edivadlib.pw.toml @@ -0,0 +1,13 @@ +name = "EdivadLib" +filename = "EdivadLib-1.20.1-2.0.1.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "7c4d3b7f341554e5a09c4fa289519a5d9b090b62" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4717006 +project-id = 638508 diff --git a/mods/extrastorage.pw.toml b/mods/extrastorage.pw.toml new file mode 100644 index 0000000..7ecf0f9 --- /dev/null +++ b/mods/extrastorage.pw.toml @@ -0,0 +1,13 @@ +name = "ExtraStorage" +filename = "ExtraStorage-1.20.1-4.0.7.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "ba1f5826f8f5d0772c9adf46fbe93befcdd5796a" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 5168999 +project-id = 410168 diff --git a/mods/framework.pw.toml b/mods/framework.pw.toml new file mode 100644 index 0000000..b73d888 --- /dev/null +++ b/mods/framework.pw.toml @@ -0,0 +1,13 @@ +name = "Framework" +filename = "framework-forge-1.20.1-0.7.6.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "9654e78bcdc5d5518fa6b8399e2a133c692421d0" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 5388226 +project-id = 549225 diff --git a/mods/goblin-traders.pw.toml b/mods/goblin-traders.pw.toml new file mode 100644 index 0000000..e90461f --- /dev/null +++ b/mods/goblin-traders.pw.toml @@ -0,0 +1,13 @@ +name = "Goblin Traders" +filename = "goblintraders-forge-1.20.1-1.9.3.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "341b9ec065568812c217ad7f38b7acc1b0313d9a" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4802505 +project-id = 363703 diff --git a/mods/patchouli.pw.toml b/mods/patchouli.pw.toml new file mode 100644 index 0000000..36b6ef0 --- /dev/null +++ b/mods/patchouli.pw.toml @@ -0,0 +1,13 @@ +name = "Patchouli" +filename = "Patchouli-1.20.1-84-FORGE.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "b6b7267f3669c10c167d5d375d0274d40e3eb756" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4966125 +project-id = 306770 diff --git a/mods/pipez.pw.toml b/mods/pipez.pw.toml new file mode 100644 index 0000000..f1b991d --- /dev/null +++ b/mods/pipez.pw.toml @@ -0,0 +1,13 @@ +name = "Pipez" +filename = "pipez-forge-1.20.1-1.2.16.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "c5a169ee6f8e833fa749f7dd5464e51a4433df90" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 5550816 +project-id = 443900 diff --git a/mods/projecte.pw.toml b/mods/projecte.pw.toml new file mode 100644 index 0000000..9c2a1c1 --- /dev/null +++ b/mods/projecte.pw.toml @@ -0,0 +1,13 @@ +name = "ProjectE" +filename = "ProjectE-1.20.1-PE1.0.1.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "affd130b8a77e60dd7d7f7f3621d0182d82d13e1" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4901949 +project-id = 226410 diff --git a/mods/rs-requestify.pw.toml b/mods/rs-requestify.pw.toml new file mode 100644 index 0000000..295abd0 --- /dev/null +++ b/mods/rs-requestify.pw.toml @@ -0,0 +1,13 @@ +name = "Refined Storage: Requestify" +filename = "rsrequestify-1.20.1-2.3.3.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "37366658f7e22f061f9adae8675f518512d15858" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4862132 +project-id = 307788 diff --git a/mods/serene-seasons.pw.toml b/mods/serene-seasons.pw.toml deleted file mode 100644 index 16d20af..0000000 --- a/mods/serene-seasons.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "Serene Seasons" -filename = "SereneSeasons-1.20.1-9.0.0.46.jar" -side = "both" - -[download] -hash-format = "sha1" -hash = "9d30811b601f12282b7243931df7aa37ea380693" -mode = "metadata:curseforge" - -[update] -[update.curseforge] -file-id = 4761603 -project-id = 291874 diff --git a/mods/visual-workbench.pw.toml b/mods/visual-workbench.pw.toml new file mode 100644 index 0000000..6a8d075 --- /dev/null +++ b/mods/visual-workbench.pw.toml @@ -0,0 +1,13 @@ +name = "Visual Workbench [Forge & Fabric]" +filename = "VisualWorkbench-v8.0.0-1.20.1-Forge.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "7ebf579edcf2440eadf1ed6c8c895e1bc2d77bf1" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4612695 +project-id = 500273 diff --git a/mods/xp-tome.pw.toml b/mods/xp-tome.pw.toml new file mode 100644 index 0000000..3b349d5 --- /dev/null +++ b/mods/xp-tome.pw.toml @@ -0,0 +1,13 @@ +name = "XP Tome" +filename = "xptome-1.20.1-2.2.1.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "078831ad10ea6fa5750e3c6049915beca8401a88" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 5465675 +project-id = 344787 diff --git a/pack.toml b/pack.toml index 3065555..37256fc 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "573f63ee77e243610d96d2a7fb9773fe28bbf7e9d6ce5e41c28d95ed03beceb1" +hash = "4bff90ce607bcf83da285b1d6932a98a1149a995c480f37686281712533a32d0" [versions] forge = "47.3.5" diff --git a/setup.nsi b/setup.nsi index 4b25875..e12573b 100644 --- a/setup.nsi +++ b/setup.nsi @@ -44,4 +44,26 @@ Section "!Mod Pack" run: ExecWait '"$APPDATA\.minecraft\graalvm-ee-java17-22.3.1\bin\javaw.exe" -cp $TEMP\packwiz-installer-v0.5.12-dist.jar link.infra.packwiz.installer.Main -s client --pack-folder "$INSTDIR" https://s3.mcmaster.io/minecraft/skapa-season-3/pack.toml' +SectionEnd + +Section /o "Shaders" + IfFileExists "$INSTDIR\shaderpacks\" downloadshader + + CreateDirectory "$INSTDIR\shaderpacks" + + downloadshader: + NScurl::http get "https://s3.mcmaster.io/minecraft/ComplementaryUnbound_r5.2.2.zip" "$TEMP\ComplementaryUnbound_r5.2.2.zip" /CANCEL /INSIST /Zone.Identifier /END + Pop $0 + StrCmp $0 "success" downloadconfig + DetailPrint "$0" + + downloadconfig: + NScurl::http get "https://s3.mcmaster.io/minecraft/ComplementaryUnbound_r5.2.2.zip.txt" "$TEMP\ComplementaryUnbound_r5.2.2.zip.txt" /CANCEL /INSIST /Zone.Identifier /END + Pop $0 + StrCmp $0 "success" copy + DetailPrint "$0" + + copy: + CopyFiles "$TEMPDIR\ComplementaryUnbound_r5.2.2.zip" "$INSTDIR\shaderpacks" + CopyFiles "$TEMPDIR\ComplementaryUnbound_r5.2.2.zip.txt" "$INSTDIR\shaderpacks" SectionEnd \ No newline at end of file