diff --git a/.gitignore b/.gitignore index 989e68785c..426cc7de36 100644 --- a/.gitignore +++ b/.gitignore @@ -28,8 +28,4 @@ bin/ *.DS_Store -# fabric - run/ -src/main/java/me/jellysquid/mods/sodium/client/model/light/flat/FlatLightPipeline.java -src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java diff --git a/build.gradle b/build.gradle index 6c4478a899..dbd9daee1e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ plugins { } loom { - silentMojangMappingsLicense() - + silentMojangMappingsLicense() + forge { mixinConfigs = [ "mixins.oculus.json", @@ -28,21 +28,27 @@ version = project.mod_version group = project.maven_group repositories { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + content { + includeGroup "maven.modrinth" + } + } } configurations { - toJar + toJar } dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings loom.officialMojangMappings() forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - compileOnly files("libs/apache-ant-1.8.2.jar") - compileOnly files("libs/rubidium-0.2.1-dev.jar") - compileOnly files("libs/flywheel-1.16-0.2.5.jar") - + + compileOnly "org.apache.ant:ant:1.8.2" + modCompileOnly "maven.modrinth:rubidium:0.2.12" + implementation fileTree(include: ['*.jar'], dir: 'libs') toJar fileTree(include: ['antlr4-runtime-4.10.1.jar', 'glsl-transformer-1.0.0-pre21.2.jar'], dir: 'libs') } @@ -51,8 +57,8 @@ processResources { inputs.property "version", project.version filesMatching("META-INF/mods.toml") { - expand "version": project.version - } + expand "version": project.version + } } tasks.withType(JavaCompile).configureEach { @@ -60,7 +66,7 @@ tasks.withType(JavaCompile).configureEach { def targetVersion = 8 if (JavaVersion.current().isJava9Compatible()) { - it.options.release = targetVersion + it.options.release = targetVersion } } diff --git a/libs/antlr4-runtime-4.10.1.jar b/libs/antlr4-runtime-4.10.1.jar new file mode 100644 index 0000000000..47f4f4ece2 Binary files /dev/null and b/libs/antlr4-runtime-4.10.1.jar differ diff --git a/libs/glsl-transformer-1.0.0-pre21.2.jar b/libs/glsl-transformer-1.0.0-pre21.2.jar new file mode 100644 index 0000000000..3d819b684c Binary files /dev/null and b/libs/glsl-transformer-1.0.0-pre21.2.jar differ diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java index ea25582d10..54bb6f70f1 100644 --- a/src/main/java/net/coderbot/iris/Iris.java +++ b/src/main/java/net/coderbot/iris/Iris.java @@ -124,7 +124,7 @@ public void onEarlyInitialize() { logger.warn("", e); } - irisConfig = new IrisConfig(FMLPaths.CONFIGDIR.get().resolve("oculus.properties")); + irisConfig = new IrisConfig(FMLPaths.CONFIGDIR.get().resolve(MODID + ".properties")); try { irisConfig.initialize(); diff --git a/src/main/java/net/coderbot/iris/compat/sodium/AllowedSodiumVersion.java b/src/main/java/net/coderbot/iris/compat/sodium/AllowedSodiumVersion.java deleted file mode 100644 index 2cfa8deb28..0000000000 --- a/src/main/java/net/coderbot/iris/compat/sodium/AllowedSodiumVersion.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.coderbot.iris.compat.sodium; - -import java.util.Optional; - -public class AllowedSodiumVersion { - private final String version; - private final String downloadLink; - private final boolean prefixMatch; - - public AllowedSodiumVersion(String version, String downloadLink, boolean prefixMatch) { - this.version = version; - this.downloadLink = downloadLink; - this.prefixMatch = prefixMatch; - } - - public static AllowedSodiumVersion prefix(String prefix) { - return new AllowedSodiumVersion(prefix, null, true); - } - - public static AllowedSodiumVersion exact(String version, String downloadLink) { - return new AllowedSodiumVersion(version, downloadLink, false); - } - - public boolean matches(String candidate) { - if (prefixMatch) { - return candidate.startsWith(version); - } else { - return candidate.equals(version); - } - } - - public String getVersion() { - return version; - } - - public boolean isPrefixMatch() { - return prefixMatch; - } - - public Optional getDownloadLink() { - return Optional.ofNullable(downloadLink); - } -}