Motschen/Blur
1
0
Fork 0
mirror of https://github.com/Motschen/Blur.git synced 2025-12-16 11:45:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'plus-1.21.1' into backport/1.21.1

Browse Source
This commit is contained in:
Martin Prokoph
2025-07-15 17:46:05 +02:00
committed by GitHub
parent 7d207e8197 9d5b02bd0a
commit 0fd10408ca
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/eu/midnightdust/blur/Blur.java
View File

@@ -92,12 +92,13 @@ public class Blur {
float diagonal = Math.sqrt((float) width*width + height*height); float diagonal = Math.sqrt((float) width*width + height*height);
int smallestDimension = Math.min(width, height); int smallestDimension = Math.min(width, height);
context.getMatrices().pushMatrix(); context.getMatrices().push();
Matrix3x2f posMatrix = context.getMatrices(); Matrix4f posMatrix = context.getMatrices().peek().getPositionMatrix();
posMatrix.rotate(Math.toRadians(getRotation())); posMatrix.rotationZ(Math.toRadians(getRotation()));
posMatrix.setTranslation(width / 2f, height / 2f); // Make the gradient's center the pivot point posMatrix.setTranslation(width / 2f, height / 2f, -1000); // Make the gradient's center the pivot point
posMatrix.scale(diagonal / smallestDimension); // Scales the gradient to the maximum diagonal value needed posMatrix.scale(diagonal / smallestDimension); // Scales the gradient to the maximum diagonal value needed
context.fillGradient(-width / 2, -height / 2, width / 2, height / 2, Blur.getBackgroundColor(false), Blur.getBackgroundColor(true)); // Actually draw the gradient context.fillGradient(-width / 2, -height / 2, width / 2, height / 2, Blur.getBackgroundColor(false), Blur.getBackgroundColor(true)); // Actually draw the gradient
context.getMatrices().popMatrix(); posMatrix.rotationZ(0);
context.getMatrices().pop();
} }
} }

6
common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java
View File

@@ -28,12 +28,13 @@ public abstract class MixinScreen {
@Shadow public int height; @Shadow public int height;
@Shadow protected abstract void applyBlur(DrawContext context); @Shadow protected abstract void applyBlur(DrawContext context);
@Shadow protected abstract void applyBlur(float delta);
@Inject(at = @At("HEAD"), method = "render") @Inject(at = @At("HEAD"), method = "render")
public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
Blur.onRender(); Blur.onRender();
Blur.renderFadeout(context, width, height, client); Blur.renderFadeout(context, width, height, client);
} }
@Inject(at = @At("HEAD"), method = "applyBlur", cancellable = true) @Inject(at = @At("HEAD"), method = "applyBlur", cancellable = true)
public void blur$getBlurEnabled(CallbackInfo ci) { public void blur$getBlurEnabled(CallbackInfo ci) {
if (BlurConfig.forceDisabledScreens.contains(this.getClass().getCanonicalName())) { if (BlurConfig.forceDisabledScreens.contains(this.getClass().getCanonicalName())) {
@@ -42,7 +43,6 @@ public abstract class MixinScreen {
if (!BlurConfig.excludedScreens.contains(this.getClass().getCanonicalName())) if (!BlurConfig.excludedScreens.contains(this.getClass().getCanonicalName()))
BlurInfo.screenHasBlur = true; // Test if the screen has blur BlurInfo.screenHasBlur = true; // Test if the screen has blur
} }
@WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderBackgroundTexture(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/util/Identifier;IIFFII)V"), method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;IIII)V") @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderBackgroundTexture(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/util/Identifier;IIFFII)V"), method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;IIII)V")
private void blur$applyGradient(DrawContext context, Identifier texture, int x, int y, float u, float v, int width, int height, Operation<Void> original) { private void blur$applyGradient(DrawContext context, Identifier texture, int x, int y, float u, float v, int width, int height, Operation<Void> original) {
if (BlurConfig.useGradient) { if (BlurConfig.useGradient) {
@@ -58,7 +58,7 @@ public abstract class MixinScreen {
private void blur$renderGradient(DrawContext context) { private void blur$renderGradient(DrawContext context) {
BlurInfo.screenHasBackground = true; // Test if the screen has a background BlurInfo.screenHasBackground = true; // Test if the screen has a background
if (BlurConfig.forceEnabledScreens.contains(this.getClass().getCanonicalName())) if (BlurConfig.forceEnabledScreens.contains(this.getClass().getCanonicalName()))
this.applyBlur(context); this.applyBlur(client.getRenderTickCounter().getTickDelta(true));
Blur.renderRotatedGradient(context, width, height); // Replaces the default gradient with our rotated one Blur.renderRotatedGradient(context, width, height); // Replaces the default gradient with our rotated one
} }

16
gradle.properties
View File

@@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
org.gradle.parallel=true org.gradle.parallel=true
minecraft_version=1.21.6 minecraft_version=1.21.1
supported_versions= supported_versions=1.21
yarn_mappings=1.21.6+build.1 yarn_mappings=1.21.1+build.3
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
# Mod Properties # Mod Properties
mod_version=5.2.2 mod_version=5.2.2+1.21.1
maven_group=eu.midnightdust.blur maven_group=eu.midnightdust.blur
archives_base_name=blur archives_base_name=blur
release_type=release release_type=release
@@ -16,12 +16,12 @@ curseforge_id=393563
modrinth_id=NK39zBp2 modrinth_id=NK39zBp2
# Modloaders # Modloaders
fabric_loader_version=0.16.14 fabric_loader_version=0.16.13
fabric_api_version=0.127.0+1.21.6 fabric_api_version=0.115.4+1.21.1
neoforge_version=21.6.0-beta neoforge_version=21.1.153
yarn_mappings_patch_neoforge_version = 1.21+build.4 yarn_mappings_patch_neoforge_version = 1.21+build.4
# Libraries # Libraries
midnightlib_version = 1.7.4+1.21.6 midnightlib_version = 1.7.5+1.21.1
modmenu_version = 11.0.2 modmenu_version = 11.0.2