diff --git a/.packwizignore b/.packwizignore index d96c1bb3..f8685506 100644 --- a/.packwizignore +++ b/.packwizignore @@ -28,3 +28,4 @@ *.gradle /gradle.properties *.bat +/mappings/ diff --git a/build.gradle.kts b/build.gradle.kts index 56efad30..37784525 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,8 @@ plugins { base java - `maven-publish` alias(libs.plugins.fabric.loom) - id("org.jetbrains.kotlin.jvm") version "1.8.0" + id("org.jetbrains.kotlin.jvm") version "2.0.20-Beta2" } group = libs.versions.maven.group.get() @@ -14,6 +13,14 @@ base { } repositories { + maven { + name = "devOS Maven"// Porting Lib + url = uri("https://mvn.devos.one/releases/") + } + maven { + name = "devOS Maven snapshot"// Porting Lib + url = uri("https://mvn.devos.one/snapshots/") + } maven { name = "Modrinth Maven" url = uri("https://api.modrinth.com/maven") @@ -21,44 +28,62 @@ repositories { includeGroup("maven.modrinth") } } - maven { - name = "JitPack" - url = uri("https://jitpack.io/") + name = "TerraformersMC Maven"// Mod Menu + url = uri("https://maven.terraformersmc.com/releases") } - maven { - url = uri("https://maven.ladysnake.org/releases") - content { - includeGroup("io.github.ladysnake") - includeGroup("org.ladysnake") - includeGroupByRegex("dev\\.onyxstudios.*") - } + name = "Shedaniel Maven"// Cloth Config API, REI + url = uri("https://maven.shedaniel.me") } - maven { + name = "tterrag maven"// Create + url = uri("https://maven.tterrag.com/") + } + maven { + name = "Team Resourceful Maven"// Ad Astra! + url = uri("https://maven.teamresourceful.com/repository/maven-public/") + } + maven { + name = "Architectury Maven"// Architectury API + url = uri("https://maven.architectury.dev/") + } + maven { + name = "Greenhouse Maven"// Farmer's Delight Refabricated + url = uri("https://maven.greenhouseteam.dev/releases/") + } + maven { + // Porting Lib, Mantle url = uri("https://maven.jamieswhiteshirt.com/libs-release") content { includeGroup("com.jamieswhiteshirt") } } - - maven { url = uri("https://maven.quiltmc.org/repository/release") } - maven { url = uri("https://mvn.devos.one/snapshots/") } - maven { url = uri("https://maven.saps.dev/releases/") } - maven { url = uri("https://aperlambda.github.io/maven") } - maven { url = uri("https://dvs1.progwml6.com/files/maven") } - maven { url = uri("https://maven.cafeteria.dev/releases") } - maven { url = uri("https://maven.fabricmc.net") } - maven { url = uri("https://maven.gegy.dev") } - maven { url = uri("https://maven.kotlindiscord.com/repository/terraformers") } - maven { url = uri("https://maven.parchmentmc.org") } - maven { url = uri("https://maven.shedaniel.me") } - maven { url = uri("https://maven.terraformersmc.com/releases") } - maven { url = uri("https://maven.tterrag.com") } - maven { url = uri("https://maven.wispforest.io") } - maven { url = uri("https://modmaven.dev") } - maven { url = uri("https://storage.googleapis.com/devan-maven") } + maven { + // FTB + url = uri("https://maven.saps.dev/releases/") + } + maven { + // Create + name = "Fuzs Mod Resources" + url = uri("https://raw.githubusercontent.com/Fuzss/modresources/main/maven/") + } + maven { + // Mantle + name = "Ladysnake Mods" + url = uri("https://maven.ladysnake.org/releases") + } + maven { + name = "JitPack" + url = uri("https://jitpack.io/") + content { + includeGroup("com.github") + } + } + maven { + name = "Wisp Forest Maven"// Mantle + url = uri("https://maven.wispforest.io/releases") + } mavenCentral() } @@ -68,35 +93,36 @@ dependencies { minecraft(libs.minecraft) // Mappings - mappings( - variantOf(libs.quilt.mappings) { classifier("intermediary-v2") } - ) + mappings(loom.layered { + mappings(file("mappings/mappings-fix.tiny")) + mappings(variantOf(libs.quilt.mappings) { classifier("intermediary-v2") }) + }) // Fabric modImplementation(libs.fabric.loader) modImplementation(libs.fabric.api) // Implemented Mods - modImplementation(libs.bundles.mods.from.dmearth) + modImplementation(libs.ad.astra) { exclude(group = "net.fabricmc.fabric-api") } + modImplementation(libs.architectury.api) { exclude(group = "net.fabricmc.fabric-api") } + modImplementation(libs.farmers.delight) { exclude(group = "net.fabricmc.fabric-api") } modImplementation(libs.bundles.mods.from.alphamode) { exclude(group = "com.github.AlphaMode") } - modImplementation(libs.bundles.mods.from.ftb) + modImplementation(libs.bundles.mods.from.ftb) { exclude(group = "net.fabricmc.fabric-api") } modImplementation(libs.bundles.maven.modrinth) - modImplementation(libs.bundles.maven.jitpack) + modImplementation(libs.bundles.maven.jitpack) { exclude(group = "net.fabricmc.fabric-api") } - modApi(libs.modmenu) - modApi(libs.cloth.config) - modApi(libs.rei) + modApi(libs.modmenu) { exclude(group = "net.fabricmc.fabric-api") } + modApi(libs.cloth.config) { exclude(group = "net.fabricmc.fabric-api") } + modApi(libs.rei) { exclude(group = "net.fabricmc.fabric-api") } + modApi(libs.night.auto.config) { exclude(group = "net.fabricmc.fabric-api") } // Included - modApi(libs.tags.binder)?.let { - include(it) - } - modApi(libs.brrp)?.let { - include(it) - } - api(libs.exp4j)?.let { - include(it) - } + modApi(libs.tags.binder) { exclude(group = "net.fabricmc.fabric-api") } + include(libs.tags.binder) + modApi(libs.brrp) { exclude(group = "net.fabricmc.fabric-api") } + include(libs.brrp) + api(libs.exp4j) + include(libs.exp4j) // Development api("org.jetbrains.kotlin:kotlin-stdlib-jdk8") @@ -127,14 +153,3 @@ java { loom { accessWidenerPath.set(file("src/main/resources/cabricality.accesswidener")) } - -publishing { - publications { - create("mavenJava") { - from(components["java"]) - } - } - - repositories { - } -} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..f7c83783 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1G diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 05658be7..1cf5b043 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,42 +1,40 @@ [versions] maven-group = "dm.earth" archives-name = "cabricality" -modpack = "1.0-alpha.1" +modpack = "1.0.0-alpha.1" # The latest versions are available at https://lambdaurora.dev/tools/import-quilt.html minecraft = "1.20.1" quilt-mappings = "1.20.1+build.23" -fabric-loader = "0.15.7" +fabric-loader = "0.16.0" -fabric-api = "0.89.3+1.20.1" +fabric-api = "0.92.2+1.20.1" +architectury-api = "9.2.14" +night-auto-config = "1.0.3-fabric1.20" # Implemented Mods -modmenu = "8.0.0-beta.2" -cloth-config = "12.0.109" -rei = "13.0.661" - -# - DM-Earth -create-dme = "0.5.1-d-build.10+mc1.20.1" +modmenu = "7.2.2" +cloth-config = "11.1.118" +rei = "12.1.725" # - AlphaMode -create = "0.5.1-d-build.1161+mc1.20.1" -mantle = "1.20.1-1.9.254" +create = "0.5.1-f-build.1417+mc1.20.1" +mantle = "1.20.1-1.9.269" # - FTB Mods -ftb-quests = "2001.1.5" -ftb-library = "2001.1.3" +ftb-quests = "2001.4.6" +ftb-library = "2001.2.2" +ad-astra = "1.15.18" # - Modrinth Maven -ad-astra = "1.15.3" -architectury-api = "10.0.8+fabric" bits-and-chisels = "2.7.3" -farmers-delight = "1.4.2" -hephaestus = "1.20.1-3.6.3.232" -let = "2.0.0-mc1.20" +farmers-delight = "1.20.1-2.1.1" +hephaestus = "1.20.1-3.6.4.274" +let = "2.1.0-mc1.20" industrial-revolution = "1.16.5-BETA" # - JitPack -equator = "2.6.0-mc1.20" +equator = "2.6.4-mc1.20" rip = "1.0.0-1.20.x" # Included @@ -56,9 +54,6 @@ modmenu = { group = "com.terraformersmc", name = "modmenu", version.ref = "modme cloth-config = { group = "me.shedaniel.cloth", name = "cloth-config-fabric", version.ref = "cloth-config" } rei = { group = "me.shedaniel", name = "RoughlyEnoughItems-fabric", version.ref = "rei" } -# - DM-Earth -create-dme = { group = "maven.modrinth", name = "create-fabric-dme-edition", version.ref = "create-dme" } - # - AlphaMode create = { group = "com.simibubi.create", name = "create-fabric-1.20.1", version.ref = "create" } mantle = { group = "slimeknights.mantle", name = "Mantle", version.ref = "mantle" } @@ -67,12 +62,14 @@ mantle = { group = "slimeknights.mantle", name = "Mantle", version.ref = "mantle ftb-quests = { group = "dev.ftb.mods", name = "ftb-quests-fabric", version.ref = "ftb-quests" } ftb-library = { group = "dev.ftb.mods", name = "ftb-library-fabric", version.ref = "ftb-library" } +# Single Mods +ad-astra = { group = "earth.terrarium.adastra", name = "ad_astra-fabric-1.20.1", version.ref = "ad-astra" } +architectury-api = { group = "dev.architectury", name = "architectury-fabric", version.ref = "architectury-api" } +farmers-delight = { group = "maven.modrinth", name = "farmers-delight-refabricated", version.ref = "farmers-delight" } + # - Modrinth Maven -ad-astra = { group = "maven.modrinth", name = "ad-astra", version.ref = "ad-astra" } -architectury-api = { group = "maven.modrinth", name = "architectury-api", version.ref = "architectury-api" } bits-and-chisels = { group = "maven.modrinth", name = "bits-and-chisels", version.ref = "bits-and-chisels" } -farmers-delight = { group = "maven.modrinth", name = "farmers-delight-fabric", version.ref = "farmers-delight" } -hephaestus = { group = "maven.modrinth", name = "hephaestus", version.ref = "hephaestus" } +hephaestus = { group = "slimeknights.tconstruct", name = "Hephaestus", version.ref = "hephaestus" } let = { group = "maven.modrinth", name = "let", version.ref = "let" } industrial-revolution = { group = "maven.modrinth", name = "industrial-revolution", version.ref = "industrial-revolution" } @@ -84,14 +81,12 @@ rip = { group = "com.github.HO-Artisan", name = "RecipeInProgramming", version.r tags-binder = { group = "com.github.DM-Earth", name = "Tags-Binder", version.ref = "tags-binder" } brrp = { group = "maven.modrinth", name = "brrp", version.ref = "brrp" } exp4j = { group = "net.objecthunter", name = "exp4j", version.ref = "exp4j" } +night-auto-config = { group = "com.github.KessokuTeaTime", name = "Night-Auto-Config", version.ref = "night-auto-config"} [bundles] # Implemented Mods -mods-from-dmearth = [ - "create-dme" -] mods-from-alphamode = [ - #"create", + "create", "mantle" ] mods-from-ftb = [ @@ -99,10 +94,7 @@ mods-from-ftb = [ "ftb-library" ] maven-modrinth = [ - "ad-astra", - "architectury-api", "bits-and-chisels", - "farmers-delight", "hephaestus", "let", "industrial-revolution" @@ -113,4 +105,4 @@ maven-jitpack = [ ] [plugins] -fabric-loom = { id = "fabric-loom", version = "1.3-SNAPSHOT" } +fabric-loom = { id = "fabric-loom", version = "1.7-SNAPSHOT" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a..2c352119 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b82..09523c0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c7873..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/index.toml b/index.toml index 58b6cb3c..2fe17697 100644 --- a/index.toml +++ b/index.toml @@ -162,27 +162,27 @@ hash = "2e53e004da6b3e6d4858a6169c1ff6f1d90f54f35af3e6d784bcb718cdad6c4a" [[files]] file = "mods/ad-astra.pw.toml" -hash = "e298ef09aaef09fa9c5a1e329ec1c143d35d6ba6fe5ab1bf0e3ab9f2c13071b7" +hash = "f21a1840f24bd6da9e7edaf8cf18add63ebfcd6ec47796d80db76b93d4b5c51f" metafile = true [[files]] file = "mods/ae2.pw.toml" -hash = "e362dcd3d782835ef0473ba34e12f17a53d1d296e5f258596420964662fbf7c9" +hash = "0c9015aa5398140bff02d2c2f8f837e5b903ac53ca7c2496afb98e30cf08285b" metafile = true [[files]] file = "mods/amecs.pw.toml" -hash = "16ce27183f78f23c8606787ab2bbbaf01d290b569a4c6d5a6f91b30802ebabd9" +hash = "d66bc9c3f81429f138de5eae6226dce25f620f90df864bf7f0f9121708bf0bcc" metafile = true [[files]] file = "mods/architectury-api.pw.toml" -hash = "a3caf4dd0a0d0a739c8f00a7d81b74c9ae7fdb58b250ddc9b466213dbd385a80" +hash = "0cbcd58c49decc0ecbccd330fcc8326e3b8769e22e1740e229f09541acf3df7f" metafile = true [[files]] file = "mods/athena-ctm.pw.toml" -hash = "ce1fe1e69721bf56e277be993505956c88c3036e8d826a85eb83d9a3cf8305aa" +hash = "e5d87db8974fa2b69870d7ea2f0878ae7d9aabd5f6b1cadb0ea45cd641e89f24" metafile = true [[files]] @@ -192,17 +192,17 @@ metafile = true [[files]] file = "mods/bookshelf.pw.toml" -hash = "d3789633c883daf8aa4c2e5c2f42c0dcb0540eb806ebeee8a44833c25e2de813" +hash = "e5739bf8e8668a5d94ae545f7ddabcffcdfec64b0e72d7d2d88d8f64f480977e" metafile = true [[files]] file = "mods/bounced.pw.toml" -hash = "f73ea85893dc1f659ce389241382f21c26c4fb50d72eaaa63b1a30f8281149d9" +hash = "0f770aa873be6fd23b6c78a8805bd7aa4d049fb173afad535f16ac6216232e77" metafile = true [[files]] file = "mods/brrp.pw.toml" -hash = "43c74c08ec25d19c365c72f8546edd2e01aa10c3b4cef39a4cbc9d09cb5b1562" +hash = "b133b5ca4007f772467d0b6fcc1baedcb287bc46d7a2864a83b0e038a51954dd" metafile = true [[files]] @@ -217,27 +217,27 @@ metafile = true [[files]] file = "mods/cc-tweaked.pw.toml" -hash = "c5273660430701af5eb1cb8cc298db8266756bb8bb5c87a6031ce96b33cd8ffc" +hash = "b79cc58d8f59edf82a64eac716b84f11911b2bc63c40529575dbaf67f4896efb" metafile = true [[files]] file = "mods/cloth-config.pw.toml" -hash = "1fc52599bb002e467661afaa4b844c517fb549ad14eb6f552bf11dfb5c8b535e" +hash = "a89dfcc985612a275975d4823a24fc3dceb244bacb2e8f81bd459283bf1b9fe9" metafile = true [[files]] file = "mods/continuity.pw.toml" -hash = "2ff8353009122a86ac846dd8d48b2522d46f3b43111eb3a697d99cc42285a14f" +hash = "acbde04e67f2f0970a6b81e3c818a5f8ed3eceab4f3a04330d80c70c24d03afe" metafile = true [[files]] file = "mods/coxinha-utilities.pw.toml" -hash = "7665453af22db34c5d1b1438b5aa8d8f03473e3ea90391c3f9cad8b989d83255" +hash = "317c1eee93a32ceec10a588292c583866d4b6179fd183608940068e5ed4d9884" metafile = true [[files]] file = "mods/create-fabric.pw.toml" -hash = "e5bbc96d6d5d6bffb8e36c89bbd1331d923e23fbb87be8bae208d206832adb1c" +hash = "26394151533372bce2229f31c8df7f65e2deb751cc823f317cd30682381acc8f" metafile = true [[files]] @@ -252,47 +252,52 @@ metafile = true [[files]] file = "mods/edgeless-cs.pw.toml" -hash = "5bce499b3487d0fb3f7704989a20659582fe0cefb0b9cd3e3d633f8ec3d05562" +hash = "c484b27e1c7af33f97cd8a2de843823f76a721171bff796c00ab0809595942cf" metafile = true [[files]] file = "mods/entityculling.pw.toml" -hash = "625dddd14bf47324a945452cbd92e913877bb574883b086a73aa6fc07740ac44" +hash = "dd6dcae2b3900f466f93387e57a213a18678dd3b366cb4037e2870dfcd892eb8" metafile = true [[files]] file = "mods/equator.pw.toml" -hash = "0a0a0cab5b0aa6bc4bb5dadd3fb8b7bbbdde7fe0015bf943d0e184b732f8f4f7" +hash = "c6c678e280e916c21f72628f6d28d70df35283dfc26f9117f8564c11242d08c9" metafile = true [[files]] file = "mods/extended-drawers.pw.toml" -hash = "cdb7cd286ed6706a6481a3a07c5017635d322c175351720503f6d59ee38d4020" +hash = "06859e85abd86899e44b38c090d53f5804550aca2a23924fbb6bb1867d0b859a" +metafile = true + +[[files]] +file = "mods/fabric-api.pw.toml" +hash = "86698b1faa9bf449eab492509239372302311092104be467108d7e05127e91f1" metafile = true [[files]] file = "mods/fabric-language-kotlin.pw.toml" -hash = "6f95b9e670d557f852a798489d7b5ec48ed8ddc7e8e1809ff06d4b187d17aac9" +hash = "14e87ff6253d2bd02697e46b4a9b5060465d72b71663def5236f829e30bac6d6" metafile = true [[files]] file = "mods/faded-widgets.pw.toml" -hash = "d603afd1489c18d1b7a0ce4b0cb5797aba7866990abcaac1c3f784c304bb7e92" +hash = "eeea78d6bdc7f236aef6ea05a2be10646e5ab64d8a1c310feb66a5c7362962b5" metafile = true [[files]] file = "mods/farmers-delight.pw.toml" -hash = "746344028104ece23ab00e1f73374ed271b492f654bd52ac0ea7c97aad5b362a" +hash = "20dd3d2cb36dc6cce68071bf4797d4288b788fa0cf110cb25cebad72f7fad63c" metafile = true [[files]] file = "mods/flash.pw.toml" -hash = "e303cd53b4bbde882ed639d7a1e8bf5c3fdbd4e34258b2dc17db390c1a3ac7b1" +hash = "23e66fbf491e1cc21b16a5c642df04617b22100a53aac6454e7967cca36b8833" metafile = true [[files]] file = "mods/hephaestus.pw.toml" -hash = "dd6d0c4565358f9aa55c9003c2b687c1e759dadb65be16d89a5293f62b51bfe8" +hash = "d9a21276de16a0e50c83cc730e24e2794a6393b238cf22ca96753d118525bd74" metafile = true [[files]] @@ -302,12 +307,12 @@ metafile = true [[files]] file = "mods/indium.pw.toml" -hash = "0c5e71addef34c8dcd1c81dfc2ad851a3e274b9d8d3a7d388e1113d4139bf8d8" +hash = "31278d67704a56eb32d93c240e4bfd9822e1ab6047ee14d752953dd0c24dca95" metafile = true [[files]] file = "mods/industrial-revolution.pw.toml" -hash = "5a4ee8f354b74926638df717937223a71f7bbc57786215eec7f4f2efc1b8761a" +hash = "adacdb4be2a9d80bc4854479961298015c595f65af74115198cb884c1fb4cddb" metafile = true [[files]] @@ -317,7 +322,7 @@ metafile = true [[files]] file = "mods/ive-spoken.pw.toml" -hash = "f17ffcb7987a4d404db3cba1f0c7f5b186edcdbc8cd8f4256e2bd1421c9525d0" +hash = "ec3cc0296e021c793e020382d9ef59463f6ed82052a94cd094050e1ab5bd3da5" metafile = true [[files]] @@ -327,12 +332,12 @@ metafile = true [[files]] file = "mods/knowledges.pw.toml" -hash = "90ead38f9ca618e0e7bdea19e5a71fa8b52ced19737e345524b33aee58431e71" +hash = "70b26d20e08b657c492ba75107a329bd58fdeb0f04a29d3eaf8584cd3eb6e50b" metafile = true [[files]] file = "mods/krypton.pw.toml" -hash = "f999930809222b57898da25a30aad2135b02894f42c0e1d2832c4670272fbd1d" +hash = "71ef7cc16632c0039fe194183b5885968c6d740aaa67a58000653ae0cb40b882" metafile = true [[files]] @@ -347,12 +352,12 @@ metafile = true [[files]] file = "mods/lithium.pw.toml" -hash = "ed27ecb297016accc41e9894b6e11d6c46b455211e358afa6218ce629ef56978" +hash = "c239c951796882b9c93e649a0dba4f2d95804441faaed707b686381b7a5c67da" metafile = true [[files]] file = "mods/lootr-fabric.pw.toml" -hash = "53786f23c772395f44842146accd33b2f05bc8113c53dde5ae8c02a98706e83f" +hash = "2beeb497828d72467d5d29dfc9567e06c63c6f1ddf54cb42b7d6a3babd603e0f" metafile = true [[files]] @@ -367,12 +372,17 @@ metafile = true [[files]] file = "mods/modmenu.pw.toml" -hash = "b136ca50e7d8239319f528ceb521e3482f753b25d768afaf39fa6ea81e549f2e" +hash = "4cd171d3f5f3e1d2948cb1b0062e742a5e85110c9e9a668f9aed5b0cebcb9c97" metafile = true [[files]] file = "mods/natures-compass.pw.toml" -hash = "89b3552559d8729ce9d7ac46cb336056347a36776ab6a4ad19b0b5c3266e7a2b" +hash = "cb38b82b931ae3c33bf9c21ad0934fcebaebcfe065838ade56a0661e283ee7d6" +metafile = true + +[[files]] +file = "mods/night-auto-config.pw.toml" +hash = "b314333b464ab56c95ef1685fca85f8031b68bc6cc151a9a881488d6f0b1c1a6" metafile = true [[files]] @@ -387,42 +397,42 @@ metafile = true [[files]] file = "mods/promenade.pw.toml" -hash = "822cb71ea6d0986f90f01d1df5eee941334073cddc7b9abbe0398ba76c31fdaf" +hash = "4edb1d260abf93b2e69b319a44f2cbf26785850669dc28424bd678207c72f764" metafile = true [[files]] file = "mods/reeses-sodium-options.pw.toml" -hash = "19a098ab3131eb6daf0033199744d33dbb31a4ce9b20b9fc6eb709ab1272aa7e" +hash = "0f9916dcded3aac68d56113e9617bbe3db5ec9036bd9bba784bc40a961b0c9f0" metafile = true [[files]] file = "mods/rei.pw.toml" -hash = "d1a2ca6f7e7d0a999f0b28ff429a38dc38ff6e0a9c176a86356b8cf6472147a7" +hash = "3a918ed8f788c9fdc80655da76c9499aaf60a468f5960bbf6e744ddf10231754" metafile = true [[files]] file = "mods/sodium-extra.pw.toml" -hash = "7e39ba5b471407bf43c212fae99856276bf4411046aa3a5df5a7d27e76c7a2b3" +hash = "5379b1da9fa50def37ede26e66dd963de3ce6f8576cd60a6b117998e09a5597c" metafile = true [[files]] file = "mods/sodium.pw.toml" -hash = "ff614f50beb3bc29a699dbcc0a61f65bd6c6154cd374f2763ee57cf578045a8f" +hash = "245530bdbb5c4127a1286f3722778d71e478194a8dcee89388c8fd247b4a57da" metafile = true [[files]] file = "mods/splasher.pw.toml" -hash = "dec9ffcf461ba0bad67761d6181916522c9a600d5509bd7ccdc322d2a93f52e8" +hash = "a982b8fd5d0f0768dc220577334496b96b4a601e96e58cdb701909545b135836" metafile = true [[files]] file = "mods/starlight.pw.toml" -hash = "0a78a506125c0edc97d2292d26c6eab310106c60a5a4e64d73ff67bb619f5a4c" +hash = "218f67d6bcaae849582618cd3e5eb1d4cac0fd6045115f64340620300e160c11" metafile = true [[files]] file = "mods/stenographer.pw.toml" -hash = "284bff9c2bd51723062cc1183fe873a338e0aaeb85f94dd97a8b22e5511f58af" +hash = "0077f2f561f0099318503d6c100d2c95407bee8170a5aacb44456dd693f697e7" metafile = true [[files]] @@ -432,22 +442,22 @@ metafile = true [[files]] file = "mods/terrestria.pw.toml" -hash = "2099b69364356b7e620a08ed91471031f88b7723d9a21b18209dc99542bdb617" +hash = "d88f78d490fbfe15149a92f5aa1c66f3349cbb35c9599cbf9c4bba88e5ffb53a" metafile = true [[files]] file = "mods/trinkets.pw.toml" -hash = "44ab19941b58049d859553df1a1a9d31e5eaf0eb98a8b7c4d3f79d9b39e1c368" +hash = "07619668821f2aad9dbd40084ad80f25595d8715a9ef204a4a9629225729a7d9" metafile = true [[files]] file = "mods/verticality.pw.toml" -hash = "104b27fd52a21e4084b03741461c7557864afe6f9a394f517066d1ddf6c1f698" +hash = "a43b55c71788733c15cf67aa5a89dfa06e91ca62dec53d39fe5128e572a2f919" metafile = true [[files]] file = "mods/xl-packets-fabric.pw.toml" -hash = "bb48e2f46c2ab8c1f4b81cb086ffdf39b4cb5cf6267748d7fc094f42d4bd31c5" +hash = "2c3859d6f191e9f1761b29fe6886635e0e84466681f0d526b08b16fa177a6a2f" metafile = true [[files]] diff --git a/mappings/mappings-fix.tiny b/mappings/mappings-fix.tiny new file mode 100644 index 00000000..095b6469 --- /dev/null +++ b/mappings/mappings-fix.tiny @@ -0,0 +1,3 @@ +tiny 2 0 intermediary named +c earth/terrarium/botarium/common/fluid/impl/SimpleFluidContainer earth/terrarium/botarium/common/fluid/impl/SimpleFluidContainer + m ()V clear clear$fixConflict diff --git a/mods/ad-astra.pw.toml b/mods/ad-astra.pw.toml index 35c112d9..c75dd176 100644 --- a/mods/ad-astra.pw.toml +++ b/mods/ad-astra.pw.toml @@ -1,13 +1,13 @@ name = "Ad Astra!" -filename = "ad_astra-fabric-1.20.1-1.15.3.jar" +filename = "ad_astra-fabric-1.20.1-1.15.18.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/3ufwT9JF/versions/IfdLtruQ/ad_astra-fabric-1.20.1-1.15.3.jar" +url = "https://cdn.modrinth.com/data/3ufwT9JF/versions/MxqFxL9C/ad_astra-fabric-1.20.1-1.15.18.jar" hash-format = "sha1" -hash = "9e51b0ffbd4d0c5ea944bb590bd08e0a54989c8e" +hash = "d93d7a03c15a642fa88c84d67bdca0d90a011efe" [update] [update.modrinth] mod-id = "3ufwT9JF" -version = "IfdLtruQ" +version = "MxqFxL9C" diff --git a/mods/ae2.pw.toml b/mods/ae2.pw.toml index 1d8a0990..50f3c0df 100644 --- a/mods/ae2.pw.toml +++ b/mods/ae2.pw.toml @@ -1,13 +1,13 @@ name = "Applied Energistics 2" -filename = "appliedenergistics2-fabric-15.0.11.jar" +filename = "appliedenergistics2-fabric-15.2.9.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/XxWD5pD3/versions/xUoHYNEg/appliedenergistics2-fabric-15.0.11.jar" +url = "https://cdn.modrinth.com/data/XxWD5pD3/versions/fatWoH9r/appliedenergistics2-fabric-15.2.9.jar" hash-format = "sha1" -hash = "81ba23f183c9292a5804e53a3a6cf2a550547b44" +hash = "de1bb69a97c688ba738586278c0e25c03ad8e399" [update] [update.modrinth] mod-id = "XxWD5pD3" -version = "xUoHYNEg" +version = "fatWoH9r" diff --git a/mods/amecs.pw.toml b/mods/amecs.pw.toml index d8887a9b..d5013df5 100644 --- a/mods/amecs.pw.toml +++ b/mods/amecs.pw.toml @@ -1,13 +1,13 @@ name = "Amecs" -filename = "amecs-1.3.9+mc.1.20.1.jar" +filename = "amecs-1.3.10+mc.1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/rcLriA4v/versions/97ZA8JmI/amecs-1.3.9%2Bmc.1.20.1.jar" +url = "https://cdn.modrinth.com/data/rcLriA4v/versions/HuXAp0GB/amecs-1.3.10%2Bmc.1.20.1.jar" hash-format = "sha1" -hash = "9c6b9f99c12cb1209f39cf83dabe05b9f4cbdd24" +hash = "1eff33308da62b47e5767875b28cdd436da77e2c" [update] [update.modrinth] mod-id = "rcLriA4v" -version = "97ZA8JmI" +version = "HuXAp0GB" diff --git a/mods/architectury-api.pw.toml b/mods/architectury-api.pw.toml index 17549024..4efa352f 100644 --- a/mods/architectury-api.pw.toml +++ b/mods/architectury-api.pw.toml @@ -1,13 +1,13 @@ name = "Architectury API" -filename = "architectury-10.0.8-fabric.jar" +filename = "architectury-9.2.14-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/cv151FBM/architectury-10.0.8-fabric.jar" +url = "https://cdn.modrinth.com/data/lhGA9TYQ/versions/WbL7MStR/architectury-9.2.14-fabric.jar" hash-format = "sha1" -hash = "18f8ce90c1118650b5b383be2f831ea9716e6047" +hash = "4fa65e32dbf63a871a30fe8ec6fbff9a4b8d007d" [update] [update.modrinth] mod-id = "lhGA9TYQ" -version = "cv151FBM" +version = "WbL7MStR" diff --git a/mods/athena-ctm.pw.toml b/mods/athena-ctm.pw.toml index 1671a261..003e65fd 100644 --- a/mods/athena-ctm.pw.toml +++ b/mods/athena-ctm.pw.toml @@ -1,13 +1,13 @@ name = "Athena" -filename = "athena-fabric-1.20.1-3.1.1.jar" +filename = "athena-fabric-1.20.1-3.1.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/b1ZV3DIJ/versions/Jy8DnzcO/athena-fabric-1.20.1-3.1.1.jar" +url = "https://cdn.modrinth.com/data/b1ZV3DIJ/versions/mXJWSwbJ/athena-fabric-1.20.1-3.1.2.jar" hash-format = "sha1" -hash = "4ec2e1e1450180a0d4a985bcddb5349f4d135ffe" +hash = "53014ceff1e10085609c16adbe246df51113bfe9" [update] [update.modrinth] mod-id = "b1ZV3DIJ" -version = "Jy8DnzcO" +version = "mXJWSwbJ" diff --git a/mods/bookshelf.pw.toml b/mods/bookshelf.pw.toml index d91f34c1..c2fd6ade 100644 --- a/mods/bookshelf.pw.toml +++ b/mods/bookshelf.pw.toml @@ -1,13 +1,13 @@ name = "Bookshelf" -filename = "Bookshelf-Fabric-1.20.1-20.0.4.jar" +filename = "Bookshelf-Fabric-1.20.1-20.2.13.jar" side = "both" [download] hash-format = "sha1" -hash = "5f7a8c542f6eed14f390840232dca93ac95fe135" +hash = "67a67945139b0c26bc8075a746b8f0ed571a9b8a" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4743164 +file-id = 5423988 project-id = 228525 diff --git a/mods/bounced.pw.toml b/mods/bounced.pw.toml index 18ba8706..4dac7117 100644 --- a/mods/bounced.pw.toml +++ b/mods/bounced.pw.toml @@ -1,13 +1,13 @@ name = "Bounced" -filename = "bounced-1.20-3.1.0.jar" +filename = "bounced-4.1.1-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/2mlOZXZr/versions/mtpqPiXn/bounced-1.20-3.1.0.jar" +url = "https://cdn.modrinth.com/data/2mlOZXZr/versions/eeS0bDZR/bounced-4.1.1-fabric1.20.jar" hash-format = "sha1" -hash = "d9fc15966875bb796bd49e5b39cee10a82a191a5" +hash = "0bc3dd3a2a24707d8af50ff1f8f4440a0704d941" [update] [update.modrinth] mod-id = "2mlOZXZr" -version = "mtpqPiXn" +version = "eeS0bDZR" diff --git a/mods/brrp.pw.toml b/mods/brrp.pw.toml index 2d2b5cf2..b7ed5480 100644 --- a/mods/brrp.pw.toml +++ b/mods/brrp.pw.toml @@ -1,13 +1,13 @@ name = "Better Runtime Resource Pack (BRRP)" -filename = "brrp-fabric-1.0.1-1.20.2.jar" +filename = "brrp-fabric-1.0.1-1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/JnrDtPAE/versions/KKxCR20y/brrp-fabric-1.0.1-1.20.2.jar" +url = "https://cdn.modrinth.com/data/JnrDtPAE/versions/67aRXMZe/brrp-fabric-1.0.1-1.20.1.jar" hash-format = "sha1" -hash = "31b8a849b8799dcf7061c96193b451972817c096" +hash = "9ab47efbad81fa0f6f72bb395452970250a0c69d" [update] [update.modrinth] mod-id = "JnrDtPAE" -version = "KKxCR20y" +version = "67aRXMZe" diff --git a/mods/cc-tweaked.pw.toml b/mods/cc-tweaked.pw.toml index 338a9500..4a6baaf2 100644 --- a/mods/cc-tweaked.pw.toml +++ b/mods/cc-tweaked.pw.toml @@ -1,13 +1,13 @@ name = "CC: Tweaked" -filename = "cc-tweaked-1.20.1-fabric-1.108.1.jar" +filename = "cc-tweaked-1.20.1-fabric-1.111.0.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/gu7yAYhd/versions/s6Ov3R0y/cc-tweaked-1.20.1-fabric-1.108.1.jar" +url = "https://cdn.modrinth.com/data/gu7yAYhd/versions/MlxrTZqO/cc-tweaked-1.20.1-fabric-1.111.0.jar" hash-format = "sha1" -hash = "5ed6f612a9ae0de62251b89a23c3e77b57632564" +hash = "74af3d15232d46a66cdbeef7bdaed4b544a30b5d" [update] [update.modrinth] mod-id = "gu7yAYhd" -version = "s6Ov3R0y" +version = "MlxrTZqO" diff --git a/mods/cloth-config.pw.toml b/mods/cloth-config.pw.toml index 5b70a934..6d9c873c 100644 --- a/mods/cloth-config.pw.toml +++ b/mods/cloth-config.pw.toml @@ -1,13 +1,13 @@ name = "Cloth Config API" -filename = "cloth-config-12.0.109-fabric.jar" +filename = "cloth-config-11.1.118-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/9s6osm5g/versions/LnfolBYb/cloth-config-12.0.109-fabric.jar" +url = "https://cdn.modrinth.com/data/9s6osm5g/versions/J3FLptsi/cloth-config-11.1.118-fabric.jar" hash-format = "sha1" -hash = "66ebcea9ec4ce863f0cc99e56d91a4c1a4e276a4" +hash = "f669f899d707b9e9acf1c239b0ae6b2c8be95361" [update] [update.modrinth] mod-id = "9s6osm5g" -version = "LnfolBYb" +version = "J3FLptsi" diff --git a/mods/continuity.pw.toml b/mods/continuity.pw.toml index 3f3b595d..ff92c38d 100644 --- a/mods/continuity.pw.toml +++ b/mods/continuity.pw.toml @@ -1,13 +1,13 @@ name = "Continuity" -filename = "continuity-3.0.0-beta.3+1.20.1.jar" +filename = "continuity-3.0.0-beta.5+1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/1IjD5062/versions/xy2co4Rh/continuity-3.0.0-beta.3%2B1.20.1.jar" +url = "https://cdn.modrinth.com/data/1IjD5062/versions/84Zs6tNo/continuity-3.0.0-beta.5%2B1.20.1.jar" hash-format = "sha1" -hash = "28fa0bc995fe240d17fcb1b2c8de8b0afd98213e" +hash = "15ad75d51f567c69308b91223454bacfd2eda7a5" [update] [update.modrinth] mod-id = "1IjD5062" -version = "xy2co4Rh" +version = "84Zs6tNo" diff --git a/mods/coxinha-utilities.pw.toml b/mods/coxinha-utilities.pw.toml index 05ddca0b..51778e39 100644 --- a/mods/coxinha-utilities.pw.toml +++ b/mods/coxinha-utilities.pw.toml @@ -1,13 +1,13 @@ name = "Coxinha Utilities" -filename = "coxinhautilities-1.4.10+1.20.jar" +filename = "coxinhautilities-1.4.13+1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/NXqpbY3F/versions/rW21He2h/coxinhautilities-1.4.10%2B1.20.jar" +url = "https://cdn.modrinth.com/data/NXqpbY3F/versions/1NVfDCRA/coxinhautilities-1.4.13%2B1.20.1.jar" hash-format = "sha1" -hash = "855d0f3958d7c09d62af9a717cbcfaec88c0d256" +hash = "23110b6c23a590e56a4460b74775bcbdc4aa2aed" [update] [update.modrinth] mod-id = "NXqpbY3F" -version = "rW21He2h" +version = "1NVfDCRA" diff --git a/mods/create-fabric.pw.toml b/mods/create-fabric.pw.toml index d652a4e1..3def9c0e 100644 --- a/mods/create-fabric.pw.toml +++ b/mods/create-fabric.pw.toml @@ -1,13 +1,13 @@ name = "Create Fabric" -filename = "create-fabric-0.5.1-d-build.1161+mc1.20.1.jar" +filename = "create-fabric-0.5.1-f-build.1417+mc1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/Xbc0uyRg/versions/qlA1WuOK/create-fabric-0.5.1-d-build.1161%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/Xbc0uyRg/versions/h2HgGyvA/create-fabric-0.5.1-f-build.1417%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "e5f066598208b340e1a35285d539ac07ac4f6b8e" +hash = "dc5c230e3b293092b457200883398225fffab597" [update] [update.modrinth] mod-id = "Xbc0uyRg" -version = "qlA1WuOK" +version = "h2HgGyvA" diff --git a/mods/edgeless-cs.pw.toml b/mods/edgeless-cs.pw.toml index c58fd923..ad43c65f 100644 --- a/mods/edgeless-cs.pw.toml +++ b/mods/edgeless-cs.pw.toml @@ -1,13 +1,13 @@ name = "Edgeless Chat Screen" -filename = "edgeless_cs-1.20-1.0.0.jar" +filename = "edgelesschatscreen-1.1.3-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/lS8sHS85/versions/wXEdL5Z2/edgeless_cs-1.20-1.0.0.jar" +url = "https://cdn.modrinth.com/data/lS8sHS85/versions/qRZe4EYK/edgelesschatscreen-1.1.3-fabric1.20.jar" hash-format = "sha1" -hash = "fe0c2bd6abfb29c6bc9168ed357c3abd10f46310" +hash = "7891d245fb68b6058a1c089cb42136975e9c7142" [update] [update.modrinth] mod-id = "lS8sHS85" -version = "wXEdL5Z2" +version = "qRZe4EYK" diff --git a/mods/entityculling.pw.toml b/mods/entityculling.pw.toml index 115ee81d..cf8afc7e 100644 --- a/mods/entityculling.pw.toml +++ b/mods/entityculling.pw.toml @@ -1,13 +1,13 @@ name = "EntityCulling" -filename = "entityculling-fabric-1.6.2-mc1.20.1.jar" +filename = "entityculling-fabric-1.6.6-mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/BDwHAdWc/entityculling-fabric-1.6.2-mc1.20.1.jar" +url = "https://cdn.modrinth.com/data/NNAgCjsB/versions/F3RXDl1W/entityculling-fabric-1.6.6-mc1.20.1.jar" hash-format = "sha1" -hash = "8e4be2bb9703deddb3d3d212c812cdc1f9de072b" +hash = "d6894508d74e5f01fb525b5b89d20ac4e54257b6" [update] [update.modrinth] mod-id = "NNAgCjsB" -version = "BDwHAdWc" +version = "F3RXDl1W" diff --git a/mods/equator.pw.toml b/mods/equator.pw.toml index ac2f173b..a3330fdd 100644 --- a/mods/equator.pw.toml +++ b/mods/equator.pw.toml @@ -1,13 +1,13 @@ name = "Equator" -filename = "equator-1.20-2.6.0.jar" +filename = "equator-1.20-2.6.4.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/XUTlQITd/versions/S46aTNR5/equator-1.20-2.6.0.jar" +url = "https://cdn.modrinth.com/data/XUTlQITd/versions/kVWUgkbC/equator-1.20-2.6.4.jar" hash-format = "sha1" -hash = "0fcbe02ad1729d71d8f5434df43d6ab4f9c85374" +hash = "1294632d63ae0769d53b6983c7f94dc44702a743" [update] [update.modrinth] mod-id = "XUTlQITd" -version = "S46aTNR5" +version = "kVWUgkbC" diff --git a/mods/extended-drawers.pw.toml b/mods/extended-drawers.pw.toml index 9149e2a3..610a9950 100644 --- a/mods/extended-drawers.pw.toml +++ b/mods/extended-drawers.pw.toml @@ -1,13 +1,13 @@ name = "Extended Drawers" -filename = "ExtendedDrawers-2.0.5+mc.1.20.1.jar" +filename = "ExtendedDrawers-2.1.1+mc.1.20.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/AhtxbnpG/versions/bMTgXYHf/ExtendedDrawers-2.0.5%2Bmc.1.20.1.jar" +url = "https://cdn.modrinth.com/data/AhtxbnpG/versions/jAVkcXz6/ExtendedDrawers-2.1.1%2Bmc.1.20.1.jar" hash-format = "sha1" -hash = "da30ddcb45651e6070cecf2208c7e8ad179e0169" +hash = "3bd92feec248b44394d89cea91f1b421e9d4c186" [update] [update.modrinth] mod-id = "AhtxbnpG" -version = "bMTgXYHf" +version = "jAVkcXz6" diff --git a/mods/fabric-api.pw.toml b/mods/fabric-api.pw.toml new file mode 100644 index 00000000..5831ed89 --- /dev/null +++ b/mods/fabric-api.pw.toml @@ -0,0 +1,13 @@ +name = "Fabric API" +filename = "fabric-api-0.92.2+1.20.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/P7uGFii0/fabric-api-0.92.2%2B1.20.1.jar" +hash-format = "sha1" +hash = "625ee015ee426d9b677382a7bb661383d89c0807" + +[update] +[update.modrinth] +mod-id = "P7dR8mSH" +version = "P7uGFii0" diff --git a/mods/fabric-language-kotlin.pw.toml b/mods/fabric-language-kotlin.pw.toml index d5e9e2d4..6f719ee6 100644 --- a/mods/fabric-language-kotlin.pw.toml +++ b/mods/fabric-language-kotlin.pw.toml @@ -1,13 +1,13 @@ name = "Fabric Language Kotlin" -filename = "fabric-language-kotlin-1.10.10+kotlin.1.9.10.jar" +filename = "fabric-language-kotlin-1.11.0+kotlin.2.0.0.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/48ri5y9r/fabric-language-kotlin-1.10.10%2Bkotlin.1.9.10.jar" +url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/afsFajDC/fabric-language-kotlin-1.11.0%2Bkotlin.2.0.0.jar" hash-format = "sha1" -hash = "c708f3f4e94f0f66e72c6e96858368f0512c3b38" +hash = "4f5b3f0d773c4cc9e79d2f5ede3a637e78737f6d" [update] [update.modrinth] mod-id = "Ha28R6CL" -version = "48ri5y9r" +version = "afsFajDC" diff --git a/mods/faded-widgets.pw.toml b/mods/faded-widgets.pw.toml index 83ae6a37..77148eb9 100644 --- a/mods/faded-widgets.pw.toml +++ b/mods/faded-widgets.pw.toml @@ -1,13 +1,13 @@ name = "Faded Widgets" -filename = "faded_widgets-1.20-2.0.0.jar" +filename = "fadedwidgets-2.1.1-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/uV6OSNDy/versions/912HRy6o/faded_widgets-1.20-2.0.0.jar" +url = "https://cdn.modrinth.com/data/uV6OSNDy/versions/gI5EUEgD/fadedwidgets-2.1.1-fabric1.20.jar" hash-format = "sha1" -hash = "929efc5e22b134a4da6bd5eb3e98db723cf4c684" +hash = "2a67e616a70f490edb536decde5aa105f87bbd1f" [update] [update.modrinth] mod-id = "uV6OSNDy" -version = "912HRy6o" +version = "gI5EUEgD" diff --git a/mods/farmers-delight.pw.toml b/mods/farmers-delight.pw.toml index 97739003..cfb6adb2 100644 --- a/mods/farmers-delight.pw.toml +++ b/mods/farmers-delight.pw.toml @@ -1,13 +1,13 @@ name = "Farmer's Delight" -filename = "farmers-delight-fabric-mc1.20.1-1.4.2.jar" +filename = "farmers-delight-fabric-1.4.3.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/4EakbH8e/versions/rlm3hWGx/farmers-delight-fabric-mc1.20.1-1.4.2.jar" +url = "https://cdn.modrinth.com/data/4EakbH8e/versions/QXYNitXw/farmers-delight-fabric-1.4.3.jar" hash-format = "sha1" -hash = "2f9604b3f0328478598d8d35a298de206d764efc" +hash = "758d7931e769dc4a78ff6642976cffbe75a522cb" [update] [update.modrinth] mod-id = "4EakbH8e" -version = "rlm3hWGx" +version = "QXYNitXw" diff --git a/mods/flash.pw.toml b/mods/flash.pw.toml index c695b300..94f63602 100644 --- a/mods/flash.pw.toml +++ b/mods/flash.pw.toml @@ -1,13 +1,13 @@ name = "Flash" -filename = "flash-1.20-2.0.0.jar" +filename = "flash-2.1.0-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Zmu8jXWA/versions/Fpenf1R6/flash-1.20-2.0.0.jar" +url = "https://cdn.modrinth.com/data/Zmu8jXWA/versions/efvNlDkn/flash-2.1.0-fabric1.20.jar" hash-format = "sha1" -hash = "452383c00881defb4a84f0b04db35cfd500e896d" +hash = "d3d3bc7b9beac80ac3d403c8d7b4e93d47dd106a" [update] [update.modrinth] mod-id = "Zmu8jXWA" -version = "Fpenf1R6" +version = "efvNlDkn" diff --git a/mods/hephaestus.pw.toml b/mods/hephaestus.pw.toml index 71cfb6ae..ec85c8e9 100644 --- a/mods/hephaestus.pw.toml +++ b/mods/hephaestus.pw.toml @@ -1,13 +1,13 @@ name = "Hephaestus" -filename = "Hephaestus-1.20.1-3.6.3.232.jar" +filename = "Hephaestus-1.20.1-3.6.4.274.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/sdSn3wvy/versions/Yc80sCwP/Hephaestus-1.20.1-3.6.3.232.jar" +url = "https://cdn.modrinth.com/data/sdSn3wvy/versions/woXXzIDr/Hephaestus-1.20.1-3.6.4.274.jar" hash-format = "sha1" -hash = "4ddfc794a58bb698d904939e4a564528b67b4721" +hash = "b6dfa5ad8f8452f9b068ecb505b4904b3b3c530a" [update] [update.modrinth] mod-id = "sdSn3wvy" -version = "Yc80sCwP" +version = "woXXzIDr" diff --git a/mods/indium.pw.toml b/mods/indium.pw.toml index 9b84aaee..a2efb946 100644 --- a/mods/indium.pw.toml +++ b/mods/indium.pw.toml @@ -1,13 +1,13 @@ name = "Indium" -filename = "indium-1.0.27+mc1.20.1.jar" +filename = "indium-1.0.34+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Orvt0mRa/versions/Lue6O9z9/indium-1.0.27%2Bmc1.20.1.jar" +url = "https://cdn.modrinth.com/data/Orvt0mRa/versions/gofbpynL/indium-1.0.34%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "8c8e6b96243155b41f2f9d29d5940ee895bcb141" +hash = "a2de9ba15f155b09626995ad58b0e23803b05fe6" [update] [update.modrinth] mod-id = "Orvt0mRa" -version = "Lue6O9z9" +version = "gofbpynL" diff --git a/mods/industrial-revolution.pw.toml b/mods/industrial-revolution.pw.toml index 7053c513..b511a516 100644 --- a/mods/industrial-revolution.pw.toml +++ b/mods/industrial-revolution.pw.toml @@ -1,13 +1,13 @@ name = "Industrial Revolution" -filename = "indrev-1.16.5-BETA.jar" +filename = "indrev-1.16.7-BETA.jar" side = "both" [download] hash-format = "sha1" -hash = "c9c952dd6d3dff9371ec066baf4c8accc531870c" +hash = "20c00da256b629c3443f6f1a1624248affdf88b5" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4742613 +file-id = 5254377 project-id = 391708 diff --git a/mods/ive-spoken.pw.toml b/mods/ive-spoken.pw.toml index a3363b5b..d6961a78 100644 --- a/mods/ive-spoken.pw.toml +++ b/mods/ive-spoken.pw.toml @@ -1,13 +1,13 @@ name = "I've Spoken" -filename = "ive_spoken-1.20-2.0.0.jar" +filename = "ivespoken-2.2.0-fabric1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/OidSa416/versions/zku8aGns/ive_spoken-1.20-2.0.0.jar" +url = "https://cdn.modrinth.com/data/OidSa416/versions/vNVnAgca/ivespoken-2.2.0-fabric1.20.jar" hash-format = "sha1" -hash = "7a22140338487ee1956a38e809ec143cfc65aa7b" +hash = "95a4657b63f79a4206362e3078141e9df53c7ca6" [update] [update.modrinth] mod-id = "OidSa416" -version = "zku8aGns" +version = "vNVnAgca" diff --git a/mods/knowledges.pw.toml b/mods/knowledges.pw.toml index 4346ab97..b4ce15d7 100644 --- a/mods/knowledges.pw.toml +++ b/mods/knowledges.pw.toml @@ -1,13 +1,13 @@ name = "Knowledges" -filename = "knowledges-1.20-2.0.0.jar" +filename = "knowledges-5.1.2-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/kdZNMv3G/versions/LoDkCOc8/knowledges-1.20-2.0.0.jar" +url = "https://cdn.modrinth.com/data/kdZNMv3G/versions/mA6fTe0s/knowledges-5.1.2-fabric1.20.jar" hash-format = "sha1" -hash = "2db59c166d8e056c4953caad5855baeb3818eb5c" +hash = "3398d96e1610a811e0bf26ecaa45a4219530f0d6" [update] [update.modrinth] mod-id = "kdZNMv3G" -version = "LoDkCOc8" +version = "mA6fTe0s" diff --git a/mods/krypton.pw.toml b/mods/krypton.pw.toml index 678b35ce..74c1b511 100644 --- a/mods/krypton.pw.toml +++ b/mods/krypton.pw.toml @@ -1,13 +1,13 @@ name = "Krypton" -filename = "krypton-0.2.4.jar" +filename = "krypton-0.2.3.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/cQ60Ouax/krypton-0.2.4.jar" +url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/jiDwS0W1/krypton-0.2.3.jar" hash-format = "sha1" -hash = "cffdf89a438b83215ddbac2a29c56a2cd68b7d57" +hash = "4d499819effd8afe811e5d93952fcc46765a00df" [update] [update.modrinth] mod-id = "fQEb0iXm" -version = "cQ60Ouax" +version = "jiDwS0W1" diff --git a/mods/lithium.pw.toml b/mods/lithium.pw.toml index f96a0043..c5a1bc58 100644 --- a/mods/lithium.pw.toml +++ b/mods/lithium.pw.toml @@ -1,13 +1,13 @@ name = "Lithium" -filename = "lithium-fabric-mc1.20.2-0.12.0.jar" +filename = "lithium-fabric-mc1.20.1-0.11.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/qdzL5Hkg/lithium-fabric-mc1.20.2-0.12.0.jar" +url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/ZSNsJrPI/lithium-fabric-mc1.20.1-0.11.2.jar" hash-format = "sha1" -hash = "9b713d4909582d900274dcd7ca01abd195b53520" +hash = "8f4642147e60827f728badac7a819d1a9f3b25d5" [update] [update.modrinth] mod-id = "gvQqBUqZ" -version = "qdzL5Hkg" +version = "ZSNsJrPI" diff --git a/mods/lootr-fabric.pw.toml b/mods/lootr-fabric.pw.toml index 8b4648ed..3aa43d28 100644 --- a/mods/lootr-fabric.pw.toml +++ b/mods/lootr-fabric.pw.toml @@ -1,13 +1,13 @@ name = "Lootr (Fabric)" -filename = "lootr-1.20-0.7.29.75.jar" +filename = "lootr-fabric-1.20-0.7.33.81.jar" side = "both" [download] hash-format = "sha1" -hash = "2b6127075e64d12511e7409d9c025d37c37db3b8" +hash = "ea32700905b46d8131131d23ae0e7cf23d4cd00b" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4608507 +file-id = 5311675 project-id = 615106 diff --git a/mods/modmenu.pw.toml b/mods/modmenu.pw.toml index 73d7ddba..9609af64 100644 --- a/mods/modmenu.pw.toml +++ b/mods/modmenu.pw.toml @@ -1,13 +1,13 @@ name = "Mod Menu" -filename = "modmenu-8.0.0.jar" +filename = "modmenu-7.2.2.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/TwfjidT5/modmenu-8.0.0.jar" +url = "https://cdn.modrinth.com/data/mOgUt4GM/versions/lEkperf6/modmenu-7.2.2.jar" hash-format = "sha1" -hash = "6c781bc4ebf6b11296715c663bc1c7542e4eb630" +hash = "099c68feeb74887cbbbd8ce9a27c6123804a2c5a" [update] [update.modrinth] mod-id = "mOgUt4GM" -version = "TwfjidT5" +version = "lEkperf6" diff --git a/mods/natures-compass.pw.toml b/mods/natures-compass.pw.toml index 80bf63b8..38569d3b 100644 --- a/mods/natures-compass.pw.toml +++ b/mods/natures-compass.pw.toml @@ -1,13 +1,13 @@ name = "Nature's Compass" -filename = "NaturesCompass-1.20.2-2.2.3-fabric.jar" +filename = "NaturesCompass-1.20.1-2.2.3-fabric.jar" side = "both" [download] hash-format = "sha1" -hash = "031470160e7d698279ad2fe30f71265e1a4db545" +hash = "0734579799a17b9662b833cc21399521b09161ff" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4767074 +file-id = 4712188 project-id = 252848 diff --git a/mods/night-auto-config.pw.toml b/mods/night-auto-config.pw.toml new file mode 100644 index 00000000..a7ba502e --- /dev/null +++ b/mods/night-auto-config.pw.toml @@ -0,0 +1,13 @@ +name = "Night Auto Config" +filename = "nightautoconfig-1.0.3-fabric1.20.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/HQpcCFZg/versions/cVIqoZ4o/nightautoconfig-1.0.3-fabric1.20.jar" +hash-format = "sha1" +hash = "915675c5d31ae6407709df8d99af94b76a7f3fb9" + +[update] +[update.modrinth] +mod-id = "HQpcCFZg" +version = "cVIqoZ4o" diff --git a/mods/promenade.pw.toml b/mods/promenade.pw.toml index 210e84af..ae220615 100644 --- a/mods/promenade.pw.toml +++ b/mods/promenade.pw.toml @@ -1,13 +1,13 @@ name = "Promenade" -filename = "promenade-4.1.0.jar" +filename = "promenade-4.1.1.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/GuE5FpvB/versions/F17sFUaS/promenade-4.1.0.jar" +url = "https://cdn.modrinth.com/data/GuE5FpvB/versions/A5YD9uS3/promenade-4.1.1.jar" hash-format = "sha1" -hash = "fd3de4e7392a264346ce3d56b034905c30815b92" +hash = "a3386873538f4ca28f4761456d7461a4c846d892" [update] [update.modrinth] mod-id = "GuE5FpvB" -version = "F17sFUaS" +version = "A5YD9uS3" diff --git a/mods/reeses-sodium-options.pw.toml b/mods/reeses-sodium-options.pw.toml index 9cc6448e..4d5d58a9 100644 --- a/mods/reeses-sodium-options.pw.toml +++ b/mods/reeses-sodium-options.pw.toml @@ -1,13 +1,13 @@ name = "Reese's Sodium Options" -filename = "reeses_sodium_options-1.6.5+mc1.20.2-build.96.jar" +filename = "reeses_sodium_options-1.7.2+mc1.20.1-build.101.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/Bh37bMuy/versions/UpKbnidp/reeses_sodium_options-1.6.5%2Bmc1.20.2-build.96.jar" +url = "https://cdn.modrinth.com/data/Bh37bMuy/versions/Rc9pkPug/reeses_sodium_options-1.7.2%2Bmc1.20.1-build.101.jar" hash-format = "sha1" -hash = "c77155eed72144525d377d0385ddc1d0d18ece6e" +hash = "206f1b01b99ac3df99ddd84ed96b466a8700412d" [update] [update.modrinth] mod-id = "Bh37bMuy" -version = "UpKbnidp" +version = "Rc9pkPug" diff --git a/mods/rei.pw.toml b/mods/rei.pw.toml index f9ddf7a4..05d35a93 100644 --- a/mods/rei.pw.toml +++ b/mods/rei.pw.toml @@ -1,13 +1,13 @@ name = "Roughly Enough Items (REI)" -filename = "RoughlyEnoughItems-13.0.661.jar" +filename = "RoughlyEnoughItems-12.1.725-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/nfn13YXA/versions/LnN2sdXj/RoughlyEnoughItems-13.0.661.jar" +url = "https://cdn.modrinth.com/data/nfn13YXA/versions/tewJX3lm/RoughlyEnoughItems-12.1.725-fabric.jar" hash-format = "sha1" -hash = "2b5bbc3e98e594823b3bad53193ae4cdc6d6e5b2" +hash = "6962a0d6821ec7df5203021ac5ccfd8f22de940b" [update] [update.modrinth] mod-id = "nfn13YXA" -version = "LnN2sdXj" +version = "tewJX3lm" diff --git a/mods/sodium-extra.pw.toml b/mods/sodium-extra.pw.toml index d82fa4a5..5c4e1743 100644 --- a/mods/sodium-extra.pw.toml +++ b/mods/sodium-extra.pw.toml @@ -1,13 +1,13 @@ name = "Sodium Extra" -filename = "sodium-extra-0.5.2+mc1.20.2-build.113.jar" +filename = "sodium-extra-0.5.4+mc1.20.1-build.115.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/PtjYWJkn/versions/zgaajBnP/sodium-extra-0.5.2%2Bmc1.20.2-build.113.jar" +url = "https://cdn.modrinth.com/data/PtjYWJkn/versions/I7ggF6B5/sodium-extra-0.5.4%2Bmc1.20.1-build.115.jar" hash-format = "sha1" -hash = "89b9467dec7694d1b2c10294d0ff4315859381df" +hash = "890864a6ab5d77d57d8d757bcc31f5379b5a11b1" [update] [update.modrinth] mod-id = "PtjYWJkn" -version = "zgaajBnP" +version = "I7ggF6B5" diff --git a/mods/sodium.pw.toml b/mods/sodium.pw.toml index 69b74765..778bf4b5 100644 --- a/mods/sodium.pw.toml +++ b/mods/sodium.pw.toml @@ -1,13 +1,13 @@ name = "Sodium" -filename = "sodium-fabric-mc1.20.2-0.5.3.jar" +filename = "sodium-fabric-0.5.11+mc1.20.1.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/AANobbMI/versions/bbP1qBMr/sodium-fabric-mc1.20.2-0.5.3.jar" +url = "https://cdn.modrinth.com/data/AANobbMI/versions/ygf8cVZg/sodium-fabric-0.5.11%2Bmc1.20.1.jar" hash-format = "sha1" -hash = "37d1fb5be973beba13b88ae6a6f8158dc80a12ad" +hash = "c4293c1483f3b39c1c6c4c69143e8bb2c6e53daf" [update] [update.modrinth] mod-id = "AANobbMI" -version = "bbP1qBMr" +version = "ygf8cVZg" diff --git a/mods/splasher.pw.toml b/mods/splasher.pw.toml index 043f1fa1..22bb327f 100644 --- a/mods/splasher.pw.toml +++ b/mods/splasher.pw.toml @@ -1,13 +1,13 @@ name = "Splasher!" -filename = "splasher-1.20-5.0.0.jar" +filename = "splasher-6.2.0-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/4yIZUuyx/versions/M6WhhL3J/splasher-1.20-5.0.0.jar" +url = "https://cdn.modrinth.com/data/4yIZUuyx/versions/gtoNK8dP/splasher-6.2.0-fabric1.20.jar" hash-format = "sha1" -hash = "ee51d02976a2b94e12a9ff0d4895aca536862596" +hash = "b1eef0ec9983ff1155b54b2b5a6e1990f73fe9fb" [update] [update.modrinth] mod-id = "4yIZUuyx" -version = "M6WhhL3J" +version = "gtoNK8dP" diff --git a/mods/starlight.pw.toml b/mods/starlight.pw.toml index e949ad48..db082ee0 100644 --- a/mods/starlight.pw.toml +++ b/mods/starlight.pw.toml @@ -1,13 +1,13 @@ name = "Starlight (Fabric)" -filename = "starlight-1.1.2+fabric.bdaeb21.jar" +filename = "starlight-1.1.2+fabric.dbc156f.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/H8CaAYZC/versions/98VOoYPX/starlight-1.1.2%2Bfabric.bdaeb21.jar" +url = "https://cdn.modrinth.com/data/H8CaAYZC/versions/XGIsoVGT/starlight-1.1.2%2Bfabric.dbc156f.jar" hash-format = "sha1" -hash = "6cf71105561a6893f76ae561fdbef839c404b8b5" +hash = "a03102cab439cbab5a1d7d72cd7c2b4976ddd421" [update] [update.modrinth] mod-id = "H8CaAYZC" -version = "98VOoYPX" +version = "XGIsoVGT" diff --git a/mods/stenographer.pw.toml b/mods/stenographer.pw.toml index 7578cb28..c1e0d4af 100644 --- a/mods/stenographer.pw.toml +++ b/mods/stenographer.pw.toml @@ -1,13 +1,13 @@ name = "Stenographer" -filename = "stenographer-1.20-3.0.0.jar" +filename = "stenographer-3.1.0-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/cu290YRp/versions/YA4fWzHH/stenographer-1.20-3.0.0.jar" +url = "https://cdn.modrinth.com/data/cu290YRp/versions/zdFClpyU/stenographer-3.1.0-fabric1.20.jar" hash-format = "sha1" -hash = "33f3ca548b5ad2912e64f6b39ca51387b08b346e" +hash = "f4e25cdca3925a5d22d7bc636bf8972aa341a470" [update] [update.modrinth] mod-id = "cu290YRp" -version = "YA4fWzHH" +version = "zdFClpyU" diff --git a/mods/terrestria.pw.toml b/mods/terrestria.pw.toml index 34837008..65fa7fca 100644 --- a/mods/terrestria.pw.toml +++ b/mods/terrestria.pw.toml @@ -1,13 +1,13 @@ name = "Terrestria" -filename = "terrestria-6.1.0.jar" +filename = "terrestria-6.0.13.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/lsUDPMOT/versions/4n8eEDLY/terrestria-6.1.0.jar" +url = "https://cdn.modrinth.com/data/lsUDPMOT/versions/3Q2d6Vf0/terrestria-6.0.13.jar" hash-format = "sha1" -hash = "ade986e698251ce05fccf7022a4aa266c181a7a2" +hash = "978f96d660f5aac44e8716ec7aa413c36e469349" [update] [update.modrinth] mod-id = "lsUDPMOT" -version = "4n8eEDLY" +version = "3Q2d6Vf0" diff --git a/mods/trinkets.pw.toml b/mods/trinkets.pw.toml index 846fb25a..c2b421b2 100644 --- a/mods/trinkets.pw.toml +++ b/mods/trinkets.pw.toml @@ -1,13 +1,13 @@ name = "Trinkets" -filename = "trinkets-3.8.0.jar" +filename = "trinkets-3.7.2.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/5aaWibi9/versions/tJ23Vcff/trinkets-3.8.0.jar" +url = "https://cdn.modrinth.com/data/5aaWibi9/versions/AHxQGtuC/trinkets-3.7.2.jar" hash-format = "sha1" -hash = "7b7c0c33f7090021670ee16863b88964913b5367" +hash = "d58cc8759587f03f320f188972ca66baa788d008" [update] [update.modrinth] mod-id = "5aaWibi9" -version = "tJ23Vcff" +version = "AHxQGtuC" diff --git a/mods/verticality.pw.toml b/mods/verticality.pw.toml index fc8767fb..efa473cd 100644 --- a/mods/verticality.pw.toml +++ b/mods/verticality.pw.toml @@ -1,13 +1,13 @@ name = "Verticality" -filename = "verticality-1.20-2.0.0.jar" +filename = "verticality-4.1.3-fabric1.20.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/6wqzLv3V/versions/VWfKaaAY/verticality-1.20-2.0.0.jar" +url = "https://cdn.modrinth.com/data/6wqzLv3V/versions/dsBZi6gT/verticality-4.1.3-fabric1.20.jar" hash-format = "sha1" -hash = "feaa4bb71143592d0b54634d091e0977807812ac" +hash = "d0598104805b815dd50252c9743f2d09b58088de" [update] [update.modrinth] mod-id = "6wqzLv3V" -version = "VWfKaaAY" +version = "dsBZi6gT" diff --git a/mods/xl-packets-fabric.pw.toml b/mods/xl-packets-fabric.pw.toml index 0e0ab308..fbdafeb5 100644 --- a/mods/xl-packets-fabric.pw.toml +++ b/mods/xl-packets-fabric.pw.toml @@ -1,13 +1,13 @@ name = "XL Packets Fabric" -filename = "xlpackets-3.1-1.18.2.jar" +filename = "xlpackets-1.19.2-4.jar" side = "both" [download] hash-format = "sha1" -hash = "fd39c0eaf390f4b299b668e6fb3ad59696c2ed49" +hash = "e33a6924c023c063ece7beece2ccc05cecae384a" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4110443 +file-id = 4110462 project-id = 390168 diff --git a/pack.toml b/pack.toml index 5ff7f319..136af4d8 100644 --- a/pack.toml +++ b/pack.toml @@ -1,13 +1,13 @@ name = "Cabricality" author = "DM Earth" -version = "1.0-alpha.1" +version = "1.0.0-alpha.1" pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "cfde23c6bcbec7e43abf7860aead0210ede01b7a53f04d19f1421cdda09eab96" +hash = "05955a143dac6c20fe985de800e0042946c5f862c79affc6b77904d10d44ea91" [versions] -minecraft = "1.20.2" -quilt = "0.21.0-beta.5" +fabric = "0.16.0" +minecraft = "1.20.1" diff --git a/packwiz.exe b/packwiz.exe deleted file mode 100644 index 69155e5e..00000000 Binary files a/packwiz.exe and /dev/null differ diff --git a/settings.gradle.kts b/settings.gradle.kts index 67bf600c..87e5cb0b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,13 +4,10 @@ pluginManagement { name = "Quilt" url = uri("https://maven.quiltmc.org/repository/release") } - - // Currently needed for Intermediary and other temporary dependencies maven { name = "Fabric" url = uri("https://maven.fabricmc.net/") } - gradlePluginPortal() } } diff --git a/src/main/java/dm/earth/cabricality/config/CabfConfig.java b/src/main/java/dm/earth/cabricality/config/CabfConfig.java index d893048a..b256389c 100644 --- a/src/main/java/dm/earth/cabricality/config/CabfConfig.java +++ b/src/main/java/dm/earth/cabricality/config/CabfConfig.java @@ -1,56 +1,53 @@ package dm.earth.cabricality.config; -import net.fabricmc.loader.api.FabricLoader; -import net.krlite.pierced.annotation.Silent; -import net.krlite.pierced.annotation.Table; -import net.krlite.pierced.config.Pierced; +import dm.earth.cabricality.Cabricality; +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.Config; +import me.shedaniel.autoconfig.annotation.ConfigEntry; -import java.io.File; - -public class CabfConfig extends Pierced { - private static @Silent final File FILE = FabricLoader.getInstance().getConfigDir().resolve("cabricality.toml").toFile(); - private static @Silent final CabfConfig INSTANCE = new CabfConfig(); - - private CabfConfig() { - super(CabfConfig.class, FILE); - load(); - } +@Config(name = Cabricality.ID) +public class CabfConfig implements ConfigData { public static void override() { - INSTANCE.save(); + AutoConfig.getConfigHolder(CabfConfig.class).save(); } private boolean includeVersionInWindowTitle = false; public static boolean includeVersionInWindowTitle() { - return INSTANCE.includeVersionInWindowTitle; + return CabfConfig.getConfig().includeVersionInWindowTitle; } public static void includeVersionInWindowTitle(boolean includeVersionInGameTitle) { - INSTANCE.includeVersionInWindowTitle = includeVersionInGameTitle; - INSTANCE.save(); + CabfConfig.getConfig().includeVersionInWindowTitle = includeVersionInGameTitle; + CabfConfig.override(); + } + + public static CabfConfig getConfig() { + return AutoConfig.getConfigHolder(CabfConfig.class).getConfig(); } private boolean fadeScreenBackground = true; public static boolean fadeScreenBackground() { - return INSTANCE.fadeScreenBackground; + return CabfConfig.getConfig().fadeScreenBackground; } public static void fadeScreenBackground(boolean fadeScreenBackground) { - INSTANCE.fadeScreenBackground = fadeScreenBackground; - INSTANCE.save(); + CabfConfig.getConfig().fadeScreenBackground = fadeScreenBackground; + CabfConfig.override(); } - @Table("debug") + @ConfigEntry.Category("debug") private boolean debugInfo = false; public static boolean debugInfo() { - return INSTANCE.debugInfo; + return CabfConfig.getConfig().debugInfo; } public static void debugInfo(boolean debugInfo) { - INSTANCE.debugInfo = debugInfo; - INSTANCE.save(); + CabfConfig.getConfig().debugInfo = debugInfo; + CabfConfig.override(); } } diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/AndesiteThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/AndesiteThread.java index 9b9cafa1..a179a77f 100644 --- a/src/main/java/dm/earth/cabricality/content/core/threads/AndesiteThread.java +++ b/src/main/java/dm/earth/cabricality/content/core/threads/AndesiteThread.java @@ -29,7 +29,6 @@ import static dm.earth.cabricality.Mod.Entry.AD_ASTRA; import static dm.earth.cabricality.Mod.Entry.AE2; -import static dm.earth.cabricality.Mod.Entry.AP; import static dm.earth.cabricality.Mod.Entry.CABF; import static dm.earth.cabricality.Mod.Entry.CREATE; import static dm.earth.cabricality.Mod.Entry.INDREV; @@ -48,72 +47,6 @@ public String getLevel() { @Override public void addRecipes(RecipeLoadingEvents.AddRecipesCallback.@NotNull RecipeHandler handler) { - handler.register( - recipeId("smelting", "algal_blend"), - id -> VanillaRecipeBuilders.smeltingRecipe( - id, "", - Ingredient.ofItems(AP.asItem("algal_blend")), - CookingCategory.MISC, - AP.asItem("algal_brick").getDefaultStack(), - 0, 120) - - ); - - handler.register( - recipeId("crafting", "algal_blend"), - id -> VanillaRecipeBuilders - .shapedRecipe("SS", "AA") - .ingredient('A', Items.CLAY_BALL) - .ingredient('S', Items.KELP, Items.SEAGRASS) - .output(AP.asStack(2, "algal_blend")) - .build(id, "") - ); - - handler.register( - recipeId("crafting", "algal_blend_2"), - id -> VanillaRecipeBuilders - .shapedRecipe("AA", "SS") - .ingredient('A', Items.CLAY_BALL) - .ingredient('S', Items.KELP, Items.SEAGRASS) - .output(AP.asStack(2, "algal_blend")) - .build(id, "") - ); - - handler.register( - recipeId("crafting", "andesite_alloy"), - id -> VanillaRecipeBuilders - .shapedRecipe("SS", "AA") - .ingredient('A', Items.ANDESITE) - .ingredient('S', AP.asItem("algal_brick")) - .output(CREATE.asStack(2, "andesite_alloy")) - .build(id, "") - ); - - handler.register( - recipeId("crafting", "andesite_alloy_2"), - id -> VanillaRecipeBuilders - .shapedRecipe("AA", "SS") - .ingredient('A', Items.ANDESITE) - .ingredient('S', AP.asItem("algal_brick")) - .output(CREATE.asStack(2, "andesite_alloy")) - .build(id, "") - ); - - handler.register( - recipeId("mixing", "algal_blend"), - id -> new MixingRecipe(new FreePRP(id) - .setIngredient(Ingredient.ofItems(Items.CLAY_BALL), Ingredient.ofItems(Items.KELP, Items.SEAGRASS)) - .setResult(new ProcessingOutput(new ItemStack(AP.asItem("algal_blend")), 2)) - ) - ); - - handler.register( - recipeId("mixing", "andesite_alloy"), - id -> new MixingRecipe(new FreePRP(id) - .setIngredient(Ingredient.ofItems(AP.asItem("algal_brick")), Ingredient.ofItems(Items.ANDESITE)) - .setResult(new ProcessingOutput(new ItemStack(CREATE.asItem("andesite_alloy")), 2)) - ) - ); handler.register( recipeId("crafting", "kinetic_mechanism"), @@ -185,11 +118,7 @@ public void removeRecipes(RecipeLoadingEvents.RemoveRecipesCallback.@NotNull Rec handler.remove(CREATE.id("mixing", "andesite_alloy")); handler.remove(CREATE.id("mixing", "andesite_alloy_from_zinc")); - handler.removeIf(p -> - p instanceof AbstractCookingRecipe - && AP.predicateOutput(handler, false, "algal_brick").test(p)); handler.removeIf(INDREV.predicateOutput(handler, false, "iron_drill_head")); - handler.remove(AP.id("algal_blend_shapeless")); } @Override diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/FluixThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/FluixThread.java index 51a9b5b8..de022f09 100644 --- a/src/main/java/dm/earth/cabricality/content/core/threads/FluixThread.java +++ b/src/main/java/dm/earth/cabricality/content/core/threads/FluixThread.java @@ -11,7 +11,7 @@ import com.simibubi.create.content.kinetics.crusher.CrushingRecipe; import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe; import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe; -import com.simibubi.create.content.kinetics.fan.SplashingRecipe; +import com.simibubi.create.content.kinetics.fan.processing.SplashingRecipe; import com.simibubi.create.content.kinetics.mixer.CompactingRecipe; import com.simibubi.create.content.kinetics.mixer.MixingRecipe; import com.simibubi.create.content.processing.recipe.HeatCondition; diff --git a/src/main/java/dm/earth/cabricality/content/core/threads/InvarThread.java b/src/main/java/dm/earth/cabricality/content/core/threads/InvarThread.java index afc6ad9b..fafd7844 100644 --- a/src/main/java/dm/earth/cabricality/content/core/threads/InvarThread.java +++ b/src/main/java/dm/earth/cabricality/content/core/threads/InvarThread.java @@ -4,12 +4,10 @@ import dm.earth.cabricality.content.core.items.ColoredFernItem; import dm.earth.cabricality.lib.resource.data.core.FreePRP; import dm.earth.cabricality.tweak.base.MechAndSmithCraft; -import com.nhoryzon.mc.farmersdelight.recipe.CuttingBoardRecipe; -import com.nhoryzon.mc.farmersdelight.recipe.ingredient.ChanceResult; import com.simibubi.create.content.kinetics.crusher.CrushingRecipe; import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe; import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe; -import com.simibubi.create.content.kinetics.fan.HauntingRecipe; +import com.simibubi.create.content.kinetics.fan.processing.HauntingRecipe; import com.simibubi.create.content.kinetics.millstone.MillingRecipe; import com.simibubi.create.content.kinetics.mixer.CompactingRecipe; import com.simibubi.create.content.kinetics.press.PressingRecipe; @@ -28,6 +26,8 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import vectorwing.farmersdelight.common.crafting.CuttingBoardRecipe; +import vectorwing.farmersdelight.common.crafting.ingredient.ChanceResult; import java.util.List; diff --git a/src/main/java/dm/earth/cabricality/content/trading/Professions.java b/src/main/java/dm/earth/cabricality/content/trading/Professions.java index 8e0cc81c..96a06f18 100644 --- a/src/main/java/dm/earth/cabricality/content/trading/Professions.java +++ b/src/main/java/dm/earth/cabricality/content/trading/Professions.java @@ -1,6 +1,5 @@ package dm.earth.cabricality.content.trading; -import static dm.earth.cabricality.Mod.Entry.AP; import static dm.earth.cabricality.Mod.Entry.CABF; import static dm.earth.cabricality.Mod.Entry.CREATE; import static dm.earth.cabricality.Mod.Entry.FARMERS_DELIGHT; @@ -103,16 +102,7 @@ public enum Professions { of(MC.id("diamond"), 1, GOLD, 1, 0x54ecd9), of(MC.id("coal"), 16, SILVER, 1, 0x252525), of(MC.id("redstone"), 24, SILVER, 1, 0xfc0d1b))), - MASONRY(Profession.of("masonry", 0xaf6250, of(AP.id("basalt_tiles"), 12, SILVER, 1, 0x747474), - of(AP.id("sunmetal_block"), 8, SILVER, 1, 0x613c3d), - of(AP.id("osseous_bricks"), 12, SILVER, 1, 0xe8e5d3), - of(AP.id("packed_ice_pillar"), 12, SILVER, 1, 0x7ea7f1), - of(AP.id("flint_tiles"), 12, SILVER, 1, 0x302d30), - of(AP.id("abyssaline_bricks"), 8, SILVER, 1, 0x534265), - of(AP.id("gilded_sandstone"), 8, SILVER, 1, 0xf8bc39), - of(AP.id("olivestone_bricks"), 12, SILVER, 1, 0x51523e), - of(AP.id("algal_bricks"), 12, SILVER, 1, 0x38423b), - of(AP.id("myonite_bricks"), 12, SILVER, 1, 0x867967), + MASONRY(Profession.of("masonry", 0xaf6250, // Create of(CREATE.id("ornate_iron_window"), 8, SILVER, 1, 0x7f786f), // Tconstruct diff --git a/src/main/java/dm/earth/cabricality/lib/util/CobbleGenUtil.java b/src/main/java/dm/earth/cabricality/lib/util/CobbleGenUtil.java index 93e6dd6b..d8f5db1d 100644 --- a/src/main/java/dm/earth/cabricality/lib/util/CobbleGenUtil.java +++ b/src/main/java/dm/earth/cabricality/lib/util/CobbleGenUtil.java @@ -1,6 +1,5 @@ package dm.earth.cabricality.lib.util; -import static dm.earth.cabricality.Mod.Entry.AP; import static dm.earth.cabricality.Mod.Entry.CREATE; import java.util.Map; @@ -14,16 +13,13 @@ import net.minecraft.world.WorldAccess; public class CobbleGenUtil { - // TODO: Waiting for Architect's Palette - private static final Map COBBLE_GEN_BLOCK_MAP = Map.of(Blocks.PACKED_ICE, Blocks.ANDESITE, - AP.asBlock("polished_packed_ice"), Blocks.GRANITE, AP.asBlock("chiseled_packed_ice"), Blocks.DIORITE, - AP.asBlock("packed_ice_pillar"), CREATE.asBlock("limestone")); + private static final Map COBBLE_GEN_BLOCK_MAP = Map.of(Blocks.PACKED_ICE, Blocks.ANDESITE); public static BlockState getBlock(WorldAccess world, BlockPos pos) { BlockState upState = world.getBlockState(pos.offset(Direction.UP)); return COBBLE_GEN_BLOCK_MAP.containsKey(upState.getBlock()) ? COBBLE_GEN_BLOCK_MAP.get(upState.getBlock()).getDefaultState() : COBBLE_GEN_BLOCK_MAP.values().stream().toList() - .get((new Random()).nextInt(CobbleGenUtil.COBBLE_GEN_BLOCK_MAP.size())).getDefaultState(); + .get((new Random()).nextInt(CobbleGenUtil.COBBLE_GEN_BLOCK_MAP.size())).getDefaultState(); } } diff --git a/src/main/java/dm/earth/cabricality/listener/DeployerCuttingRecipeHandler.java b/src/main/java/dm/earth/cabricality/listener/DeployerCuttingRecipeHandler.java index 46ba751f..d65fc2fb 100644 --- a/src/main/java/dm/earth/cabricality/listener/DeployerCuttingRecipeHandler.java +++ b/src/main/java/dm/earth/cabricality/listener/DeployerCuttingRecipeHandler.java @@ -2,14 +2,14 @@ import dm.earth.cabricality.Cabricality; import dm.earth.cabricality.lib.resource.data.core.FreePRP; -import com.nhoryzon.mc.farmersdelight.recipe.CuttingBoardRecipe; -import com.nhoryzon.mc.farmersdelight.recipe.ingredient.ChanceResult; import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe; import com.simibubi.create.content.processing.recipe.ProcessingOutput; import ho.artisan.lib.recipe.api.RecipeLoadingEvents; import ho.artisan.lib.recipe.api.RecipeManagerHelper; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import vectorwing.farmersdelight.common.crafting.CuttingBoardRecipe; +import vectorwing.farmersdelight.common.crafting.ingredient.ChanceResult; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/dm/earth/cabricality/mixin/WrenchItemMixin.java b/src/main/java/dm/earth/cabricality/mixin/WrenchItemMixin.java index fa524472..11547848 100644 --- a/src/main/java/dm/earth/cabricality/mixin/WrenchItemMixin.java +++ b/src/main/java/dm/earth/cabricality/mixin/WrenchItemMixin.java @@ -1,7 +1,7 @@ package dm.earth.cabricality.mixin; import com.simibubi.create.content.equipment.wrench.WrenchItem; -import earth.terrarium.ad_astra.common.block.Wrenchable; +import earth.terrarium.adastra.common.blocks.base.Wrenchable; import io.github.coolmineman.bitsandchisels.BitsAndChisels; import io.github.coolmineman.bitsandchisels.BitsBlockEntity; import net.minecraft.block.BlockState; @@ -29,7 +29,7 @@ private void useOnBlock(ItemUsageContext context, CallbackInfoReturnable flat.new Oval() .offset(offset) - .radians(radians) + .arc(arc) .mode(Flat.Oval.OvalMode.FILL_GRADIANT_OUT) .mixMode(ColorStandard.MixMode.PIGMENT) .addColor(0, Palette.TRANSPARENT) - .addColor(radians, Cabricality.Colors.OLD_CABF_MID_PURPLE) + .addColor(arc, Cabricality.Colors.OLD_CABF_MID_PURPLE) .opacityMultiplier(opacityMultiplier * (1 - Theory.clamp(complete, 0, 1))) ); } diff --git a/src/main/java/dm/earth/cabricality/mixin/client/ftbquests/ViewQuestPanelAnimator.java b/src/main/java/dm/earth/cabricality/mixin/client/ftbquests/ViewQuestPanelAnimator.java index cb5daa84..17d0eb28 100644 --- a/src/main/java/dm/earth/cabricality/mixin/client/ftbquests/ViewQuestPanelAnimator.java +++ b/src/main/java/dm/earth/cabricality/mixin/client/ftbquests/ViewQuestPanelAnimator.java @@ -140,9 +140,9 @@ private void drawQuestPanelBackground(GuiGraphics graphics, Theme theme, int x, Box.fromCartesian(x, y, w, h).render(graphics, flat -> flat.new Rectangle() - .colorTop(Cabricality.Colors.OLD_CABF_PURPLE) - .colorBottom(Cabricality.Colors.OLD_CABF_MID_PURPLE) - .new Outlined(Vector.fromCartesian(240 * lerp, 240 * lerp), + .colorTop(Cabricality.Colors.OLD_CABF_PURPLE) + .colorBottom(Cabricality.Colors.OLD_CABF_MID_PURPLE) + .new Outlined(Vector.fromCartesian(240 * lerp, 240 * lerp), Flat.Rectangle.Outlined.OutliningMode.NORMAL, Flat.Rectangle.Outlined.OutliningStyle.EDGE_FADED) ); @@ -156,17 +156,19 @@ private void drawQuestPanelBackground(GuiGraphics graphics, Theme theme, int x, ordinal = 0 ) ) - private void drawQuestPanelBackgroundTexture(Icon icon, GuiGraphics guiGraphics, int xy,int y, int w, int h) {} + private void drawQuestPanelBackgroundTexture(Icon icon, GuiGraphics guiGraphics, int xy, int y, int w, int h) { + } @Redirect( method = "drawBackground", at = @At( value = "INVOKE", - target = "Ldev/ftb/mods/ftblibrary/icon/Color4I;draw(Lnet/minecraft/client/gui/GuiGraphics;IIII)V", + target = "Ldev/ftb/mods/ftblibrary/icon/Icon;draw(Lnet/minecraft/client/gui/GuiGraphics;IIII)V", ordinal = 1 ) ) - private void drawQuestPanelBorder(Color4I color4I, GuiGraphics graphics, int x, int y, int w, int h) {} + private void drawQuestPanelBorder(Icon icon, GuiGraphics graphics, int x, int y, int w, int h) { + } @Redirect( method = "addWidgets", @@ -179,7 +181,8 @@ private void drawQuestPanelBorder(Color4I color4I, GuiGraphics graphics, int x, to = @At(value = "INVOKE", target = "Ldev/ftb/mods/ftbquests/client/gui/quests/ViewQuestPanel;setPos(II)V") ), remap = false ) - private void drawBorder(BlankPanel panel, Widget widget) {} + private void drawBorder(BlankPanel panel, Widget widget) { + } @Redirect( method = "tick", @@ -194,10 +197,10 @@ private Icon tintLeftArrow(Icon icon, Color4I color4I) { if (MinecraftClient.getInstance().world != null) time = MinecraftClient.getInstance().world.getTime(); Color4I color = ThemeProperties.QUEST_VIEW_TITLE.get() - .withAlphaf((float) sinusoidal( - (Math.abs(time % 40 - 20) - 6) / 8.0, - 0.03, 0.97) - ); + .withAlphaf((float) sinusoidal( + (Math.abs(time % 40 - 20) - 6) / 8.0, + 0.03, 0.97) + ); return icon.withColor(color); } diff --git a/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/ChanceResultMixin.java b/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/ChanceResultMixin.java index a51559c0..bd98258d 100644 --- a/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/ChanceResultMixin.java +++ b/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/ChanceResultMixin.java @@ -1,11 +1,11 @@ package dm.earth.cabricality.mixin.recipe.farmersdelight; import dm.earth.cabricality.lib.resource.data.recipe.ProcessItemOutputCallback; -import com.nhoryzon.mc.farmersdelight.recipe.ingredient.ChanceResult; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; +import vectorwing.farmersdelight.common.crafting.ingredient.ChanceResult; @Mixin(ChanceResult.class) public class ChanceResultMixin { diff --git a/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/CuttingBoardRecipeMixin.java b/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/CuttingBoardRecipeMixin.java index b6f2365e..788f6b89 100644 --- a/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/CuttingBoardRecipeMixin.java +++ b/src/main/java/dm/earth/cabricality/mixin/recipe/farmersdelight/CuttingBoardRecipeMixin.java @@ -7,21 +7,20 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.nhoryzon.mc.farmersdelight.recipe.CuttingBoardRecipe; -import com.nhoryzon.mc.farmersdelight.recipe.ingredient.ChanceResult; - import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; +import vectorwing.farmersdelight.common.crafting.CuttingBoardRecipe; +import vectorwing.farmersdelight.common.crafting.ingredient.ChanceResult; @Mixin(CuttingBoardRecipe.class) public class CuttingBoardRecipeMixin { @Shadow @Final - private DefaultedList resultList; + private DefaultedList results; @Inject(method = "getResult", at = @At("HEAD"), cancellable = true) private void getOutput(CallbackInfoReturnable cir) { - if (this.resultList.isEmpty()) + if (this.results.isEmpty()) cir.setReturnValue(ItemStack.EMPTY); } } diff --git a/src/main/java/dm/earth/cabricality/tweak/cutting/WoodCuttingEntry.java b/src/main/java/dm/earth/cabricality/tweak/cutting/WoodCuttingEntry.java index 0dfaae00..76f41e69 100644 --- a/src/main/java/dm/earth/cabricality/tweak/cutting/WoodCuttingEntry.java +++ b/src/main/java/dm/earth/cabricality/tweak/cutting/WoodCuttingEntry.java @@ -5,7 +5,6 @@ import org.jetbrains.annotations.Nullable; import static dm.earth.cabricality.Mod.Entry.AD_ASTRA; -import static dm.earth.cabricality.Mod.Entry.AP; import static dm.earth.cabricality.Mod.Entry.MC; import static dm.earth.cabricality.Mod.Entry.PROMENADE; import static dm.earth.cabricality.Mod.Entry.TC; @@ -127,13 +126,6 @@ public enum WoodCuttingEntry { null, null ), - TWISTED( - AP.id("twisted"), - "twisted_planks", "twisted_slab", - "twisted_log", "stripped_twisted_log", - "twisted_wood", "stripped_twisted_wood" - ), - RAINBOW_EUCALYPTUS( TERRESTRIA.id("rainbow_eucalyptus"), "rainbow_eucalyptus_planks", "rainbow_eucalyptus_slab", diff --git a/src/main/java/dm/earth/cabricality/tweak/ore_processing/OreProcessingTweaks.java b/src/main/java/dm/earth/cabricality/tweak/ore_processing/OreProcessingTweaks.java index 02f04f00..850dce10 100644 --- a/src/main/java/dm/earth/cabricality/tweak/ore_processing/OreProcessingTweaks.java +++ b/src/main/java/dm/earth/cabricality/tweak/ore_processing/OreProcessingTweaks.java @@ -6,7 +6,7 @@ import dm.earth.cabricality.mixin.StackEntryAccessor; import dm.earth.cabricality.mixin.TagEntryAccessor; import com.simibubi.create.content.kinetics.crusher.CrushingRecipe; -import com.simibubi.create.content.kinetics.fan.SplashingRecipe; +import com.simibubi.create.content.kinetics.fan.processing.SplashingRecipe; import com.simibubi.create.content.kinetics.millstone.MillingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingOutput; import ho.artisan.lib.recipe.api.RecipeLoadingEvents; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e145e55e..a24248a3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -52,8 +52,7 @@ "fabric-key-binding-api-v1": "*", "minecraft": "1.20.1", "cloth-config": "*", + "nightautoconfig": "*", "equator": ">=2.6.0" - }, - "suggests": { } } diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json deleted file mode 100644 index 8bfd1410..00000000 --- a/src/main/resources/quilt.mod.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "dm.earth", - "id": "cabricality", - "provides": [ - { - "id": "kubejs", - "version": "2001.6.3" - } - ], - "version": "${modpack_version}", - "metadata": { - "name": "Cabricality", - "description": "A Create centered challengeable mod inspired by Create: Above and Beyond.", - "contributors": { - "DM Earth": "Owner" - }, - "contact": { - "source": "https://github.com/DM-Earth/Cabricality" - }, - "license": "GPL-3.0" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": "dm.earth.cabricality.Cabricality", - "pre_launch": "dm.earth.cabricality.CabricalityPreInit", - "client_init": "dm.earth.cabricality.client.CabricalityClient", - "server_init": "dm.earth.cabricality.server.CabricalityServer", - "client_events": [ - "dm.earth.cabricality.client.listener.ClientCommandRegistryListener" - ], - "events": [ - "dm.earth.cabricality.listener.CommandRegistryListener", - "dm.earth.cabricality.tweak.RecipeTweaks", - "dm.earth.cabricality.content.trading.data.recipe.Trading" - ], - "rei_client": "dm.earth.cabricality.client.plugin.rei.CabfREIClientPlugin", - "modmenu": "dm.earth.cabricality.config.modmenu.CabfModMenuImpl" - }, - "depends": [ - { - "id": "quilt_loader", - "versions": "*" - }, - { - "id": "minecraft", - "versions": ">=1.20.2-" - }, - { - "id": "quilted_fabric_api", - "versions": ">=1.0.0-" - }, - { - "id": "fabric-key-binding-api-v1", - "versions": "*" - }, - { - "id": "equator", - "versions": ">=2.6.0" - } - ] - }, - "mixin": "cabricality.mixins.json" -}