Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,16 @@

name: Java CI with Gradle

on: [push, pull_request]
on:
push:
pull_request:
workflow_dispatch:
inputs:
release_build:
description: "Build as release (-Dbuild.release=true)"
required: true
default: false
type: boolean

jobs:
build:
Expand All @@ -23,7 +32,12 @@ jobs:
gradle-version: current

- name: Build with Gradle
run: ./gradlew build
run: |
if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ "${{ inputs.release_build }}" = "true" ]; then
./gradlew :neoforge:build -Dbuild.release=true
else
./gradlew build
fi

- name: Upload built JAR
uses: actions/upload-artifact@v4
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/release-neoforge-manual.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Manual NeoForge Release

on:
workflow_dispatch:
inputs:
tag_name:
description: "Git tag to create/use (example: v1.8.12-ia3+1.21.1-neoforge)"
required: true
type: string
release_name:
description: "GitHub release title"
required: true
type: string
publish_mod_sites:
description: "Also publish to Modrinth/CurseForge via mc-publish secrets"
required: true
default: false
type: boolean

permissions:
contents: write

jobs:
build-and-release:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
cache-read-only: false

- name: Build release artifacts
run: ./gradlew :neoforge:build -Dbuild.release=true

- name: Upload workflow artifact
uses: actions/upload-artifact@v4
with:
name: neoforge-release-jars
path: build/libs/iris-neoforge-*.jar

- name: Create GitHub release
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ inputs.tag_name }}
name: ${{ inputs.release_name }}
generate_release_notes: true
files: build/libs/iris-neoforge-*.jar

- name: Publish to Modrinth/CurseForge
if: ${{ inputs.publish_mod_sites }}
uses: Kir-Antipov/mc-publish@v3.3
with:
modrinth-id: YL57xq9U
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
modrinth-featured: true
curseforge-id: 455508
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
files: build/libs/iris-neoforge-*.jar
version-type: release
loaders: neoforge
dependencies: sodium
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ val SODIUM_DEPENDENCY_NEO by extra { "maven.modrinth:sodium:I9RMZOOH"}
val PARCHMENT_VERSION by extra { null }

// https://semver.org/
val MOD_VERSION by extra { "1.8.8" }
val MOD_VERSION by extra { "1.8.12-ia3" }

allprojects {
apply(plugin = "java")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,6 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta)

if (!this.guiHidden) {
super.render(guiGraphics, mouseX, mouseY, delta);

if (optionMenuOpen && this.shaderOptionList != null) {
this.shaderOptionList.render(guiGraphics, mouseX, mouseY, delta);
} else {
this.shaderPackList.render(guiGraphics, mouseX, mouseY, delta);
}
} else {
this.renderBlurredBackground(delta);
this.showHideButton.render(guiGraphics, mouseX, mouseY, delta);
Expand Down Expand Up @@ -377,6 +371,14 @@ private void processFixedBlur(float tick) {

@Override
protected void renderBlurredBackground(float pScreen0) {
// NeoForge 1.21.1 modpacks can trigger a GUI composition bug where
// post-processing blur wipes this screen while in-world.
// Keep the menu readable by skipping Iris's custom blur pass only here.
if (this.minecraft.level != null) {
this.minecraft.getMainRenderTarget().bindWrite(false);
return;
}

processFixedBlur(pScreen0);
this.minecraft.getMainRenderTarget().bindWrite(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ public void recalculateSizes() {
public void renderAll() {
GLDebug.pushGroup(20 + compositePass.ordinal(), compositePass.name().toLowerCase(Locale.ROOT));
RenderSystem.disableBlend();
GlStateManager._colorMask(true, true, true, true);

FullScreenQuadRenderer.INSTANCE.begin();
com.mojang.blaze3d.pipeline.RenderTarget main = Minecraft.getInstance().getMainRenderTarget();
Expand Down