diff options
| -rw-r--r-- | build.gradle.kts | 2 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 4 | ||||
| -rw-r--r-- | src/compat/iris/java/moe/nea/firmament/compat/iris/Compat.kt | 12 | ||||
| -rw-r--r-- | src/compat/iris/java/moe/nea/firmament/compat/iris/IrisPipelineAssigner.kt | 19 | ||||
| -rw-r--r-- | translations/en_us.json | 4 |
5 files changed, 39 insertions, 2 deletions
diff --git a/build.gradle.kts b/build.gradle.kts index 3d7a2a6..160f0e6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -203,6 +203,7 @@ val jadeSourceSet = createIsolatedSourceSet("jade") val modmenuSourceSet = createIsolatedSourceSet("modmenu") val reiSourceSet = createIsolatedSourceSet("rei") val moulconfigSourceSet = createIsolatedSourceSet("moulconfig") +val irisSourceSet = createIsolatedSourceSet("iris") val customTexturesSourceSet = createIsolatedSourceSet("texturePacks", "texturePacks") dependencies { @@ -242,6 +243,7 @@ dependencies { modCompileOnly(libs.jarvis.api) include(libs.jarvis.fabric) + (irisSourceSet.modImplementationConfigurationName)(libs.iris) (wildfireGenderSourceSet.modImplementationConfigurationName)(libs.femalegender) (wildfireGenderSourceSet.implementationConfigurationName)(customTexturesSourceSet.output) (sodiumSourceSet.modImplementationConfigurationName)(libs.sodium) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 554333e..dde6594 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,6 +40,9 @@ ncr = "Fabric-1.21.7-v2.14.0" # Update from https://modrinth.com/mod/female-gender/versions?l=fabric femalegender = "4.3.4+1.21.7" +# Update from https://modrinth.com/mod/iris/versions?l=fabric +iris = "1.9.6+1.21.8-fabric" + shadow = "8.3.8" @@ -127,6 +130,7 @@ ncr = { module = "maven.modrinth:no-chat-reports", version.ref = "ncr" } sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" } freecammod = { module = "maven.modrinth:freecam", version.ref = "freecammod" } femalegender = { module = "maven.modrinth:female-gender", version.ref = "femalegender" } +iris = { module = "maven.modrinth:iris", version.ref = "iris" } jade = { module = "maven.modrinth:jade", version.ref = "jade" } yacl = { module = "dev.isxander:yet-another-config-lib", version.ref = "yacl" } basicMath = { module = "me.shedaniel.cloth:basic-math", version.ref = "basicMath" } diff --git a/src/compat/iris/java/moe/nea/firmament/compat/iris/Compat.kt b/src/compat/iris/java/moe/nea/firmament/compat/iris/Compat.kt new file mode 100644 index 0000000..6d04842 --- /dev/null +++ b/src/compat/iris/java/moe/nea/firmament/compat/iris/Compat.kt @@ -0,0 +1,12 @@ +package moe.nea.firmament.compat.iris + +import net.fabricmc.loader.api.FabricLoader +import moe.nea.firmament.util.compatloader.CompatMeta +import moe.nea.firmament.util.compatloader.ICompatMeta + +@CompatMeta +object Compat : ICompatMeta { + override fun shouldLoad(): Boolean { + return FabricLoader.getInstance().isModLoaded("iris") + } +} diff --git a/src/compat/iris/java/moe/nea/firmament/compat/iris/IrisPipelineAssigner.kt b/src/compat/iris/java/moe/nea/firmament/compat/iris/IrisPipelineAssigner.kt new file mode 100644 index 0000000..b7b3e42 --- /dev/null +++ b/src/compat/iris/java/moe/nea/firmament/compat/iris/IrisPipelineAssigner.kt @@ -0,0 +1,19 @@ +package moe.nea.firmament.compat.iris + +import net.irisshaders.iris.api.v0.IrisApi +import net.irisshaders.iris.api.v0.IrisProgram +import util.render.CustomRenderPipelines +import moe.nea.firmament.annotations.Subscribe +import moe.nea.firmament.events.ClientInitEvent + +object IrisPipelineAssigner { + @Subscribe + fun initIrisAssignments(event: ClientInitEvent) { + val api = IrisApi.getInstance() + api.assignPipeline(CustomRenderPipelines.GUI_TEXTURED_NO_DEPTH_TRIS, IrisProgram.TEXTURED) + api.assignPipeline(CustomRenderPipelines.OMNIPRESENT_LINES, IrisProgram.LINES) + api.assignPipeline(CustomRenderPipelines.COLORED_OMNIPRESENT_QUADS, IrisProgram.BASIC) + api.assignPipeline(CustomRenderPipelines.CIRCLE_FILTER_TRANSLUCENT_GUI_TRIS, IrisProgram.TEXTURED) + api.assignPipeline(CustomRenderPipelines.PARALLAX_CAPE_SHADER, IrisProgram.ENTITIES) + } +} diff --git a/translations/en_us.json b/translations/en_us.json index 02f6943..97d6553 100644 --- a/translations/en_us.json +++ b/translations/en_us.json @@ -254,14 +254,14 @@ "firmament.config.pets.pet-overlay-hud.description": "A HUD showing current active pet and the pet exp.", "firmament.config.pets.pet-overlay.description": "Shows current active pet and pet exp on screen.", "firmament.config.pickaxe-info": "Pickaxes & Drills", + "firmament.config.pickaxe-info.ability-colour": "Ability Cooldown Colour", + "firmament.config.pickaxe-info.ability-colour.description": "Color of the cooldown indicator around the cross-hair.", "firmament.config.pickaxe-info.ability-cooldown": "Pickaxe Ability Cooldown", "firmament.config.pickaxe-info.ability-cooldown-toast": "Pickaxe Ability Ready Toast", "firmament.config.pickaxe-info.ability-cooldown-toast.description": "Shows a toast when your pickaxe ability is ready.", "firmament.config.pickaxe-info.ability-cooldown.description": "Show a cooldown on your cross-hair for your pickaxe ability.", "firmament.config.pickaxe-info.ability-scale": "Ability Cooldown Scale", "firmament.config.pickaxe-info.ability-scale.description": "Resize the cooldown around your cross-hair for your pickaxe ability.", - "firmament.config.pickaxe-info.ability-colour": "Ability Cooldown Colour", - "firmament.config.pickaxe-info.ability-colour.description": "Color of the cooldown indicator around the cross-hair.", "firmament.config.pickaxe-info.block-on-dynamic": "Block on Private Island", "firmament.config.pickaxe-info.block-on-dynamic.choice.always": "Always Block", "firmament.config.pickaxe-info.block-on-dynamic.choice.never": "Never Block", |