Skip to content

Commit

Permalink
Some cleanup & Fix building
Browse files Browse the repository at this point in the history
  • Loading branch information
Asek3 committed Sep 5, 2023
1 parent bb4c510 commit 71fdbf0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 59 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 17 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ plugins {
}

loom {
silentMojangMappingsLicense()
silentMojangMappingsLicense()

forge {
mixinConfigs = [
"mixins.oculus.json",
Expand All @@ -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')
}
Expand All @@ -51,16 +57,16 @@ processResources {
inputs.property "version", project.version

filesMatching("META-INF/mods.toml") {
expand "version": project.version
}
expand "version": project.version
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"

def targetVersion = 8
if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion
it.options.release = targetVersion
}
}

Expand Down
Binary file added libs/antlr4-runtime-4.10.1.jar
Binary file not shown.
Binary file added libs/glsl-transformer-1.0.0-pre21.2.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/java/net/coderbot/iris/Iris.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

This file was deleted.

0 comments on commit 71fdbf0

Please sign in to comment.