merge with iris HEAD "1.6.13"

build.gradle

@@ -1,21 +1,22 @@
 plugins {
-	id 'dev.architectury.loom' version '0.11.0-SNAPSHOT'
+	id 'dev.architectury.loom' version '1.5.+'
 	id 'maven-publish'
 }
 
 loom {
-    silentMojangMappingsLicense()
-	
+	silentMojangMappingsLicense()
+
 	forge {
 		mixinConfigs = [
 				"mixins.oculus.json",
+				"mixins.oculus.compat.dh.json",
+				"mixins.oculus.compat.sodium.json",
 				"mixins.oculus.fantastic.json",
 				"mixins.oculus.vertexformat.json",
 				"mixins.oculus.bettermipmaps.json",
 				"mixins.oculus.fixes.maxfpscrash.json",
 				"mixins.oculus.optimized-stitching.json",
-				"oculus-batched-entity-rendering.mixins.json",
-				"mixins.oculus.compat.sodium.json"
+				"oculus-batched-entity-rendering.mixins.json"
 		]
 	}
 }
@@ -29,33 +30,38 @@ group = project.maven_group
 
 repositories {
 	maven {
-        name = "Modrinth"
-        url = "https://api.modrinth.com/maven"
-        content {
-            includeGroup "maven.modrinth"
-        }
-    }
+		name = "Modrinth"
+		url = "https://api.modrinth.com/maven"
+		content {
+			includeGroup "maven.modrinth"
+		}
+	}
+	mavenCentral()
 }
 
 configurations {
-    toJar
+	toJar
 }
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings loom.officialMojangMappings()
 	forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-
+
+	compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5"))
+	implementation(include("io.github.llamalad7:mixinextras-forge:0.3.5"))
+
 	compileOnly files("libs/apache-ant-1.8.2.jar")
-	modImplementation "maven.modrinth:rubidium:0.5.4"
+	modImplementation files("libs/DistantHorizons-forge-2.0.2-a-dev-1.18.2.jar")
+	modImplementation "maven.modrinth:embeddium:0.3.10+mc1.18.2"
 }
 
 processResources {
 	inputs.property "version", project.version
 
 	filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
+		expand "version": project.version
+	}
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -69,7 +75,7 @@ java {
 jar {
 	from { configurations.toJar.collect { it.isDirectory() ? it : zipTree(it) } }
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archivesBaseName}" }
 	}
 }
 

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx3G
 	mod_version = 1.5.2
 	maven_group = net.coderbot
 	archives_base_name = oculus
-
-	forge_version=40.1.85
 
-	loom.platform=forge
+	forge_version=40.2.17
+
+	loom.platform=forge

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright � 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions �$var�, �${var}�, �${var:-default}�, �${var+SET}�,
-#           �${var#prefix}�, �${var%suffix}�, and �$( cmd )�;
-#         * compound commands having a testable exit status, especially �case�;
-#         * various built-in commands including �command�, �set�, and �ulimit�.
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #