diff --git a/Common/build.gradle b/Common/build.gradle index 9badadb..31dd384 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -24,7 +24,7 @@ minecraft { dependencies { compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' - compileOnly("me.hypherionmc.craterlib:CraterLib-common-1.19.1:${craterlib_version}") + compileOnly("me.hypherionmc.craterlib:CraterLib-common-${minecraft_version}:${craterlib_version}") compileOnly("com.lowdragmc.shimmer:Shimmer-common-1.19.1:${shimmer_version}") } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 39af117..3eea748 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -17,7 +17,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" implementation project(":Common") - modApi("me.hypherionmc.craterlib:CraterLib-fabric-1.19.1:${craterlib_version}") { + modApi("me.hypherionmc.craterlib:CraterLib-fabric-${minecraft_version}:${craterlib_version}") { exclude(group: "net.fabricmc.fabric-api") } @@ -26,11 +26,11 @@ dependencies { } // Sodium - modImplementation ("curse.maven:sodium-394468:${sodium_version}") { + /*modImplementation ("curse.maven:sodium-394468:${sodium_version}") { exclude(group: "net.fabricmc.fabric-api") } // This is a dependency of Sodium.... - implementation 'org.joml:joml:1.10.4' + implementation 'org.joml:joml:1.10.4'*/ // Shimmer modImplementation ("com.lowdragmc.shimmer:Shimmer-fabric-1.19.1:${shimmer_version}") { diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index c208b85..93d0d4f 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -36,7 +36,7 @@ "depends": { "fabricloader": ">=0.14", "fabric": "*", - "minecraft": "1.19.1", + "minecraft": "1.19.2", "java": ">=17", "craterlib": "*" }, diff --git a/Forge/build.gradle b/Forge/build.gradle index f308852..0b4a81f 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -83,7 +83,7 @@ dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" compileOnly project(":Common") annotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' - implementation fg.deobf("me.hypherionmc.craterlib:CraterLib-forge-1.19.1:${craterlib_version}") + implementation fg.deobf("me.hypherionmc.craterlib:CraterLib-forge-${minecraft_version}:${craterlib_version}") // Rubidium implementation fg.deobf("curse.maven:rubidium-574856:${ribidium_version}") diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 6082b18..025d338 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[42,)" +loaderVersion="[43,)" license="MIT" #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" @@ -19,20 +19,20 @@ Not your average Lighting & Decoration Mods [[dependencies.hyperlighting]] modId="forge" mandatory=true - versionRange="[42,)" + versionRange="[43,)" ordering="NONE" side="BOTH" [[dependencies.hyperlighting]] modId="minecraft" mandatory=true - versionRange="[1.19.1,1.20)" + versionRange="[1.19.2,1.20)" ordering="NONE" side="BOTH" [[dependencies.hyperlighting]] modId="craterlib" mandatory=true - versionRange="1.0.x" + versionRange="0.0.x" ordering="AFTER" side="BOTH" diff --git a/gradle.properties b/gradle.properties index 6346fa2..800d237 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,18 +5,18 @@ version_patch=1 group=me.hypherionmc.hyperlighting # Common -minecraft_version=1.19.1 +minecraft_version=1.19.2 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server # Forge -forge_version=42.0.1 +forge_version=43.1.25 //forge_ats_enabled=true # Fabric -fabric_version=0.58.5+1.19.1 -fabric_loader_version=0.14.8 +fabric_version=0.61.0+1.19.2 +fabric_loader_version=0.14.9 # Mod options mod_name=HyperLighting2 @@ -28,11 +28,11 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false #dependencies -craterlib_version=1.0.6d -mod_menu_version=4.0.5 -shimmer_version=0.1.11d -sodium_version=3820973 -ribidium_version=3864138 +craterlib_version=0.0.2d +mod_menu_version=4.0.6 +shimmer_version=0.1.12 +sodium_version=3957319 +ribidium_version=3973894 top_version=1.19-6.2.0-6 top_fabric=1.19-6.0.0 -wthitVersion=5.11.3 +wthitVersion=5.12.0